Merge branch 'dev'

GameWin221 · Jun 30, 2022 · 988dc36 · 988dc36
2 parents 41b053d + 7154489
commit 988dc36
Show file tree

Hide file tree

Showing 75 changed files with 2,091 additions and 1,683 deletions.
diff --git a/EruptionEngine.vcxproj b/EruptionEngine.vcxproj
@@ -72,9 +72,11 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <PreBuildEventUseInBuild>true</PreBuildEventUseInBuild>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <PreBuildEventUseInBuild>true</PreBuildEventUseInBuild>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
@@ -99,6 +101,8 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -113,6 +117,8 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -146,7 +152,8 @@
       </Command>
     </PostBuildEvent>
     <PreBuildEvent>
-      <Command>Shaders\compile.bat</Command>
+      <Command>
+      </Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -178,19 +185,20 @@
       </Command>
     </PostBuildEvent>
     <PreBuildEvent>
-      <Command>Shaders\compile.bat</Command>
+      <Command>
+      </Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="Source\Renderer\ComputeShader.cpp" />
     <ClCompile Include="Source\Renderer\Image.cpp" />
     <ClCompile Include="Source\Editor\UIPanels\SettingsPanel.cpp" />
     <ClCompile Include="Source\Editor\UIPanels\InspectorPanel.cpp" />
     <ClCompile Include="Source\Editor\UIPanels\SceneHierarchyPanel.cpp" />
     <ClCompile Include="Source\Editor\UIPanels\AssetManagerPanel.cpp" />
     <ClCompile Include="Source\Renderer\Buffers\MemoryBuffer.cpp" />
     <ClCompile Include="Source\Renderer\DynamicFramebuffer.cpp" />
-    <ClCompile Include="Source\Renderer\Lights\Lights.cpp" />
-    <ClCompile Include="Source\Renderer\PipelineInput.cpp" />
+    <ClCompile Include="Source\Renderer\DescriptorSet.cpp" />
     <ClCompile Include="Source\Renderer\Pipeline.cpp" />
     <ClCompile Include="Source\Editor\EditorImageAtlas.cpp" />
     <ClCompile Include="Source\Renderer\Camera\CameraMatricesBuffer.cpp" />
@@ -259,6 +267,7 @@
     <ClCompile Include="Source\Renderer\Swapchain.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="Source\Renderer\ComputeShader.hpp" />
     <ClInclude Include="Source\Renderer\Image.hpp" />
     <ClInclude Include="Source\Assets\Asset.hpp" />
     <ClInclude Include="Source\Editor\UIPanels\SettingsPanel.hpp" />
@@ -269,7 +278,7 @@
     <ClInclude Include="Source\Editor\UIPanels\AssetManagerPanel.hpp" />
     <ClInclude Include="Source\Renderer\Buffers\MemoryBuffer.hpp" />
     <ClInclude Include="Source\Renderer\DynamicFramebuffer.hpp" />
-    <ClInclude Include="Source\Renderer\PipelineInput.hpp" />
+    <ClInclude Include="Source\Renderer\DescriptorSet.hpp" />
     <ClInclude Include="Source\Renderer\Pipeline.hpp" />
     <ClInclude Include="Source\Editor\EditorImageAtlas.hpp" />
     <ClInclude Include="External\ImGui\imconfig.h" />
@@ -286,6 +295,7 @@
     <ClInclude Include="Include\EnPch.hpp" />
     <ClInclude Include="Source\Core\Log.hpp" />
     <ClInclude Include="Source\Scene\Scene.hpp" />
+    <ClInclude Include="Source\Scene\SceneMember.hpp" />
     <ClInclude Include="Source\Scene\SceneObject.hpp" />
     <ClInclude Include="Source\Assets\Material.hpp" />
     <ClInclude Include="Source\Core\EnPch.hpp" />
@@ -306,34 +316,34 @@
     <ClInclude Include="Source\Common\Helpers.hpp" />
     <ClInclude Include="Source\Input\InputManager.hpp" />
     <ClInclude Include="Source\Editor\EditorLayer.hpp" />
-    <ClInclude Include="Source\Renderer\Lights\Spotlight.hpp" />
+    <ClInclude Include="Source\Renderer\Lights\SpotLight.hpp" />
     <ClInclude Include="Source\Renderer\Swapchain.hpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="EruptionEngine.ini" />
-    <None Include="Shaders\DepthFragment.frag" />
-    <None Include="Shaders\DepthVertex.vert" />
+    <None Include="Shaders\AMD\AMDFXAA.comp" />
+    <None Include="Shaders\AMD\AMDTonemapping.comp" />
+    <None Include="Shaders\Depth.frag" />
+    <None Include="Shaders\Depth.vert" />
     <None Include="Shaders\FXAA.frag" />
     <None Include="Shaders\GeometryFragment.frag">
       <FileType>Document</FileType>
     </None>
