replace ADA w VERA

.github/workflows/build_and_release.yml

@@ -47,24 +47,24 @@ jobs:
         if: matrix.os == 'windows-latest'
         uses: ilammy/msvc-dev-cmd@v1
 
-      - name: Install dependencies (Windows)
-        if: matrix.os == 'windows-latest'
-        run: |
-          $FfmpegUri = 'https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-n4.4-latest-win64-lgpl-shared-4.4.zip'
-          $FfmpegZipPath = "$Env:GITHUB_WORKSPACE\ffmpeg.zip"
-          $ZlibUri = 'https://sourceforge.net/projects/gnuwin32/files/zlib/1.2.3/zlib-1.2.3-lib.zip/download'
-          $ZlibZipPath = "$Env:GITHUB_WORKSPACE\zlib.zip"
+      # - name: Install dependencies (Windows)
+      #   if: matrix.os == 'windows-latest'
+      #   run: |
+      #     $FfmpegUri = 'https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-n4.4-latest-win64-lgpl-shared-4.4.zip'
+      #     $FfmpegZipPath = "$Env:GITHUB_WORKSPACE\ffmpeg.zip"
+      #     $ZlibUri = 'https://sourceforge.net/projects/gnuwin32/files/zlib/1.2.3/zlib-1.2.3-lib.zip/download'
+      #     $ZlibZipPath = "$Env:GITHUB_WORKSPACE\zlib.zip"
 
-          $FfmpegPath = "$Env:GITHUB_WORKSPACE\ffmpeg"
+      #     $FfmpegPath = "$Env:GITHUB_WORKSPACE\ffmpeg"
 
-          Start-BitsTransfer -Source "$FfmpegUri","$ZlibUri" -Destination "$FfmpegZipPath","$ZlibZipPath"
+      #     Start-BitsTransfer -Source "$FfmpegUri","$ZlibUri" -Destination "$FfmpegZipPath","$ZlibZipPath"
 
-          Expand-Archive -Path "$FfmpegZipPath" -DestinationPath "$FfmpegPath"
-          Move-Item -Path "$FfmpegPath\ffmpeg-*\*" -Destination "$FfmpegPath"
+      #     Expand-Archive -Path "$FfmpegZipPath" -DestinationPath "$FfmpegPath"
+      #     Move-Item -Path "$FfmpegPath\ffmpeg-*\*" -Destination "$FfmpegPath"
 
-          Expand-Archive -Path "$ZlibZipPath" -DestinationPath "$FfmpegPath"
+      #     Expand-Archive -Path "$ZlibZipPath" -DestinationPath "$FfmpegPath"
 
-          echo "CMAKE_PREFIX_PATH=$FfmpegPath" >>$Env:GITHUB_ENV
+      #     echo "CMAKE_PREFIX_PATH=$FfmpegPath" >>$Env:GITHUB_ENV
 
       - name: Build
         run: ${{ matrix.build_command }}

.gitignore

@@ -33,6 +33,7 @@ premake5.exe
 build/
 build_wasm/
 
