Merge pull request #170 from vilbeyli/dev

Release 0.10.0 - Tessellation, async compute & copy, object picking, magnifier, instanced draw + LODs
vilbeyli · Jan 12, 2025 · 20b2956 · 20b2956
2 parents 343b75e + ec89902
commit 20b2956
Show file tree

Hide file tree

Showing 171 changed files with 18,483 additions and 6,591 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,5 @@
+# These are supported funding model platforms
+
+github: [vilbeyli]
+ko_fi: vilbeyli
+buy_me_a_coffee: vilbeyli
diff --git a/.gitignore b/.gitignore
@@ -343,9 +343,13 @@ $RECYCLE.BIN/
 # Windows shortcuts
 *.lnk
 
+Tools/.wget-hsts
+
 # EXCEPTIONS
 !Data/Models/*/*.obj
-!Tools/7z.exe
+!Tools/7za.exe
+!Tools/7za.dll
+!Tools/7zxa.dll
 !Tools/wget.exe
 !Libs/WinPixEventRuntime/bin
 !Libs/WinPixEventRuntime/bin/x64/

diff --git a/Build/GenerateProjectFiles.bat b/Build/GenerateProjectFiles.bat
@@ -1,5 +1,6 @@
 @echo off
 setlocal enabledelayedexpansion
+cd /d %~dp0
 
 set LAUNCH_VS=1
 set SOLUTION_FILE=VQE.sln

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -25,11 +25,13 @@ set (Scenes
     "Data/Levels/Sponza.xml"
     "Data/Levels/EnvironmentMapUnitTest.xml"
     "Data/Levels/StressTest.xml"
+    "Data/Levels/Terrain.xml"
     "Source/Scenes/Scenes.h"
     "Source/Scenes/DefaultScene.cpp"
     "Source/Scenes/SponzaScene.cpp"
     "Source/Scenes/EnvironmentMapUnitTestScene.cpp"
     "Source/Scenes/StressTestScene.cpp"
+    "Source/Scenes/TerrainScene.cpp"
 )
 
 set (Config
@@ -76,6 +78,12 @@ set (Shaders
     "Shaders/HDR.hlsl"
     "Shaders/Visualization.hlsl"
     "Shaders/ApplyReflections.hlsl"
+    "Shaders/Magnifier.hlsl"
+    "Shaders/ObjectID.hlsl"
+    "Shaders/Outline.hlsl"
+    "Shaders/VertexDebug.hlsl"
+    "Shaders/Tessellation.hlsl"
+    "Shaders/VQPlatform.h"
 )
 
 set (ShadersScreenSpaceReflections
@@ -99,13 +107,19 @@ set (RenderPassFiles
     "Source/Engine/RenderPass/DepthPrePass.h"
     "Source/Engine/RenderPass/DepthMSAAResolve.h"
     "Source/Engine/RenderPass/ScreenSpaceReflections.h"
+    "Source/Engine/RenderPass/MagnifierPass.h"
+    "Source/Engine/RenderPass/ObjectIDPass.h"
+    "Source/Engine/RenderPass/OutlinePass.h"
 
     "Source/Engine/RenderPass/RenderPass.cpp"
     "Source/Engine/RenderPass/AmbientOcclusion.cpp"
     "Source/Engine/RenderPass/ApplyReflections.cpp"
     "Source/Engine/RenderPass/DepthPrePass.cpp"
     "Source/Engine/RenderPass/DepthMSAAResolve.cpp"
     "Source/Engine/RenderPass/ScreenSpaceReflections.cpp"
+    "Source/Engine/RenderPass/MagnifierPass.cpp"
+    "Source/Engine/RenderPass/ObjectIDPass.cpp"
+    "Source/Engine/RenderPass/OutlinePass.cpp"
 )
 
 set (CoreFiles 
@@ -116,6 +130,7 @@ set (CoreFiles
     "Source/Engine/Core/Types.h"
     "Source/Engine/Core/RenderCommands.h"
     "Source/Engine/Core/Memory.h"
+    "Source/Engine/Core/imgui_impl_win32.h"
 
     "Source/Engine/Core/Platform.cpp"
     "Source/Engine/Core/Window.cpp"
@@ -125,6 +140,7 @@ set (CoreFiles
     "Source/Engine/Core/VQEngine_EventHandlers.cpp"
     "Source/Engine/Core/FileParser.cpp"
     "Source/Engine/Core/Memory.cpp"
+    "Source/Engine/Core/imgui_impl_win32.cpp"
 )
 
 set (SceneFiles   
@@ -136,6 +152,7 @@ set (SceneFiles
     "Source/Engine/Scene/Light.h"
     "Source/Engine/Scene/Camera.h"
     "Source/Engine/Scene/Mesh.h"
+    "Source/Engine/Scene/MeshGenerator.h"
     "Source/Engine/Scene/Material.h"
     "Source/Engine/Scene/Model.h"
     "Source/Engine/Scene/GameObject.h"
@@ -150,24 +167,28 @@ set (SceneFiles
     "Source/Engine/Scene/Model.cpp"
     "Source/Engine/Scene/GameObject.cpp"
     "Source/Engine/Scene/Transform.cpp"
-    "Source/Engine/Scene/Quaternion.cpp"    
+    "Source/Engine/Scene/Quaternion.cpp"
 )
 
 set (PostProcessFiles
     "Source/Engine/PostProcess/PostProcess.h"
     "Source/Engine/PostProcess/PostProcess.cpp"
 )
 
+set (UIFiles
+    "Source/Engine/UI/VQUI.cpp"
+    "Source/Engine/UI/VQUI.h"
+)
+
 set (SourceVQE 
     "Source/Engine/VQEngine.h"
     "Source/Engine/VQEngine_RenderCommon.h"
     "Source/Engine/Settings.h"
     "Source/Engine/Math.h"
     "Source/Engine/Culling.h"
-    "Source/Engine/Geometry.h"
+    "Source/Engine/CullingData.h"
     "Source/Engine/AssetLoader.h"
     "Source/Engine/GPUMarker.h"
-    "Source/Engine/VQUI.h"
 
     "Source/Engine/Main.cpp"
     "Source/Engine/VQEngine_Main.cpp"
@@ -176,9 +197,7 @@ set (SourceVQE
     "Source/Engine/VQEngine_Update.cpp"
     "Source/Engine/VQEngine_Input.cpp"
     "Source/Engine/VQEngine_Simulation.cpp"
-    "Source/Engine/VQUI.cpp"
     "Source/Engine/EnvironmentMap.cpp"
-    "Source/Engine/Geometry.cpp"
     "Source/Engine/Math.cpp"
     "Source/Engine/Culling.cpp"
     "Source/Engine/AssetLoader.cpp"
@@ -259,6 +278,7 @@ add_subdirectory(Source/Renderer)
 #    -DASSIMP_BUILD_TESTS=OFF 
 #    -DASSIMP_INSTALL=OFF
 #)
+#add_definitions(-DNOMINMAX)
 add_subdirectory(Libs/assimp)
 add_subdirectory(Libs/imgui)
 
@@ -278,6 +298,7 @@ source_group("Materials" FILES ${Materials})
 source_group("Source\\RenderPass" FILES ${RenderPassFiles})
 source_group("Source\\Core" FILES ${CoreFiles})
 source_group("Source\\Scene" FILES ${SceneFiles})
+source_group("Source\\UI" FILES ${UIFiles})
 source_group("Source\\PostProcess" FILES ${PostProcessFiles})
 source_group("Source" FILES ${SourceVQE})
 source_group("Libs\\AMD-FidelityFX\\CACAO"   FILES ${LibFFX_CACAO})
@@ -297,6 +318,8 @@ set_source_files_properties(${FFX_DNSR_Shaders} PROPERTIES VS_TOOL_OVERRIDE "Tex
 set_source_files_properties(${CoreFiles} PROPERTIES VS_TOOL_OVERRIDE "Text")
 set_source_files_properties(${RenderPassFiles} PROPERTIES VS_TOOL_OVERRIDE "Text")
 set_source_files_properties(${SceneFiles} PROPERTIES VS_TOOL_OVERRIDE "Text")
+set_source_files_properties(${UIFiles} PROPERTIES VS_TOOL_OVERRIDE "Text")
+set_source_files_properties(${PostProcessFiles} PROPERTIES VS_TOOL_OVERRIDE "Text")
 set_source_files_properties(${LibFFX_CACAO} PROPERTIES VS_TOOL_OVERRIDE "Text")
 set_source_files_properties(${LibFFX_SSSR} PROPERTIES VS_TOOL_OVERRIDE "Text")
 set_source_files_properties(Data/Resources/VQE.rc PROPERTIES VS_TOOL_OVERRIDE "Resource compiler")
@@ -327,6 +350,7 @@ add_executable( ${PROJECT_NAME}
     ${LibFFX_SSSR} 
     ${RenderPassFiles} 
     ${CoreFiles} 
+    ${UIFiles} 
     ${PostProcessFiles} 
     ${SceneFiles}
 )

diff --git a/Data/Levels/Default.xml b/Data/Levels/Default.xml
@@ -57,8 +57,9 @@
             <Scale>100 0.01 100</Scale>
         </Transform>
         <Model>
+            <Name>Ground Plane</Name>
             <Mesh>Cube</Mesh>
-            <MaterialName>Black_herringbone_tiles_01</MaterialName>
+            <MaterialName>BlackHerringboneTiles01</MaterialName>
         </Model>
     </GameObject>
 
@@ -70,8 +71,9 @@
             <Scale>4 4 4</Scale>
         </Transform>
         <Model>
+            <Name>Metal Cube</Name>
             <Mesh>Cube</Mesh>
-            <MaterialName>Painted_metal_02</MaterialName>
+            <MaterialName>PaintedMetal02</MaterialName>
         </Model>
     </GameObject>
     <GameObject>
@@ -81,8 +83,9 @@
             <Scale>10 0.1 10</Scale>
         </Transform>
         <Model>
+            <Name>Cylinder</Name>
             <Mesh>Cylinder</Mesh>
-            <MaterialName>DarkGray_VeryRough</MaterialName>
+            <MaterialName>DarkOceanTiles05</MaterialName>
         </Model>
     </GameObject>
 
@@ -104,8 +107,9 @@
             <Scale>10 0.1 10</Scale>
         </Transform>
         <Model>
+            <Name>Platform1</Name>
             <Mesh>Cylinder</Mesh>
-            <MaterialName>DarkGray_VeryRough</MaterialName>
+            <MaterialName>Fabric05</MaterialName>
         </Model>
     </GameObject>
 
@@ -116,6 +120,7 @@
             <Scale>12 12 12</Scale>
         </Transform>
         <Model>
+            <Name>Marble Sphere</Name>
             <Mesh>Sphere</Mesh>
             <MaterialName>Marble_08</MaterialName>
         </Model>
@@ -127,6 +132,7 @@
             <Scale>13 0.15 13</Scale>
         </Transform>
         <Model>
+            <Name>Platform0</Name>
             <Mesh>Cylinder</Mesh>
             <MaterialName>Black_VeryRough</MaterialName>
         </Model>
@@ -300,8 +306,8 @@
             <InnerConeAngleDegrees>28</InnerConeAngleDegrees>
         </Spot>
     </Light>
-
-    <Light> <!-- Area Light (WIP) -->
+    <!-- Area Light (WIP) 
+    <Light> 
         <Enabled>false</Enabled>
         <Mobility> Stationary </Mobility>
         <Color>0.08 1.0 0.15</Color>
@@ -313,8 +319,8 @@
             <Scale> 5 5 0.1 </Scale>
         </Transform>
         <Area>
-            <!-- TODO -->
+            
         </Area>
     </Light>
-
+    -->
 </Scene>
diff --git a/Data/Levels/StressTest.xml b/Data/Levels/StressTest.xml
@@ -37,7 +37,7 @@
         <Projection>Perspective</Projection>
         <FoV>60.0</FoV>
         <Near>0.1</Near>
-        <Far>1000</Far>
+        <Far>20000</Far>
 
         <FirstPerson>
             <TranslationSpeed>1000</TranslationSpeed>
@@ -62,6 +62,23 @@
         </FirstPerson>
     </Camera>
 
+    <Camera>
+        <Position> 60.764015 204.101440 -19.462582 </Position>
+        <Pitch>  -5.999988 </Pitch>
+        <Yaw> 180.500031 </Yaw>
+        <Projection>Perspective</Projection>
+        <FoV>60.0</FoV>
+        <Near>0.01</Near>
+        <Far>10000</Far>
+
+        <FirstPerson>
+            <TranslationSpeed>1000</TranslationSpeed>
+            <AngularSpeed>0.05</AngularSpeed>
+            <Drag>9.5</Drag>
+        </FirstPerson>
+    </Camera>
+
+
     <!-- Sponza -->
     <GameObject>
         <Transform>
@@ -144,8 +161,7 @@
         </Model>
     </GameObject>
 
-
-     <!-- Directional Light -->
+    <!-- Directional Light -->
     <Light>
         <Enabled>true</Enabled>
         <Mobility> Stationary </Mobility>
@@ -161,8 +177,8 @@
             <Rotation> 30 0 40 </Rotation>
         </Transform>
         <Directional>
-            <ViewPortX> 220 </ViewPortX>
-            <ViewPortY> 220 </ViewPortY>
+            <ViewPortX> 1024 </ViewPortX>
+            <ViewPortY> 1024 </ViewPortY>
             <Distance> 1000 </Distance>
         </Directional>
     </Light>