Skip to content

Commit 8bfe934

Browse files
konstatoivanenkonstatoivanen
committed
implement light types & shadow maps. refacot certain buffers to use persistent staging buffers. add a new memory block container for raw buffer handling. implement a default buffer iterator for custom containers.
1 parent 21dd4b1 commit 8bfe934

File tree

180 files changed

+127505
-760
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

180 files changed

+127505
-760
lines changed

‎PKAssetTools‎

‎PKRenderer/PKRenderer.vcxproj‎

Lines changed: 67 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -545,17 +545,22 @@ Call "$(SolutionDir)Build\PKAssetTools.exe" "'$(ProjectDir)res\'" "'$(TargetDir)
545545
<ClInclude Include="src\Core\ApplicationConfig.h" />
546546
<ClInclude Include="src\Core\Services\AssetDatabase.h" />
547547
<ClInclude Include="src\ECS\Contextual\Engines\EngineDebug.h" />
548+
<ClInclude Include="src\ECS\Contextual\Engines\EnginePKAssetBuilder.h" />
548549
<ClInclude Include="src\Rendering\Passes\PassGeometry.h" />
549550
<ClInclude Include="src\Rendering\Passes\PassLights.h" />
551+
<ClInclude Include="src\Rendering\VulkanRHI\Systems\VulkanLayoutCache.h" />
552+
<ClInclude Include="src\Utilities\BufferIterator.h" />
550553
<ClInclude Include="src\Utilities\BufferView.h" />
551554
<ClInclude Include="src\Core\CommandConfig.h" />
552555
<ClInclude Include="src\Core\ConsoleCommandBinding.h" />
556+
<ClInclude Include="src\Utilities\FixedList.h" />
553557
<ClInclude Include="src\Utilities\IndexedSet.h" />
554558
<ClInclude Include="src\Utilities\Handle.h" />
555559
<ClInclude Include="src\Core\Services\Input.h" />
556560
<ClInclude Include="src\Core\Services\IService.h" />
557561
<ClInclude Include="src\Utilities\HashHelpers.h" />
558562
<ClInclude Include="src\Utilities\ISingleton.h" />
563+
<ClInclude Include="src\Utilities\MemoryBlock.h" />
559564
<ClInclude Include="src\Utilities\NativeInterface.h" />
560565
<ClInclude Include="src\Utilities\NoCopy.h" />
561566
<ClInclude Include="src\Utilities\Pool.h" />
@@ -786,15 +791,31 @@ Call "$(SolutionDir)Build\PKAssetTools.exe" "'$(ProjectDir)res\'" "'$(TargetDir)
786791
<None Include="libs\VulkanMemoryAllocatord.pdb" />
787792
<None Include="res\configs\ApplicationConfig-Active.cfg" />
788793
<None Include="res\configs\CommandConfig-Active.keycfg" />
794+
<None Include="res\materials\M_Asphalt.material" />
795+
<None Include="res\materials\M_Cloth.material" />
789796
<None Include="res\materials\M_Color_Green.material" />
790797
<None Include="res\materials\M_Color_Red.material" />
791-
<None Include="res\materials\M_Debug.material" />
798+
<None Include="res\materials\M_Gravel.material" />
799+
<None Include="res\materials\M_Ground.material" />
800+
<None Include="res\materials\M_Metal_Panel.material" />
801+
<None Include="res\materials\M_Metal_Rust.material" />
802+
<None Include="res\materials\M_Sand.material" />
803+
<None Include="res\materials\M_Water.material" />
804+
<None Include="res\materials\M_Wood_Floor.material" />
792805
<None Include="res\models\MDL_Cloth.mdl" />
793-
<None Include="res\models\MDL_Debug.mdl" />
806+
<None Include="res\models\MDL_Columns.mdl" />
807+
<None Include="res\models\MDL_Spiral.mdl" />
794808
<None Include="res\shaders\includes\Blit.glsl" />
809+
<None Include="res\shaders\includes\ClusterIndexing.glsl" />
795810
<None Include="res\shaders\includes\Common.glsl" />
796811
<None Include="res\shaders\includes\Constants.glsl" />
797812
<None Include="res\shaders\includes\Encoding.glsl" />
813+
<None Include="res\shaders\includes\BRDF.glsl" />
814+
<None Include="res\shaders\includes\Reconstruction.glsl" />
815+
<None Include="res\shaders\includes\SharedLights.glsl" />
816+
<None Include="res\shaders\includes\SharedShadowmapping.glsl" />
817+
<None Include="res\shaders\includes\SharedSurfaceShading.glsl" />
818+
<None Include="res\shaders\SH_WS_PBR_Cloth.shader" />
798819
<None Include="res\shaders\includes\Utilities.glsl" />
799820
<None Include="res\shaders\includes\Lighting.glsl" />
800821
<None Include="res\shaders\includes\ColorGrading.glsl" />
@@ -808,49 +829,60 @@ Call "$(SolutionDir)Build\PKAssetTools.exe" "'$(ProjectDir)res\'" "'$(TargetDir)
808829
<None Include="res\shaders\SH_CS_Bloom.shader" />
809830
<None Include="res\shaders\SH_CS_FilmGrain.shader" />
810831
<None Include="res\shaders\SH_CS_Histogram.shader" />
832+
<None Include="res\shaders\SH_CS_LightAssignment.shader" />
811833
<None Include="res\shaders\SH_CS_PostEffectsComposite.shader" />
812834
<None Include="res\shaders\SH_VS_DepthOfFieldBlur.shader" />
813835
<None Include="res\shaders\SH_VS_DepthOfFieldComposite.shader" />
814836
<None Include="res\shaders\SH_VS_IBLBackground.shader" />
815-
<None Include="res\shaders\SH_WS_Debug.shader" />
837+
<None Include="res\shaders\SH_VS_ShadowmapBlur.shader" />
838+
<None Include="res\shaders\SH_WS_PBR_Default.shader" />
839+
<None Include="res\shaders\SH_WS_PBR_Glitter.shader" />
840+
<None Include="res\shaders\SH_WS_PBR_Water.shader" />
841+
<None Include="res\shaders\SH_WS_Shadowmap_Generic.shader" />
816842
<None Include="res\shaders\SH_WS_Unlit_Color.shader" />
817-
<None Include="res\textures\T_Asphalt_D.ktx2" />
818-
<None Include="res\textures\T_Asphalt_H.ktx2" />
819-
<None Include="res\textures\T_Asphalt_N.ktx2" />
820-
<None Include="res\textures\T_Asphalt_S.ktx2" />
843+
<None Include="res\textures\default\T_Black.ktx2" />
844+
<None Include="res\textures\default\T_White.ktx2" />
845+
<None Include="res\textures\environment\T_Asphalt_D.ktx2" />
846+
<None Include="res\textures\environment\T_Asphalt_H.ktx2" />
847+
<None Include="res\textures\environment\T_Asphalt_N.ktx2" />
848+
<None Include="res\textures\environment\T_Asphalt_S.ktx2" />
849+
<None Include="res\textures\environment\T_Cloth_D.ktx2" />
850+
<None Include="res\textures\environment\T_Cloth_H.ktx2" />
851+
<None Include="res\textures\environment\T_Cloth_S.ktx2" />
852+
<None Include="res\textures\environment\T_EmissiveTest_E.ktx2" />
853+
<None Include="res\textures\environment\T_Gravel_D.ktx2" />
854+
<None Include="res\textures\environment\T_Gravel_H.ktx2" />
855+
<None Include="res\textures\environment\T_Gravel_N.ktx2" />
856+
<None Include="res\textures\environment\T_Gravel_S.ktx2" />
857+
<None Include="res\textures\environment\T_Ground_D.ktx2" />
858+
<None Include="res\textures\environment\T_Ground_H.ktx2" />
859+
<None Include="res\textures\environment\T_Ground_N.ktx2" />
860+
<None Include="res\textures\environment\T_Ground_S.ktx2" />
861+
<None Include="res\textures\environment\T_Metal_Plates_D.ktx2" />
862+
<None Include="res\textures\environment\T_Metal_Plates_H.ktx2" />
863+
<None Include="res\textures\environment\T_Metal_Plates_N.ktx2" />
864+
<None Include="res\textures\environment\T_Metal_Plates_S.ktx2" />
865+
<None Include="res\textures\environment\T_Metal_Rust_D.ktx2" />
866+
<None Include="res\textures\environment\T_Metal_Rust_H.ktx2" />
867+
<None Include="res\textures\environment\T_Metal_Rust_N.ktx2" />
868+
<None Include="res\textures\environment\T_Metal_Rust_S.ktx2" />
869+
<None Include="res\textures\environment\T_Sand_D.ktx2" />
870+
<None Include="res\textures\environment\T_Sand_H.ktx2" />
871+
<None Include="res\textures\environment\T_Sand_N.ktx2" />
872+
<None Include="res\textures\environment\T_Sand_S.ktx2" />
873+
<None Include="res\textures\environment\T_Wood_Floor_D.ktx2" />
874+
<None Include="res\textures\environment\T_Wood_Floor_H.ktx2" />
875+
<None Include="res\textures\environment\T_Wood_Floor_N.ktx2" />
876+
<None Include="res\textures\environment\T_Wood_Floor_S.ktx2" />
821877
<None Include="res\textures\T_Bloom_LensDirt.ktx2" />
822-
<None Include="res\textures\T_Bluenoise256.ktx2" />
823-
<None Include="res\textures\T_Cloth_D.ktx2" />
824-
<None Include="res\textures\T_Cloth_H.ktx2" />
825-
<None Include="res\textures\T_Cloth_S.ktx2" />
826-
<None Include="res\textures\T_EmissiveTest_E.ktx2" />
827-
<None Include="res\textures\T_Gravel_D.ktx2" />
828-
<None Include="res\textures\T_Gravel_N.ktx2" />
829-
<None Include="res\textures\T_Gravel_S.ktx2" />
830-
<None Include="res\textures\T_Ground_D.ktx2" />
831-
<None Include="res\textures\T_Ground_H.ktx2" />
832-
<None Include="res\textures\T_Ground_N.ktx2" />
833-
<None Include="res\textures\T_Ground_S.ktx2" />
834-
<None Include="res\textures\T_LightCookies.ktx2" />
835-
<None Include="res\textures\T_Metal_Plates_D.ktx2" />
836-
<None Include="res\textures\T_Metal_Plates_N.ktx2" />
837-
<None Include="res\textures\T_Metal_Plates_S.ktx2" />
838-
<None Include="res\textures\T_Metal_Rust_D.ktx2" />
839-
<None Include="res\textures\T_Metal_Rust_N.ktx2" />
840-
<None Include="res\textures\T_Metal_Rust_S.ktx2" />
878+
<None Include="res\textures\default\T_Bluenoise256.ktx2" />
879+
<None Include="res\textures\default\T_LightCookies.ktx2" />
841880
<None Include="res\textures\T_OEM_Desert.ktx2" />
842881
<None Include="res\textures\T_OEM_Mountains.ktx2" />
843882
<None Include="res\textures\T_OEM_Night.ktx2" />
844883
<None Include="res\textures\T_OEM_Park.ktx2" />
845884
<None Include="res\textures\T_OEM_Quarry.ktx2" />
846885
<None Include="res\textures\T_OEM_Trail.ktx2" />
847-
<None Include="res\textures\T_Sand_D.ktx2" />
848-
<None Include="res\textures\T_Sand_H.ktx2" />
849-
<None Include="res\textures\T_Sand_N.ktx2" />
850-
<None Include="res\textures\T_Sand_S.ktx2" />
851-
<None Include="res\textures\T_Wood_Floor_D.ktx2" />
852-
<None Include="res\textures\T_Wood_Floor_N.ktx2" />
853-
<None Include="res\textures\T_Wood_Floor_S.ktx2" />
854886
</ItemGroup>
855887
<ItemGroup>
856888
<ClCompile Include="include\glm\detail\glm.cpp" />
@@ -871,8 +903,10 @@ Call "$(SolutionDir)Build\PKAssetTools.exe" "'$(ProjectDir)res\'" "'$(TargetDir)
871903
<ClCompile Include="src\Core\CommandConfig.cpp" />
872904
<ClCompile Include="src\Core\Services\Input.cpp" />
873905
<ClCompile Include="src\ECS\Contextual\Engines\EngineDebug.cpp" />
906+
<ClCompile Include="src\ECS\Contextual\Engines\EnginePKAssetBuilder.cpp" />
874907
<ClCompile Include="src\Rendering\Passes\PassGeometry.cpp" />
875908
<ClCompile Include="src\Rendering\Passes\PassLights.cpp" />
909+
<ClCompile Include="src\Rendering\VulkanRHI\Systems\VulkanLayoutCache.cpp" />
876910
<ClCompile Include="src\Utilities\HashHelpers.cpp" />
877911
<ClCompile Include="src\Utilities\PropertyBlock.cpp" />
878912
<ClCompile Include="src\Core\Services\Time.cpp" />

