kidrigger
/
Blaze
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mass restructure.

This commit is contained in:
Anish Bhobe 2025-06-15 22:35:54 +02:00
parent 6da0250c81
commit 219c3394ed
20 changed files with 111 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Mesh.slang → Assets/Shaders/Mesh.slang
View File

@ -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;
}

0
container2.png → Assets/Textures/container2.png
View File

0
wall.jpg → Assets/Textures/wall.jpg
View File

62
Blaze.vcxproj
View File

@ -147,52 +147,50 @@
<AdditionalLibraryDirectories>C:\Users\Eon\source\repos\Blaze\vcpkg_installed\x64-windows\x64-windows\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="AppState.cpp" />
<ClCompile Include="Blaze.cpp" />
<ClCompile Include="Frame.cpp" />
<ClCompile Include="GlobalMemory.cpp" />
<ClCompile Include="MiscData.cpp" />
<ClCompile Include="RenderDevice.cpp" />
<ClCompile Include="StbImpl.cpp" />
<ClCompile Include="VmaImpl.cpp" />
</ItemGroup>
<ItemGroup>
<None Include=".clang-format" />
<None Include=".gitignore" />
<CustomBuild Include="Assets\Shaders\Mesh.slang">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
<FileType>Document</FileType>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">slangc %(FullPath) -profile sm_6_6 -target spirv -o %(Filename).spv</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compiling %(Filename).slang</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename).spv</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">slangc %(FullPath) -profile sm_6_6 -target spirv -o %(Filename).spv</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compiling %(Filename).slang</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename).spv</Outputs>
</CustomBuild>
<None Include="PLAN.md">
<SubType>
</SubType>
</None>
<None Include="README.md" />
<CustomBuild Include="Mesh.slang">
<FileType>Document</FileType>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">slangc %(FullPath) -profile sm_6_6 -target spirv -o %(Filename).spv</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename).spv</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">slangc %(FullPath) -profile sm_6_6 -target spirv -o %(Filename).spv</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename).spv</Outputs>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
<TreatOutputAsContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</TreatOutputAsContent>
<TreatOutputAsContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</TreatOutputAsContent>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compiling slang shader</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compiling slang shader</Message>
</CustomBuild>
<None Include="vcpkg-configuration.json" />
<None Include="vcpkg.json" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="AppState.h" />
<ClInclude Include="Frame.h" />
<ClInclude Include="GlobalMemory.h" />
<ClInclude Include="MacroUtils.h" />
<ClInclude Include="MathUtil.h" />
<ClInclude Include="MiscData.h" />
<ClInclude Include="RenderDevice.h" />
<ClInclude Include="Blaze\AppState.h" />
<ClInclude Include="Blaze\Frame.h" />
<ClInclude Include="Blaze\GlobalMemory.h" />
<ClInclude Include="Blaze\MacroUtils.h" />
<ClInclude Include="Blaze\MathUtil.h" />
<ClInclude Include="Blaze\MiscData.h" />
<ClInclude Include="Blaze\RenderDevice.h" />
</ItemGroup>
<ItemGroup>
<Image Include="container2.png" />
<Image Include="wall.jpg" />
<ClCompile Include="Blaze\AppState.cpp" />
<ClCompile Include="Blaze\Blaze.cpp" />
<ClCompile Include="Blaze\Frame.cpp" />
<ClCompile Include="Blaze\GlobalMemory.cpp" />
<ClCompile Include="Blaze\MiscData.cpp" />
<ClCompile Include="Blaze\RenderDevice.cpp" />
<ClCompile Include="Blaze\StbImpl.cpp" />
<ClCompile Include="Blaze\VmaImpl.cpp" />
</ItemGroup>
<ItemGroup>
<Image Include="Assets\Textures\container2.png" />
<Image Include="Assets\Textures\wall.jpg" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

149
Blaze.vcxproj.filters
View File

