Merge branch 'topic/ch11_voxel' into develop

Author: Adnn

README.md

@@ -14,6 +14,16 @@ git clone [email protected]:Adnn/realtime_rendering_assets.git assets
 
 The repository contains several standalone applications demonstrating real-time rendering techniques.
 
+
+### ch11_voxel
+
+Implements a GPU-accelerated voxelization pipeline, accumulations in voxel space,
+compute-based mipmap filtering, and cone tracing to achieve different GI effects
+(radiance accumulation, AO, visibility).
+
+[![intel_sponza-directional_vxgi](https://adnn.github.io/assets/rtr_prototypes/ch11_voxel/rtr_11-intel_sponza-864.jpg)](https://adnn.github.io/assets/rtr_prototypes/ch11_voxel/rtr_11-intel_sponza-1920.jpg)
+
+
 ### ch11_ssao
 
 Implement Screen-Space Ambient Occlusion (SSAO) in a viewer supporting PBR shading and image-based lighting (IBL).

conan/conanfile.py

@@ -23,20 +23,22 @@ class GraphicsConan(ConanFile):
     default_options = {
         "shared": False,
         "fPIC": True,
+        "tracy/*:on_demand": True,
     }
 
     generators = "CMakeToolchain"
     revision_mode = "scm"
 
     def requirements(self):
-        self.requires("graphics/a842a03bf7@adnn", transitive_headers=True)
+        self.requires("graphics/8b6fc11949@adnn", transitive_headers=True)
         self.requires("handy/97edf2bb4f@adnn", transitive_headers=True)
-        self.requires("math/ee8b6fb1ed@adnn", transitive_headers=True)
+        self.requires("math/56d3b88bbf@adnn", transitive_headers=True)
 
         self.requires("assimp/5.4.3", transitive_headers=False)
         self.requires("imgui/1.91.5-docking", transitive_headers=True)
         # Note: we do not want spdlog to be a public dependency
         self.requires("spdlog/1.15.1", transitive_headers=False)
+        self.requires("tracy/0.12.1", transitive_headers=False)
 
 
     # There exist automatic alternatives.

scripts/convert_dds.py

@@ -0,0 +1,29 @@
+#!python
+
+# Taking an input JSON file with categories (key) and array of images (values),
+# apply nvtt_export to each files under each category.
+# Parameters to nvtt_export are defined by category in `params_by_key`.
+# Note: The loader code produce a categorized output in `sorted_textures.json`
+
+import json
+import os
+import subprocess
+import sys
+
+# Parameters for each key
+params_by_key = {
+    "diffuse": ["--format", "bc7", "--dx10", "--quality", "normal", "--mips", "--mip-filter", "box", "--save-flip-y", "--export-transfer-function", "srgb", "--zcmp", "5"],
+    "normal": ["--format", "bc5", "--dx10", "--quality", "normal", "--mips", "--mip-filter", "box", "--no-mip-gamma-correct", "--save-flip-y", "--export-transfer-function", "linear", "--zcmp", "5"],
+    "mrao": ["--format", "bc7", "--dx10", "--quality", "normal", "--mips", "--mip-filter", "box", "--save-flip-y", "--export-transfer-function", "linear", "--zcmp", "5"],
+}
+
+# Parse JSON
+data_path = sys.argv[1]
+data = json.load(open(data_path))
+prefix = os.path.dirname(os.path.abspath(data_path))
+
+for key, values in data.items():
+    params = params_by_key.get(key, [])
+    for val in values:
+        cmd = ["nvtt_export"] + params + [os.path.join(prefix, val)]
+        subprocess.run(cmd)

src/CMakeLists.txt

@@ -8,6 +8,8 @@ add_subdirectory(libs/scenic/scenic)
 add_subdirectory(apps/ch10_area_lights/ch10_area_lights)
 add_subdirectory(apps/ch10_ltc/ch10_ltc)
 add_subdirectory(apps/ch11_ssao/ch11_ssao)
+add_subdirectory(apps/ch11_voxel/ch11_voxel)
+add_subdirectory(apps/sandbox/sandbox)
 
 if(BUILD_TESTING)
     #add_subdirectory()

src/apps/ch10_area_lights/ch10_area_lights/CameraSystem.cpp

@@ -4,9 +4,9 @@
 namespace ad {
 
 
-void OrbitalCamera::update(int aWindowHeight)
+void OrbitalCamera::update(float aDeltaTime, int aWindowHeight)
 {
-    mOrbitalControl.update(mViewHeightInWorld, aWindowHeight);
+    mOrbitalControl.update(aDeltaTime, mViewHeightInWorld, aWindowHeight);
 }
 
 

src/apps/ch10_area_lights/ch10_area_lights/CameraSystem.h

@@ -8,7 +8,7 @@ namespace ad {
 
 struct OrbitalCamera
 {
-    void update(int aWindowHeight);
+    void update(float aDeltaTime, int aWindowHeight);
 
     void setRatio(float aAspectRatio);
 

src/apps/ch10_area_lights/ch10_area_lights/Scene.cpp

@@ -245,10 +245,10 @@ void Scene::loadPrograms()
 }
 
 
-void Scene::step(const graphics::Timer & /*aTimer*/,
+void Scene::step(const graphics::Timer & aTimer,
                  math::Size<2, int> aWindowResolution)
 {
-    mOrbitalCamera.update(aWindowResolution.height());
+    mOrbitalCamera.update(aTimer.delta(), aWindowResolution.height());
 }
 
 

src/apps/ch10_area_lights/ch10_area_lights/main.cpp

@@ -49,14 +49,17 @@ int main(int argc, const char * argv[])
 
         while(application.nextFrame())
         {
-            application.getAppInterface()->clear();
-            scene.step(timer, application.getAppInterface()->getWindowSize());
-            scene.render(application.getAppInterface()->getFramebufferSize());
-            timer.mark(glfwGetTime());
+            if (application.getAppInterface()->isWindowOnDisplay())
+            {
+                application.getAppInterface()->clear();
+                scene.step(timer, application.getAppInterface()->getWindowSize());
+                scene.render(application.getAppInterface()->getFramebufferSize());
 
-            ad::imguiui::newFrame();
-            ui.present("Root", scene);
-            ad::imguiui::renderFrame();
+                ad::imguiui::newFrame();
+                ui.present("Root", scene);
+                ad::imguiui::renderFrame();
+            }
+            timer.mark(glfwGetTime());
         }
     }
     catch(const std::exception & e)

src/apps/ch10_area_lights/ch10_area_lights/resources/programs/ch10_area_lights_TessellateSphere.prog

@@ -1,5 +1,5 @@
 {
-    "vertex": "shaders/Forward.vert",
+    "vertex": "shaders/ForwardTess.vert",
     "tes": "shaders/TessellateSphere.tes",
     "fragment": "shaders/ch10_area_lights_Pbr.frag"
 }

src/apps/ch10_ltc/ch10_ltc/CameraSystem.cpp

@@ -4,9 +4,9 @@
 namespace ad {
 
 
-void OrbitalCamera::update(int aWindowHeight)
+void OrbitalCamera::update(float aDeltaTime, int aWindowHeight)
 {
-    mOrbitalControl.update(mViewHeightInWorld, aWindowHeight);
+    mOrbitalControl.update(aDeltaTime, mViewHeightInWorld, aWindowHeight);
 }