-    <CopyFileToFolders Include="Shaders\GeometryFragment.spv">
-      <FileType>Document</FileType>
-      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)Build\$(Platform)\$(Configuration)\Shaders\</DestinationFolders>
-      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)Build\$(Platform)\$(Configuration)\Shaders\</DestinationFolders>
-    </CopyFileToFolders>
     <None Include="Shaders\GeometryVertex.vert">
       <FileType>Document</FileType>
     </None>
-    <None Include="Shaders\LightingFrag.frag">
+    <None Include="Shaders\Lighting.frag">
       <FileType>Document</FileType>
     </None>
     <None Include="Shaders\FullscreenTriVert.vert">
       <FileType>Document</FileType>
     </None>
     <None Include="Shaders\Move.frag" />
+    <None Include="Shaders\NVIDIA\NVFXAA.comp" />
+    <None Include="Shaders\NVIDIA\NVTonemapping.comp" />
     <None Include="Shaders\SMAA.frag" />
-    <None Include="Shaders\TonemapFrag.frag" />
+    <None Include="Shaders\TonemapComp.comp" />
+    <None Include="Shaders\Tonemapping.frag" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/EruptionEngine.vcxproj.filters b/EruptionEngine.vcxproj.filters
@@ -114,7 +114,7 @@
     <ClCompile Include="Source\Renderer\Pipeline.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Renderer\PipelineInput.cpp">
+    <ClCompile Include="Source\Renderer\DescriptorSet.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="Source\Renderer\Buffers\MemoryBuffer.cpp">
@@ -132,9 +132,6 @@
     <ClCompile Include="Source\Editor\UIPanels\InspectorPanel.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Renderer\Lights\Lights.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="Source\Editor\UIPanels\SettingsPanel.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -144,6 +141,9 @@
     <ClCompile Include="Source\Renderer\Swapchain.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="Source\Renderer\ComputeShader.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Include\EnPch.hpp">
@@ -254,7 +254,7 @@
     <ClInclude Include="Source\Renderer\Pipeline.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\Renderer\PipelineInput.hpp">
+    <ClInclude Include="Source\Renderer\DescriptorSet.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="Source\Renderer\Buffers\MemoryBuffer.hpp">
@@ -278,7 +278,7 @@
     <ClInclude Include="Source\Renderer\Lights\DirectionalLight.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\Renderer\Lights\Spotlight.hpp">
+    <ClInclude Include="Source\Renderer\Lights\SpotLight.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="Source\Editor\UIPanels\SettingsPanel.hpp">
@@ -293,21 +293,29 @@
     <ClInclude Include="Source\Renderer\Swapchain.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Source\Renderer\ComputeShader.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Source\Scene\SceneMember.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="EruptionEngine.ini" />
     <None Include="Shaders\GeometryFragment.frag" />
     <None Include="Shaders\GeometryVertex.vert" />
-    <None Include="Shaders\LightingFrag.frag" />
+    <None Include="Shaders\Lighting.frag" />
     <None Include="Shaders\FullscreenTriVert.vert" />
-    <None Include="Shaders\TonemapFrag.frag" />
-    <None Include="Shaders\DepthFragment.frag" />
-    <None Include="Shaders\DepthVertex.vert" />
-    <None Include="Shaders\FXAA.frag" />
+    <None Include="Shaders\TonemapComp.comp" />
+    <None Include="Shaders\Depth.frag" />
     <None Include="Shaders\SMAA.frag" />
     <None Include="Shaders\Move.frag" />
-  </ItemGroup>
-  <ItemGroup>
-    <CopyFileToFolders Include="Shaders\GeometryFragment.spv" />
+    <None Include="Shaders\AMD\AMDFXAA.comp" />
+    <None Include="Shaders\AMD\AMDTonemapping.comp" />
+    <None Include="Shaders\NVIDIA\NVFXAA.comp" />
+    <None Include="Shaders\NVIDIA\NVTonemapping.comp" />
+    <None Include="Shaders\Depth.vert" />
+    <None Include="Shaders\Tonemapping.frag" />
+    <None Include="Shaders\FXAA.frag" />
   </ItemGroup>
 </Project>
diff --git a/Shaders/DepthVertex.spv → Shaders/Depth.spv b/Shaders/DepthVertex.spv → Shaders/Depth.spv
diff --git a/Shaders/DepthVertex.vert → Shaders/Depth.vert b/Shaders/DepthVertex.vert → Shaders/Depth.vert
diff --git a/Shaders/DepthFragment.frag b/Shaders/DepthFragment.frag
diff --git a/Shaders/DepthFragment.spv b/Shaders/DepthFragment.spv
diff --git a/Shaders/LightingFrag.frag → Shaders/Lighting.frag b/Shaders/LightingFrag.frag → Shaders/Lighting.frag
@@ -17,7 +17,7 @@ struct PointLight
     vec4 positionRadius;
     vec3 color;
 };