‎PKRenderer/PKRenderer.vcxproj.filters‎

Lines changed: 81 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1383,6 +1383,21 @@
13831383
<ClInclude Include="src\Utilities\IndexedSet.h">
13841384
<Filter>Header Files</Filter>
13851385
</ClInclude>
1386+
<ClInclude Include="src\Utilities\FixedList.h">
1387+
<Filter>Header Files</Filter>
1388+
</ClInclude>
1389+
<ClInclude Include="src\Utilities\MemoryBlock.h">
1390+
<Filter>Header Files</Filter>
1391+
</ClInclude>
1392+
<ClInclude Include="src\Utilities\BufferIterator.h">
1393+
<Filter>Header Files</Filter>
1394+
</ClInclude>
1395+
<ClInclude Include="src\ECS\Contextual\Engines\EnginePKAssetBuilder.h">
1396+
<Filter>Header Files</Filter>
1397+
</ClInclude>
1398+
<ClInclude Include="src\Rendering\VulkanRHI\Systems\VulkanLayoutCache.h">
1399+
<Filter>Header Files</Filter>
1400+
</ClInclude>
13861401
</ItemGroup>
13871402
<ItemGroup>
13881403
<None Include="include\glm\detail\func_common.inl">
@@ -1797,8 +1812,6 @@
17971812
<None Include="libs\ktx_read.dll" />
17981813
<None Include="libs\vulkan-1.pdb" />
17991814
<None Include="libs\VulkanMemoryAllocatord.pdb" />
1800-
<None Include="res\shaders\SH_WS_Debug.shader" />
1801-
<None Include="res\models\MDL_Debug.mdl" />
18021815
<None Include="res\models\MDL_Cloth.mdl" />
18031816
<None Include="res\configs\ApplicationConfig-Active.cfg" />
18041817
<None Include="res\configs\CommandConfig-Active.keycfg" />
@@ -1827,43 +1840,72 @@
18271840
<None Include="res\shaders\SH_VS_DepthOfFieldComposite.shader" />
18281841
<None Include="res\shaders\SH_WS_Unlit_Color.shader" />
18291842
<None Include="res\materials\M_Color_Red.material" />
1830-
<None Include="res\materials\M_Debug.material" />
1831-
<None Include="res\textures\T_Wood_Floor_S.ktx2" />
18321843
<None Include="res\textures\T_OEM_Trail.ktx2" />
1833-
<None Include="res\textures\T_Sand_D.ktx2" />
1834-
<None Include="res\textures\T_Sand_H.ktx2" />
1835-
<None Include="res\textures\T_Sand_N.ktx2" />
1836-
<None Include="res\textures\T_Sand_S.ktx2" />
1837-
<None Include="res\textures\T_Wood_Floor_D.ktx2" />
1838-
<None Include="res\textures\T_Wood_Floor_N.ktx2" />
18391844
<None Include="res\textures\T_OEM_Park.ktx2" />
1840-
<None Include="res\textures\T_Gravel_D.ktx2" />
1841-
<None Include="res\textures\T_Gravel_N.ktx2" />
1842-
<None Include="res\textures\T_Gravel_S.ktx2" />
1843-
<None Include="res\textures\T_Ground_D.ktx2" />
1844-
<None Include="res\textures\T_Ground_H.ktx2" />
1845-
<None Include="res\textures\T_Ground_N.ktx2" />
1846-
<None Include="res\textures\T_Ground_S.ktx2" />
1847-
<None Include="res\textures\T_LightCookies.ktx2" />
1848-
<None Include="res\textures\T_Metal_Plates_D.ktx2" />
1849-
<None Include="res\textures\T_Metal_Plates_N.ktx2" />
1850-
<None Include="res\textures\T_Metal_Plates_S.ktx2" />
1851-
<None Include="res\textures\T_Metal_Rust_D.ktx2" />
1852-
<None Include="res\textures\T_Metal_Rust_N.ktx2" />
1853-
<None Include="res\textures\T_Metal_Rust_S.ktx2" />
1845+
<None Include="res\textures\default\T_LightCookies.ktx2" />
18541846
<None Include="res\textures\T_OEM_Desert.ktx2" />
18551847
<None Include="res\textures\T_OEM_Mountains.ktx2" />
18561848
<None Include="res\textures\T_OEM_Night.ktx2" />
1857-
<None Include="res\textures\T_EmissiveTest_E.ktx2" />
1858-
<None Include="res\textures\T_Cloth_S.ktx2" />
1859-
<None Include="res\textures\T_Bluenoise256.ktx2" />
1860-
<None Include="res\textures\T_Cloth_D.ktx2" />
1861-
<None Include="res\textures\T_Cloth_H.ktx2" />
1862-
<None Include="res\textures\T_Asphalt_S.ktx2" />
1863-
<None Include="res\textures\T_Asphalt_D.ktx2" />
1864-
<None Include="res\textures\T_Asphalt_H.ktx2" />
1865-
<None Include="res\textures\T_Asphalt_N.ktx2" />
1849+
<None Include="res\textures\default\T_Bluenoise256.ktx2" />
18661850
<None Include="res\materials\M_Color_Green.material" />
1851+
<None Include="res\shaders\includes\SharedShadowmapping.glsl" />
1852+
<None Include="res\shaders\includes\SharedLights.glsl" />
1853+
<None Include="res\shaders\SH_WS_Shadowmap_Generic.shader" />
1854+
<None Include="res\shaders\SH_VS_ShadowmapBlur.shader" />
1855+
<None Include="res\shaders\SH_CS_LightAssignment.shader" />
1856+
<None Include="res\shaders\includes\ClusterIndexing.glsl" />
1857+
<None Include="res\shaders\includes\Reconstruction.glsl" />
1858+
<None Include="res\shaders\includes\BRDF.glsl" />
1859+
<None Include="res\shaders\includes\SharedSurfaceShading.glsl" />
1860+
<None Include="res\shaders\SH_WS_PBR_Default.shader" />
1861+
<None Include="res\materials\M_Ground.material" />
1862+
<None Include="res\textures\default\T_Black.ktx2" />
1863+
<None Include="res\textures\default\T_White.ktx2" />
1864+
<None Include="res\textures\environment\T_Wood_Floor_S.ktx2" />
1865+
<None Include="res\textures\environment\T_Asphalt_D.ktx2" />
1866+
<None Include="res\textures\environment\T_Asphalt_H.ktx2" />
1867+
<None Include="res\textures\environment\T_Asphalt_N.ktx2" />
1868+
<None Include="res\textures\environment\T_Asphalt_S.ktx2" />
1869+
<None Include="res\textures\environment\T_Cloth_D.ktx2" />
1870+
<None Include="res\textures\environment\T_Cloth_H.ktx2" />
1871+
<None Include="res\textures\environment\T_Cloth_S.ktx2" />
1872+
<None Include="res\textures\environment\T_EmissiveTest_E.ktx2" />
1873+
<None Include="res\textures\environment\T_Gravel_D.ktx2" />
1874+
<None Include="res\textures\environment\T_Gravel_N.ktx2" />
1875+
<None Include="res\textures\environment\T_Gravel_S.ktx2" />
1876+
<None Include="res\textures\environment\T_Ground_D.ktx2" />
1877+
<None Include="res\textures\environment\T_Ground_H.ktx2" />
1878+
<None Include="res\textures\environment\T_Ground_N.ktx2" />
1879+
<None Include="res\textures\environment\T_Ground_S.ktx2" />
1880+
<None Include="res\textures\environment\T_Metal_Plates_D.ktx2" />
1881+
<None Include="res\textures\environment\T_Metal_Plates_N.ktx2" />
1882+
<None Include="res\textures\environment\T_Metal_Plates_S.ktx2" />
1883+
<None Include="res\textures\environment\T_Metal_Rust_D.ktx2" />
1884+
<None Include="res\textures\environment\T_Metal_Rust_N.ktx2" />
1885+
<None Include="res\textures\environment\T_Metal_Rust_S.ktx2" />
1886+
<None Include="res\textures\environment\T_Sand_D.ktx2" />
1887+
<None Include="res\textures\environment\T_Sand_H.ktx2" />
1888+
<None Include="res\textures\environment\T_Sand_N.ktx2" />
1889+
<None Include="res\textures\environment\T_Sand_S.ktx2" />
1890+
<None Include="res\textures\environment\T_Wood_Floor_D.ktx2" />
1891+
<None Include="res\textures\environment\T_Wood_Floor_N.ktx2" />
1892+
<None Include="res\materials\M_Cloth.material" />
1893+
<None Include="res\materials\M_Asphalt.material" />
1894+
<None Include="res\materials\M_Gravel.material" />
1895+
<None Include="res\materials\M_Metal_Panel.material" />
1896+
<None Include="res\materials\M_Metal_Rust.material" />
1897+
<None Include="res\materials\M_Sand.material" />
1898+
<None Include="res\materials\M_Water.material" />
1899+
<None Include="res\materials\M_Wood_Floor.material" />
1900+
<None Include="res\shaders\SH_WS_PBR_Cloth.shader" />
1901+
<None Include="res\shaders\SH_WS_PBR_Glitter.shader" />
1902+
<None Include="res\shaders\SH_WS_PBR_Water.shader" />
1903+
<None Include="res\textures\environment\T_Gravel_H.ktx2" />
1904+
<None Include="res\textures\environment\T_Metal_Plates_H.ktx2" />
1905+
<None Include="res\textures\environment\T_Metal_Rust_H.ktx2" />
1906+
<None Include="res\textures\environment\T_Wood_Floor_H.ktx2" />
1907+
<None Include="res\models\MDL_Spiral.mdl" />
1908+
<None Include="res\models\MDL_Columns.mdl" />
18671909
</ItemGroup>
18681910
<ItemGroup>
18691911
<ClCompile Include="include\glm\detail\glm.cpp">
@@ -2073,6 +2115,12 @@
20732115
<ClCompile Include="src\Utilities\HashHelpers.cpp">
20742116
<Filter>Source Files</Filter>
20752117
</ClCompile>
2118+
<ClCompile Include="src\ECS\Contextual\Engines\EnginePKAssetBuilder.cpp">
2119+
<Filter>Source Files</Filter>
2120+
</ClCompile>
2121+
<ClCompile Include="src\Rendering\VulkanRHI\Systems\VulkanLayoutCache.cpp">
2122+
<Filter>Source Files</Filter>
2123+
</ClCompile>
20762124
</ItemGroup>
20772125
<ItemGroup>
20782126
<Library Include="libs\glfw3.lib" />