@ -13,90 +13,99 @@
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
<Filter Include="Shader Files">
<Filter Include="Source Files\HeaderOnlyImpl">
<UniqueIdentifier>{f1e377e6-a7c9-4c3e-8068-1d83aa67df45}</UniqueIdentifier>
</Filter>
<Filter Include="Resource Files\Shader Files">
<UniqueIdentifier>{672b8ec5-258c-4a21-bbf7-66d3b1185fe9}</UniqueIdentifier>
</Filter>
<Filter Include="Resource Files\Textures">
<UniqueIdentifier>{644c6f90-020a-4691-8c0a-6eee17301b80}</UniqueIdentifier>
</Filter>
<Filter Include="Resource Files\Config">
<UniqueIdentifier>{1f13daa9-d8c1-4fda-b5a5-09ed652775e7}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="Blaze.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Frame.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="RenderDevice.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="AppState.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="MiscData.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="GlobalMemory.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="VmaImpl.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="StbImpl.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="vcpkg.json">
<Filter>Resource Files</Filter>
</None>
<None Include="vcpkg-configuration.json">
<Filter>Resource Files</Filter>
</None>
<None Include="README.md">
<Filter>Resource Files</Filter>
</None>
<None Include=".gitignore">
<Filter>Resource Files</Filter>
</None>
<None Include="PLAN.md">
<Filter>Resource Files</Filter>
</None>
<None Include=".clang-format">
<Filter>Resource Files</Filter>
<Filter>Resource Files\Config</Filter>
</None>
<None Include=".gitignore">
<Filter>Resource Files\Config</Filter>
</None>
<None Include="vcpkg.json">
<Filter>Resource Files\Config</Filter>
</None>
<None Include="vcpkg-configuration.json">
<Filter>Resource Files\Config</Filter>
</None>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="Mesh.slang">
<Filter>Shader Files</Filter>
<ClInclude Include="Blaze\AppState.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Blaze\Frame.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Blaze\GlobalMemory.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Blaze\MacroUtils.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Blaze\MathUtil.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Blaze\MiscData.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Blaze\RenderDevice.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="Blaze\AppState.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Blaze\Blaze.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Blaze\Frame.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Blaze\GlobalMemory.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Blaze\MiscData.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Blaze\RenderDevice.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Blaze\StbImpl.cpp">
<Filter>Source Files\HeaderOnlyImpl</Filter>
</ClCompile>
<ClCompile Include="Blaze\VmaImpl.cpp">
<Filter>Source Files\HeaderOnlyImpl</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Image Include="Assets\Textures\container2.png">
<Filter>Resource Files\Textures</Filter>
</Image>
<Image Include="Assets\Textures\wall.jpg">
<Filter>Resource Files\Textures</Filter>
</Image>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="Assets\Shaders\Mesh.slang">
<Filter>Resource Files\Shader Files</Filter>
</CustomBuild>
</ItemGroup>
<ItemGroup>
<ClInclude Include="Frame.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="RenderDevice.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="MacroUtils.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="MathUtil.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="AppState.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="MiscData.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="GlobalMemory.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="container2.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="wall.jpg">
<Filter>Resource Files</Filter>
</Image>
</ItemGroup>
</Project>

0
AppState.cpp → Blaze/AppState.cpp
View File

0
AppState.h → Blaze/AppState.h
View File

0
Blaze.cpp → Blaze/Blaze.cpp
View File

0
Frame.cpp → Blaze/Frame.cpp
View File

0
Frame.h → Blaze/Frame.h
View File

0
GlobalMemory.cpp → Blaze/GlobalMemory.cpp
View File

0
GlobalMemory.h → Blaze/GlobalMemory.h
View File

0
MacroUtils.h → Blaze/MacroUtils.h
View File

0
MathUtil.h → Blaze/MathUtil.h
View File

2
MiscData.cpp → Blaze/MiscData.cpp
View File

@ -369,7 +369,7 @@ bool MiscData::init( RenderDevice const& renderDevice )
int nc;
int requestedChannels = static_cast<int>( 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 )

0
MiscData.h → Blaze/MiscData.h
View File

0
RenderDevice.cpp → Blaze/RenderDevice.cpp
View File

0
RenderDevice.h → Blaze/RenderDevice.h
View File

0
StbImpl.cpp → Blaze/StbImpl.cpp
View File

0
VmaImpl.cpp → Blaze/VmaImpl.cpp
View File