Merge pull request #1216 from xelatihy/v4-wip

Version 4

.clang-format

@@ -15,3 +15,6 @@ BreakStringLiterals: false
 
 PenaltyBreakAssignment: 20
 PenaltyBreakBeforeFirstCallParameter: 50
+
+DerivePointerAlignment: false
+PointerAlignment: Left

.github/workflows/macos-build.yml

@@ -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

.github/workflows/ubuntu-build.yml

@@ -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

.github/workflows/windows-build.yml

@@ -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

.vscode/cmake-variants.json

@@ -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",

.vscode/settings.json

@@ -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",
@@ -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"
+  ]
 }

CMakeLists.txt

@@ -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)

CMakeSettings.json

@@ -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" }]
     }
   ]
 }

apps/CMakeLists.txt

@@ -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)