‎PKRenderer/PKRenderer.vcxproj.user‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
77
<LocalDebuggerWorkingDirectory>$(SolutionDir)Build\$(ProjectName)_$(Platform)_$(Configuration)\</LocalDebuggerWorkingDirectory>
88
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
9+
<LocalDebuggerCommandArguments>"'$(SolutionDir)Build\PKAssetTools.exe'" "'$(SolutionDir)$(ProjectName)\res'" "'$(SolutionDir)Build\$(ProjectName)_$(Platform)_$(Configuration)\res'"</LocalDebuggerCommandArguments>
910
</PropertyGroup>
1011
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
1112
<LocalDebuggerWorkingDirectory>$(SolutionDir)Build\$(ProjectName)_$(Platform)_$(Configuration)\</LocalDebuggerWorkingDirectory>
1213
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
14+
<LocalDebuggerCommandArguments>"'$(SolutionDir)Build\PKAssetTools.exe'" "'$(SolutionDir)$(ProjectName)\res'" "'$(SolutionDir)Build\$(ProjectName)_$(Platform)_$(Configuration)\res'"</LocalDebuggerCommandArguments>
1315
</PropertyGroup>
1416
</Project>

‎PKRenderer/include/PKAssets/PKAsset.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ namespace PK::Assets
214214
constexpr const static char* PK_SHADER_ATTRIB_OFFSET = "#Offset ";
215215
constexpr const static char* PK_SHADER_ATTRIB_MULTI_COMPILE = "#multi_compile ";
216216
constexpr const static char* PK_SHADER_ATTRIB_MATERIAL_PROP = "#MaterialProperty ";
217+
constexpr const static char* PK_SHADER_ATTRIB_INSTANCING_PROP = "#EnableInstancing";
217218

