Skip to content

Commit

Permalink
Merge pull request #1216 from xelatihy/v4-wip
Browse files Browse the repository at this point in the history
Version 4
  • Loading branch information
xelatihy authored Mar 25, 2021
2 parents 6971d0a + df91e02 commit c1980b8
Show file tree
Hide file tree
Showing 306 changed files with 850,814 additions and 470,492 deletions.
3 changes: 3 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,6 @@ BreakStringLiterals: false

PenaltyBreakAssignment: 20
PenaltyBreakBeforeFirstCallParameter: 50

DerivePointerAlignment: false
PointerAlignment: Left
2 changes: 1 addition & 1 deletion .github/workflows/macos-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
run: |
mkdir build
cd build
cmake .. -G"Unix Makefiles" -DYOCTO_OPENGL=ON -DYOCTO_EMBREE=OFF
cmake .. -G"Unix Makefiles" -DYOCTO_OPENGL=ON -DYOCTO_EMBREE=OFF -DYOCTO_DENOISE=OFF
- name: build
run: |
cd build
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/ubuntu-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,17 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
# - name: install ubuntu dependencies
# run: |
# sudo apt-get update --yes
# sudo apt-get install --yes ninja-build
- name: dependencies
run: |
sudo apt-get install xorg-dev
- name: configure
env:
CC: gcc-8
CXX: g++-8
run: |
mkdir build
cd build
cmake .. -G"Unix Makefiles" -DYOCTO_OPENGL=OFF -DYOCTO_EMBREE=OFF
cmake .. -G"Unix Makefiles" -DYOCTO_OPENGL=ON -DYOCTO_EMBREE=OFF -DYOCTO_DENOISE=OFF
- name: build
run: |
cd build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
run: |
mkdir build
cd build
cmake .. -G "Visual Studio 16 2019" -DYOCTO_OPENGL=ON -DYOCTO_EMBREE=OFF
cmake .. -G "Visual Studio 16 2019" -DYOCTO_OPENGL=ON -DYOCTO_EMBREE=OFF -DYOCTO_DENOISE=OFF
- name: build
run: |
cd build
Expand Down
18 changes: 18 additions & 0 deletions .vscode/cmake-variants.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,24 @@
}
}
},
"useDenoise": {
"default": "yes",
"description": "Build with Denoise",
"choices": {
"yes": {
"short": "Denoise",
"settings": {
"YOCTO_DENOISE": "yes"
}
},
"no": {
"short": "NoDenoise",
"settings": {
"YOCTO_DENOISE": "no"
}
}
}
},
"useOpenGL": {
"default": "yes",
"description": "Build with OpenGL",
Expand Down
14 changes: 13 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"C_Cpp.default.configurationProvider": "vector-of-bool.cmake-tools",
"cmake.buildDirectory": "${workspaceFolder}/build/vscode/${variant:buildType}",
"cmake.parallelJobs": 8,
"cmake.preferredGenerators": [ "Ninja" ],
"files.associations": {
"iosfwd": "cpp",
"__functional_03": "cpp",
Expand Down Expand Up @@ -154,5 +155,16 @@
"-modernize-use-nodiscard",
"-modernize-use-trailing-return-type"
],
"python.pythonPath": "/usr/local/bin/python3"
"python.pythonPath": "/usr/local/bin/python3",
"editor.formatOnSave": true,
"python.formatting.provider": "yapf",
"cSpell.words": [
"bsdf",
"bsdfs",
"denoise",
"denoising",
"khronos",
"lambertian",
"microfacet"
]
}
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required (VERSION 3.12)

project (yocto_gl VERSION 2.0)
project (yocto_gl VERSION 4.0)

option(YOCTO_OPENGL "Build OpenGL apps" ON)
option(YOCTO_DENOISE "Build denoise app based on Intel OIDN" OFF)
Expand Down
8 changes: 4 additions & 4 deletions CMakeSettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@
"name": "x64-Debug",
"generator": "Ninja",
"configurationType": "Debug",
"inheritEnvironments": [ "msvc_x64_x64" ],
"inheritEnvironments": ["msvc_x64_x64"],
"buildRoot": "${projectDir}\\build\\vscmake\\x64-Debug",
"installRoot": "${projectDir}\\bin\\debug",
"cmakeCommandArgs": "",
"buildCommandArgs": "-v",
"ctestCommandArgs": "",
"variables": []
"variables": [{ "name": "YOCTO_EMBREE", "value": "ON" }]
},
{
"name": "x64-Release",
"generator": "Ninja",
"configurationType": "RelWithDebInfo",
"inheritEnvironments": [ "msvc_x64_x64" ],
"inheritEnvironments": ["msvc_x64_x64"],
"buildRoot": "${projectDir}\\build\\vscmake\\x64-Release",
"installRoot": "${projectDir}\\bin",
"cmakeCommandArgs": "",
"buildCommandArgs": "-v",
"ctestCommandArgs": "",
"variables": []
"variables": [{ "name": "YOCTO_EMBREE", "value": "ON" }]
}
]
}
28 changes: 2 additions & 26 deletions apps/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,28 +1,4 @@
add_subdirectory(yimage)
add_subdirectory(ytrace)
add_subdirectory(yshape)

add_subdirectory(yscenetrace)
add_subdirectory(ysceneproc)
add_subdirectory(yimageproc)
add_subdirectory(yshapeproc)
add_subdirectory(ymeshproc)
add_subdirectory(yheightfieldproc)
add_subdirectory(ycityproc)

if(YOCTO_OPENGL)
add_subdirectory(ysceneview)
add_subdirectory(ysceneviews)
add_subdirectory(ysceneitrace)
add_subdirectory(ysceneitraces)
add_subdirectory(yimageview)
add_subdirectory(yimageviews)
add_subdirectory(yshapeview)
add_subdirectory(ysculpting)
endif(YOCTO_OPENGL)

if(YOCTO_DENOISE)
add_subdirectory(yimagedenoise)
endif(YOCTO_DENOISE)

add_subdirectory(ymeshtest)
add_subdirectory(yscene)
add_subdirectory(ymesh)
5 changes: 0 additions & 5 deletions apps/ycityproc/CMakeLists.txt

This file was deleted.

Loading

0 comments on commit c1980b8

Please sign in to comment.