-struct Spotlight
+struct SpotLight
 {
     vec3 position;
     float innerCutoff;
@@ -35,11 +35,11 @@ struct DirLight
 layout(binding = 3) uniform UBO 
 {
     PointLight pLights[MAX_POINT_LIGHTS];
-    Spotlight  sLights[MAX_SPOT_LIGHTS];
+    SpotLight  sLights[MAX_SPOT_LIGHTS];
     DirLight   dLights[MAX_DIR_LIGHTS];
 
     uint activePointLights;
-    uint activeSpotlights;
+    uint activeSpotLights;
     uint activeDirLights;
 
     vec3 ambient;
@@ -142,7 +142,7 @@ vec3 CalculateDirLight(DirLight light, vec3 albedo, float roughness, float metal
 
     return (kD * albedo / PI + specular) * radiance * NdotL;
 }
-vec3 CalculateSpotLight(Spotlight light, vec3 albedo, float roughness, float metalness, vec3 F0, vec3 viewDir, vec3 position, vec3 normal, float theta)
+vec3 CalculateSpotLight(SpotLight light, vec3 albedo, float roughness, float metalness, vec3 F0, vec3 viewDir, vec3 position, vec3 normal, float theta)
 {
     float dist = length(position - light.position);
 
@@ -202,7 +202,7 @@ void main()
         if(dist < lightsBuffer.pLights[i].positionRadius.w)
             lighting += CalculatePointLight(lightsBuffer.pLights[i], albedo, roughness, metalness, F0, viewDir, position, normal, dist);
     }
-    for(int i = 0; i < lightsBuffer.activeSpotlights; i++)
+    for(int i = 0; i < lightsBuffer.activeSpotLights; i++)
     {
         vec3 lightToSurfaceDir = normalize(position - lightsBuffer.sLights[i].position);
 

diff --git a/Shaders/LightingFrag.spv → Shaders/Lighting.spv b/Shaders/LightingFrag.spv → Shaders/Lighting.spv
diff --git a/Shaders/TonemapFrag.frag → Shaders/Tonemapping.frag b/Shaders/TonemapFrag.frag → Shaders/Tonemapping.frag
diff --git a/Shaders/TonemapFrag.spv → Shaders/Tonemapping.spv b/Shaders/TonemapFrag.spv → Shaders/Tonemapping.spv
diff --git a/Shaders/compile.bat b/Shaders/compile.bat
@@ -1,10 +1,9 @@
 %VULKAN_SDK%/Bin/glslc.exe %~dp0\GeometryVertex.vert -o %~dp0\GeometryVertex.spv
 %VULKAN_SDK%/Bin/glslc.exe %~dp0\GeometryFragment.frag -o %~dp0\GeometryFragment.spv
 %VULKAN_SDK%/Bin/glslc.exe %~dp0\FullscreenTriVert.vert -o %~dp0\FullscreenTriVert.spv
-%VULKAN_SDK%/Bin/glslc.exe %~dp0\LightingFrag.frag -o %~dp0\LightingFrag.spv
-%VULKAN_SDK%/Bin/glslc.exe %~dp0\TonemapFrag.frag -o %~dp0\TonemapFrag.spv
-%VULKAN_SDK%/Bin/glslc.exe %~dp0\DepthFragment.frag -o %~dp0\DepthFragment.spv
-%VULKAN_SDK%/Bin/glslc.exe %~dp0\DepthVertex.vert -o %~dp0\DepthVertex.spv
+%VULKAN_SDK%/Bin/glslc.exe %~dp0\Lighting.frag -o %~dp0\Lighting.spv
+%VULKAN_SDK%/Bin/glslc.exe %~dp0\Tonemapping.frag -o %~dp0\Tonemapping.spv
+%VULKAN_SDK%/Bin/glslc.exe %~dp0\Depth.vert -o %~dp0\Depth.spv
 %VULKAN_SDK%/Bin/glslc.exe %~dp0\FXAA.frag -o %~dp0\FXAA.spv
 
 pause
diff --git a/Source/Assets/Asset.hpp b/Source/Assets/Asset.hpp
@@ -14,9 +14,20 @@ namespace en
 		None
 	};
 
+	struct Asset;
+
+	template<class T>
+	concept IsAssetChild = std::derived_from<T, Asset> || std::same_as<T, Asset>;
+
 	struct Asset
 	{
-		AssetType m_Type = AssetType::None;
+		const AssetType m_Type = AssetType::None;
+
+		template<IsAssetChild T>
+		T* CastTo()
+		{
+			return reinterpret_cast<T*>(this);
+		}
 	};
 }