+.vscode/*.log
 
 CMakeFiles
 cmake_install.cmake

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "deps/ada"]
-	path = deps/ada
-	url = https://github.com/patriciogonzalezvivo/ada.git
+[submodule "deps/vera"]
+	path = deps/vera
+	url = git@github.com:patriciogonzalezvivo/vera.git

.vscode/c_cpp_properties.json

@@ -63,7 +63,8 @@
                     "/usr/local/include"
                 ]
             },
-            "intelliSenseMode": "clang-x64"
+            "intelliSenseMode": "clang-x64",
+            "configurationProvider": "ms-vscode.cmake-tools"
         }
     ],
     "version": 4

CMakeLists.txt

@@ -1,19 +1,19 @@
 cmake_minimum_required(VERSION 3.2)
 
-set(VERSION_MAJOR 2)
-set(VERSION_MINOR 1)
-set(VERSION_PATCH 2)
+set(VERSION_MAJOR 3)
+set(VERSION_MINOR 0)
+set(VERSION_PATCH 0)
 set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
 project(glslViewer 
-            VERSION ${VERSION}
-            LANGUAGES CXX )
+        VERSION ${VERSION}
+        LANGUAGES CXX )
 
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-# The compiled ADA 
+# The compiled vera 
 add_subdirectory(deps)
 
 if(MSVC)
@@ -26,22 +26,14 @@ endif()
 
 file(GLOB ROOT_SOURCE 
     "${PROJECT_SOURCE_DIR}/src/*.cpp"
-    "${PROJECT_SOURCE_DIR}/src/gl/*.cpp"
-    "${PROJECT_SOURCE_DIR}/src/io/*.cpp"
-    "${PROJECT_SOURCE_DIR}/src/types/*.cpp"
     "${PROJECT_SOURCE_DIR}/src/tools/*.cpp"
 )
 
 add_executable(glslViewer ${ROOT_SOURCE})
 
-# set_target_properties(glslViewer PROPERTIES
-#     CXX_STANDARD 11
-#     CXX_STANDARD_REQUIRED ON
-# )
-
 include_directories(deps/liblo)
 target_include_directories(glslViewer PRIVATE deps)
-target_link_libraries(glslViewer PRIVATE ada phonedepth)
+target_link_libraries(glslViewer PRIVATE vera)
 target_compile_definitions(glslViewer PRIVATE GLSLVIEWER_VERSION_MAJOR=${VERSION_MAJOR})
 target_compile_definitions(glslViewer PRIVATE GLSLVIEWER_VERSION_MINOR=${VERSION_MINOR})
 target_compile_definitions(glslViewer PRIVATE GLSLVIEWER_VERSION_PATCH=${VERSION_PATCH})
@@ -60,6 +52,7 @@ if (EMSCRIPTEN)
 
     set(LFLAGS "${LFLAGS} -s ALLOW_MEMORY_GROWTH=1")
     set(LFLAGS "${LFLAGS} -s NO_DYNAMIC_EXECUTION=1")
+    # set(LFLAGS "${LFLAGS} -s NO_DISABLE_EXCEPTION_CATCHING")
 
     # Copy the default index.html 
     file(COPY   assets/index.html DESTINATION ${CMAKE_CURRENT_BINARY_DIR} )
@@ -78,7 +71,6 @@ if (EMSCRIPTEN)
     set(LFLAGS "${LFLAGS} --preload-file examples/3D/01_lighting/04_fresnel.vert")
     set(LFLAGS "${LFLAGS} --preload-file examples/3D/01_lighting/04_fresnel.frag")
     set(LFLAGS "${LFLAGS} --preload-file examples/3D/01_lighting/uffizi_cross.jpg")
-    set(LFLAGS "${LFLAGS} --preload-file examples/3D/01_lighting/uffizi_latlong.jpg")
     set(LFLAGS "${LFLAGS} --preload-file examples/3D/03_models/duck.glb")
     # set(LFLAGS "${LFLAGS} --preload-file examples/3D/03_models/default.mtl")
     # set(LFLAGS "${LFLAGS} --preload-file examples/3D/03_models/default.png")
@@ -92,9 +84,11 @@ if (EMSCRIPTEN)
     # set(LFLAGS "${LFLAGS} --preload-file examples/3D/04_vertex/physarum.vert")
     # set(LFLAGS "${LFLAGS} --preload-file examples/3D/04_vertex/spin.vert")
     # set(LFLAGS "${LFLAGS} --preload-file examples/3D/04_vertex/stars.vert")
+    # set(LFLAGS "${LFLAGS} --preload-file examples/3D/04_vertex/gpgpu.frag")
+    # set(LFLAGS "${LFLAGS} --preload-file examples/3D/04_vertex/gpgpu.vert")
 
     set_target_properties(glslViewer PROPERTIES LINK_FLAGS "${LFLAGS}")
-    target_link_libraries(glslViewer PRIVATE glfw)
+    target_link_libraries(glslViewer PRIVATE glfw webxr)
 
 else()
     find_package(Curses)

README.md

@@ -99,3 +99,5 @@ Thanks to:
 * [Philip Rideout](http://prideout.net/) and [Romain Guy](http://www.curious-creature.com/) general generosity to share their code and experience
 
 * [Sergei B](https://github.com/bespsm) for adding support for Audio textures
+
+

assets/index.html

@@ -34,7 +34,30 @@
         -webkit-touch-callout: none;
       }
 
-      .emscripten { padding-right: 0; margin-left: auto; margin-right: auto; display: block; }
+      .emscripten { 
+        padding-right: 0; 
+        margin-left: auto; 
+        margin-right: auto; 
+        display: block; 
+
+        position: relative;
+        top: 0px;
+        left: 0px;
+        margin: 0px;
+        border: 0;
+        /*width: 100%; //this will set canvas size full screen
+        height: 100%;*/
+        overflow: hidden;
+        display: block;
+        image-rendering: optimizeSpeed;
+        image-rendering: -moz-crisp-edges;
+        image-rendering: -o-crisp-edges;
+        image-rendering: -webkit-optimize-contrast;
+        image-rendering: optimize-contrast;
+        image-rendering: crisp-edges;
+        image-rendering: pixelated;
+        -ms-interpolation-mode: nearest-neighbor;
+      }
       div.emscripten { text-align: center; }
       canvas.emscripten {
         position: absolute;
@@ -172,8 +195,8 @@
       // arguments: ["examples/3D/03_models/duck.glb", "examples/3D/01_lighting/00_gooch.frag", "-e", "buffers,on"],
       // arguments: ["examples/3D/03_models/duck.glb", "examples/3D/01_lighting/01_shadows.frag", "-e", "buffers,on"],
       // arguments: ["examples/3D/03_models/duck.glb", "examples/3D/01_lighting/04_fresnel.vert", "examples/3D/01_lighting/04_fresnel.frag", "-C", "examples/3D/01_lighting/uffizi_cross.jpg"],
-      arguments: ["examples/3D/03_models/duck.glb", "-e", "debug,on", "-e", "axis,off", "-C", "examples/3D/01_lighting/uffizi_cross.jpg"],
-      // arguments: ["examples/3D/03_models/duck.glb", "--fxaa", "-e", "buffers,on"],
+      // arguments: ["examples/3D/03_models/duck.glb", "-e", "debug,on", "-e", "axis,off", "--msaa"],
+      arguments: ["examples/3D/03_models/duck.glb", "--fxaa"],
       // arguments: ["examples/3D/03_models/duck.glb", "--msaa", "--fxaa", "-e", "buffers,on"],
       // arguments: ["examples/3D/04_vertex/pcl.ply", "examples/3D/04_vertex/stars.vert", "examples/3D/04_vertex/pcl.frag"],
       // arguments: ["examples/3D/04_vertex/pcl.ply", "examples/3D/04_vertex/stars.vert", "examples/3D/04_vertex/pcl_trail.frag"],
@@ -245,4 +268,4 @@
 
   </script>
   <script async type="text/javascript" src="glslViewer.js"></script>
-</html>
+</html>

deps/CMakeLists.txt

@@ -1,6 +1,5 @@
 ## Ada
-add_subdirectory(ada)
-add_subdirectory(phonedepth)
+add_subdirectory(vera)
 
 if (NOT EMSCRIPTEN) 
     add_subdirectory(liblo/cmake)