From 219c3394ed3c83aa2feed3c97617bfac0e877754 Mon Sep 17 00:00:00 2001 From: Anish Bhobe Date: Sun, 15 Jun 2025 22:35:54 +0200 Subject: [PATCH] Mass restructure. --- Mesh.slang => Assets/Shaders/Mesh.slang | 8 +- .../Textures/container2.png | 0 wall.jpg => Assets/Textures/wall.jpg | 0 Blaze.vcxproj | 62 ++++---- Blaze.vcxproj.filters | 149 ++++++++++-------- AppState.cpp => Blaze/AppState.cpp | 0 AppState.h => Blaze/AppState.h | 0 Blaze.cpp => Blaze/Blaze.cpp | 0 Frame.cpp => Blaze/Frame.cpp | 0 Frame.h => Blaze/Frame.h | 0 GlobalMemory.cpp => Blaze/GlobalMemory.cpp | 0 GlobalMemory.h => Blaze/GlobalMemory.h | 0 MacroUtils.h => Blaze/MacroUtils.h | 0 MathUtil.h => Blaze/MathUtil.h | 0 MiscData.cpp => Blaze/MiscData.cpp | 2 +- MiscData.h => Blaze/MiscData.h | 0 RenderDevice.cpp => Blaze/RenderDevice.cpp | 0 RenderDevice.h => Blaze/RenderDevice.h | 0 StbImpl.cpp => Blaze/StbImpl.cpp | 0 VmaImpl.cpp => Blaze/VmaImpl.cpp | 0 20 files changed, 111 insertions(+), 110 deletions(-) rename Mesh.slang => Assets/Shaders/Mesh.slang (80%) rename container2.png => Assets/Textures/container2.png (100%) rename wall.jpg => Assets/Textures/wall.jpg (100%) rename AppState.cpp => Blaze/AppState.cpp (100%) rename AppState.h => Blaze/AppState.h (100%) rename Blaze.cpp => Blaze/Blaze.cpp (100%) rename Frame.cpp => Blaze/Frame.cpp (100%) rename Frame.h => Blaze/Frame.h (100%) rename GlobalMemory.cpp => Blaze/GlobalMemory.cpp (100%) rename GlobalMemory.h => Blaze/GlobalMemory.h (100%) rename MacroUtils.h => Blaze/MacroUtils.h (100%) rename MathUtil.h => Blaze/MathUtil.h (100%) rename MiscData.cpp => Blaze/MiscData.cpp (99%) rename MiscData.h => Blaze/MiscData.h (100%) rename RenderDevice.cpp => Blaze/RenderDevice.cpp (100%) rename RenderDevice.h => Blaze/RenderDevice.h (100%) rename StbImpl.cpp => Blaze/StbImpl.cpp (100%) rename VmaImpl.cpp => Blaze/VmaImpl.cpp (100%) diff --git a/Mesh.slang b/Assets/Shaders/Mesh.slang similarity index 80% rename from Mesh.slang rename to Assets/Shaders/Mesh.slang index df423d2..0b7bb1c 100644 --- a/Mesh.slang +++ b/Assets/Shaders/Mesh.slang @@ -46,12 +46,6 @@ float4 FragmentMain( float4 interpolatedColors : CoarseColor, float2 uv0 : TexCoord0, ) : SV_Target0 { - float4 outColor; - if (interpolatePosition.x < 0) { - outColor = float4(perFrameData.texture.SampleLevel(uv0, 0).rgb, 1.0f) * interpolatedColors; - } else { - outColor = float4(perFrameData.texture.Sample(uv0).rgb, 1.0f) * interpolatedColors; - } - return outColor; + return float4(perFrameData.texture.Sample(uv0).rgb, 1.0f) * interpolatedColors; } diff --git a/container2.png b/Assets/Textures/container2.png similarity index 100% rename from container2.png rename to Assets/Textures/container2.png diff --git a/wall.jpg b/Assets/Textures/wall.jpg similarity index 100% rename from wall.jpg rename to Assets/Textures/wall.jpg diff --git a/Blaze.vcxproj b/Blaze.vcxproj index be1b2e5..f2f9332 100644 --- a/Blaze.vcxproj +++ b/Blaze.vcxproj @@ -147,52 +147,50 @@ C:\Users\Eon\source\repos\Blaze\vcpkg_installed\x64-windows\x64-windows\bin;%(AdditionalLibraryDirectories) - - - - - - - - - - + + false + false + Document + slangc %(FullPath) -profile sm_6_6 -target spirv -o %(Filename).spv + Compiling %(Filename).slang + %(Filename).spv + slangc %(FullPath) -profile sm_6_6 -target spirv -o %(Filename).spv + Compiling %(Filename).slang + %(Filename).spv + - - Document - slangc %(FullPath) -profile sm_6_6 -target spirv -o %(Filename).spv - %(Filename).spv - slangc %(FullPath) -profile sm_6_6 -target spirv -o %(Filename).spv - %(Filename).spv - false - false - false - false - Compiling slang shader - Compiling slang shader - - - - - - - - + + + + + + + - - + + + + + + + + + + + + diff --git a/Blaze.vcxproj.filters b/Blaze.vcxproj.filters index 5043e5f..2a159ed 100644 --- a/Blaze.vcxproj.filters +++ b/Blaze.vcxproj.filters @@ -13,90 +13,99 @@ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - + + {f1e377e6-a7c9-4c3e-8068-1d83aa67df45} + + {672b8ec5-258c-4a21-bbf7-66d3b1185fe9} + + {644c6f90-020a-4691-8c0a-6eee17301b80} + + + {1f13daa9-d8c1-4fda-b5a5-09ed652775e7} + - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Resource Files - - - Resource Files - Resource Files - - Resource Files - Resource Files - Resource Files + Resource Files\Config + + + Resource Files\Config + + + Resource Files\Config + + + Resource Files\Config - - Shader Files + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files\HeaderOnlyImpl + + + Source Files\HeaderOnlyImpl + + + + + Resource Files\Textures + + + Resource Files\Textures + + + + + Resource Files\Shader Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - \ No newline at end of file diff --git a/AppState.cpp b/Blaze/AppState.cpp similarity index 100% rename from AppState.cpp rename to Blaze/AppState.cpp diff --git a/AppState.h b/Blaze/AppState.h similarity index 100% rename from AppState.h rename to Blaze/AppState.h diff --git a/Blaze.cpp b/Blaze/Blaze.cpp similarity index 100% rename from Blaze.cpp rename to Blaze/Blaze.cpp diff --git a/Frame.cpp b/Blaze/Frame.cpp similarity index 100% rename from Frame.cpp rename to Blaze/Frame.cpp diff --git a/Frame.h b/Blaze/Frame.h similarity index 100% rename from Frame.h rename to Blaze/Frame.h diff --git a/GlobalMemory.cpp b/Blaze/GlobalMemory.cpp similarity index 100% rename from GlobalMemory.cpp rename to Blaze/GlobalMemory.cpp diff --git a/GlobalMemory.h b/Blaze/GlobalMemory.h similarity index 100% rename from GlobalMemory.h rename to Blaze/GlobalMemory.h diff --git a/MacroUtils.h b/Blaze/MacroUtils.h similarity index 100% rename from MacroUtils.h rename to Blaze/MacroUtils.h diff --git a/MathUtil.h b/Blaze/MathUtil.h similarity index 100% rename from MathUtil.h rename to Blaze/MathUtil.h diff --git a/MiscData.cpp b/Blaze/MiscData.cpp similarity index 99% rename from MiscData.cpp rename to Blaze/MiscData.cpp index 09d7a4c..429e6a2 100644 --- a/MiscData.cpp +++ b/Blaze/MiscData.cpp @@ -369,7 +369,7 @@ bool MiscData::init( RenderDevice const& renderDevice ) int nc; int requestedChannels = static_cast( numChannels ); - textureData = stbi_load( "wall.jpg", &w, &h, &nc, requestedChannels ); + textureData = stbi_load( "Assets/Textures/wall.jpg", &w, &h, &nc, requestedChannels ); ASSERT( nc <= requestedChannels ); if ( !textureData ) diff --git a/MiscData.h b/Blaze/MiscData.h similarity index 100% rename from MiscData.h rename to Blaze/MiscData.h diff --git a/RenderDevice.cpp b/Blaze/RenderDevice.cpp similarity index 100% rename from RenderDevice.cpp rename to Blaze/RenderDevice.cpp diff --git a/RenderDevice.h b/Blaze/RenderDevice.h similarity index 100% rename from RenderDevice.h rename to Blaze/RenderDevice.h diff --git a/StbImpl.cpp b/Blaze/StbImpl.cpp similarity index 100% rename from StbImpl.cpp rename to Blaze/StbImpl.cpp diff --git a/VmaImpl.cpp b/Blaze/VmaImpl.cpp similarity index 100% rename from VmaImpl.cpp rename to Blaze/VmaImpl.cpp