Propose shadow-cone tracing for final frame render.

Author: Adnn

src/apps/ch11_voxel/ch11_voxel/FrameGraph.cpp

@@ -208,6 +208,11 @@ void FrameGraph::loadPrograms()
 }
 
 
+GLfloat toTanHalf(math::Radian<GLfloat> aAngle)
+{
+    return math::tan(aAngle / 2.f);
+}
+
 void FrameGraph::renderFinalScene(const scenic::SceneTree & aSceneTree,
                                   Voxelizer & aVoxelizer)
 {
@@ -221,9 +226,11 @@ void FrameGraph::renderFinalScene(const scenic::SceneTree & aSceneTree,
     graphics::setUniform(program, "u_VoxelSize", aVoxelizer.mVoxelSize);
     graphics::setUniform(program, "u_AabbMin", aVoxelizer.mSceneAabb.leftBottomZMin());
 
-    graphics::setUniform(program, "u_TanHalfAperture", mFrameControl.mConeAperture.data());
+    graphics::setUniform(program, "u_TanHalfAperture", toTanHalf(mFrameControl.mDiffuseConeAperture));
+    graphics::setUniform(program, "u_TanHalfShadow", toTanHalf(mFrameControl.mShadowConeAperture));
 
     graphics::setUniform(program, "u_ToneMapping", (GLuint)mFrameControl.mToneMapping);
+    graphics::setUniform(program, "u_ShadowMethod", (GLuint)mFrameControl.mFinalSceneShadow);
 
     glProgramUniform4fv(program,
                         glGetUniformLocation(program, "u_LightingFactors"),
@@ -242,7 +249,7 @@ void FrameGraph::renderConeTrace(const scenic::SceneTree & aSceneTree,
     graphics::setUniform(program, "u_VoxelSize", aVoxelizer.mVoxelSize);
     graphics::setUniform(program, "u_AabbMin", aVoxelizer.mSceneAabb.leftBottomZMin());
 
-    graphics::setUniform(program, "u_TanHalfAperture", mFrameControl.mConeAperture.data());
+    graphics::setUniform(program, "u_TanHalfAperture", toTanHalf(mFrameControl.mDiffuseConeAperture));
     graphics::setUniform(program, "u_GridAlign", mFrameControl.mGridAlign);
 
     graphics::setUniform(program, "u_ConeTraceMode", aMode);
@@ -296,7 +303,8 @@ void FrameGraph::appendUi()
     imguiui::addComboContinuousEnum<FrameControl::ToneMapping::_End>(
         "Tone Mapping", mFrameControl.mToneMapping);
 
-    ImGui::SliderAngle("Diffuse Cone Aperture", &mFrameControl.mConeAperture.data(), 1.f, 180.f);
+    ImGui::SliderAngle("Diffuse Cone Aperture", &mFrameControl.mDiffuseConeAperture.data(), 1.f, 180.f);
+    ImGui::SliderAngle("Shadow Cone Aperture", &mFrameControl.mShadowConeAperture.data(), 1.f, 180.f);
 
     ImGui::Checkbox("Grid Aligned Trace Origin", &mFrameControl.mGridAlign);
 
@@ -307,6 +315,8 @@ void FrameGraph::appendUi()
     ImGui::SliderFloat("Indirect specular", &mFrameControl.mIndirectSpecularFactor, 0.f, 4.f);
 
     ImGui::SeparatorText("Shadow");
+    imguiui::addComboContinuousEnum<FrameControl::ShadowMethod::_End>(
+        "Final Scene Shadow", mFrameControl.mFinalSceneShadow);
     ImGui::InputFloat("Scale", &mFrameControl.mShadowScaleBias.x());
     ImGui::InputFloat("Bias", &mFrameControl.mShadowScaleBias.y());
 }
@@ -327,4 +337,18 @@ std::string to_string(FrameGraph::FrameControl::ToneMapping aValue)
 #undef STR
 }
 
+
+std::string to_string(FrameGraph::FrameControl::ShadowMethod aValue)
+{
+#define STR(enumerator) case FrameGraph::FrameControl::ShadowMethod::enumerator: return #enumerator
+    switch (aValue)
+    {
+        STR(ShadowMap);
+        STR(ConeTracing);
+    default:
+        throw std::logic_error{ "Unhandled shadow method." };
+    }
+#undef STR
+}
+
 } // namespace ad

src/apps/ch11_voxel/ch11_voxel/FrameGraph.h

@@ -43,11 +43,22 @@ struct FrameGraph
             _End/* keep last */
         };
 