218219
constexpr const static char* PK_SHADER_INSTANCING_TRANSFORMS = "pk_Instancing_Transforms";
219220
constexpr const static char* PK_SHADER_INSTANCING_INDICES = "pk_Instancing_Indices";
@@ -222,7 +223,6 @@ namespace PK::Assets
222223
constexpr const static char* PK_SHADER_INSTANCING_TEXTURES3D = "pk_Instancing_Textures3D";
223224
constexpr const static char* PK_SHADER_INSTANCING_TEXTURESCUBE = "pk_Instancing_TexturesCube";
224225

225-
226226
enum class Type : unsigned char
227227
{
228228
Graphics,

‎PKRenderer/res/configs/ApplicationConfig-Active.cfg‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ InitialHeight: 512
99

1010
RandomSeed: 44
1111

12-
CameraStartPosition: [ 0.0, 0.0, 0.0]
13-
CameraStartRotation: [ 0.0, 0.0, 0.0]
12+
CameraStartPosition: [0, 5, -9]
13+
CameraStartRotation: [0,0,0]
1414
CameraSpeed: 5.0
1515
CameraLookSensitivity: 2.0
1616
CameraMoveSmoothing: 0.99
@@ -21,8 +21,7 @@ CameraZFar: 200.0
2121
CascadeLinearity: 0.75
2222
TimeScale: 1.0
2323

24-
ZCullLights: False
25-
LightCount: 8
24+
LightCount: 4
2625
ShadowmapTileSize: 1024
2726
ShadowmapTileCount: 32
2827

0 commit comments

Comments
 (0)