+        enum class ShadowMethod : GLuint
+        {
+            ShadowMap,
+            ConeTracing,
+            _End/* keep last */
+        };
+
         decltype(gPolygonModes)::const_iterator mPolygonMode = gPolygonModes.begin() + 2;
 
         ToneMapping mToneMapping = ToneMapping::AcesApprox;
 
-        math::Radian<GLfloat> mConeAperture = math::Degree<GLfloat>{30.f};
+        ShadowMethod mFinalSceneShadow = ShadowMethod::ShadowMap;
+
+        // Aperture means full angle (2 * angle to the axis)
+        math::Radian<GLfloat> mDiffuseConeAperture = math::Degree<GLfloat>{60.f};
+        math::Radian<GLfloat> mShadowConeAperture = math::Degree<GLfloat>{10.f};
         bool mGridAlign = false;
 
         float mDirectDiffuseFactor{1.0f};

src/apps/ch11_voxel/ch11_voxel/Scene.cpp

@@ -567,16 +567,18 @@ void Scene::presentUi(bool * aOpen)
     ImGui::Checkbox("Show Punctual Lights", &mSceneControl.mShowPunctualLights);
     ImGui::Checkbox("Draw BB", &mSceneControl.mDrawBoundingBoxes);
 
-    ImGui::SeparatorText("Voxelization:");
     mVoxelizationRequest |= ImGui::Button("Force voxelize");
-    mVoxelizationRequest |= ImGui::Checkbox("Dominant Axis Method", &mVoxelizer.mControl.mUseDominantAxis);
-    mVoxelizationRequest |= ImGui::Checkbox("Conservative Rasterization", &mVoxelizer.mControl.mConservativeRasterization);
-    mVoxelizationRequest |= ImGui::Checkbox("Conservative Depth Range", &mVoxelizer.mControl.mConservativeDepthRange);
-    mVoxelizationRequest |= ImGui::Checkbox("Average Samples in Voxel", &mVoxelizer.mControl.mAverageSamples);
-    mVoxelizationRequest |= ImGui::Checkbox("Average Normals by axis", &mVoxelizer.mControl.mAverageNormalByAxis);
-    mVoxelizationRequest |= ImGui::Checkbox("Trace linear filtering", &mVoxelizer.mControl.mLinearFiltering);
-    mVoxelizationRequest |= ImGui::Checkbox("Compute Shader Irradiance Filtering", &mVoxelizer.mControl.mComputeIrradianceMipmapping);
-    ImGui::Checkbox("Voxel POV", &mSceneControl.mVoxelPov);
+    if (ImGui::CollapsingHeader("Voxelization"))
+    {
+        mVoxelizationRequest |= ImGui::Checkbox("Dominant Axis Method", &mVoxelizer.mControl.mUseDominantAxis);
+        mVoxelizationRequest |= ImGui::Checkbox("Conservative Rasterization", &mVoxelizer.mControl.mConservativeRasterization);
+        mVoxelizationRequest |= ImGui::Checkbox("Conservative Depth Range", &mVoxelizer.mControl.mConservativeDepthRange);
+        mVoxelizationRequest |= ImGui::Checkbox("Average Samples in Voxel", &mVoxelizer.mControl.mAverageSamples);
+        mVoxelizationRequest |= ImGui::Checkbox("Average Normals by axis", &mVoxelizer.mControl.mAverageNormalByAxis);
+        mVoxelizationRequest |= ImGui::Checkbox("Trace linear filtering", &mVoxelizer.mControl.mLinearFiltering);
+        mVoxelizationRequest |= ImGui::Checkbox("Compute Shader Irradiance Filtering", &mVoxelizer.mControl.mComputeIrradianceMipmapping);
+        ImGui::Checkbox("Voxel POV", &mSceneControl.mVoxelPov);
+    }
 
     DearImguiWitness witness;
 

src/apps/ch11_voxel/ch11_voxel/ShaderConstants.cpp

@@ -47,6 +47,12 @@ namespace ad {
             result.emplace_back(
                 "CLIENT_TONEMAPPING_ACESAPPROX " 
                 + std::to_string((GLuint)FrameGraph::FrameControl::ToneMapping::AcesApprox));
+            result.emplace_back(
+                "CLIENT_SHADOW_SHADOWMAP " 
+                + std::to_string((GLuint)FrameGraph::FrameControl::ShadowMethod::ShadowMap));
+            result.emplace_back(
+                "CLIENT_SHADOW_CONETRACING " 
+                + std::to_string((GLuint)FrameGraph::FrameControl::ShadowMethod::ConeTracing));
             return result;
         }