File Hierarchy Reorganization.

This commit is contained in:
Anish Bhobe 2025-07-02 09:30:11 +02:00
parent d51fc375d2
commit 751af977ac
43 changed files with 122 additions and 106 deletions

View File

@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17 # Visual Studio Version 17
VisualStudioVersion = 17.13.36105.23 VisualStudioVersion = 17.13.36105.23
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Blaze", "Blaze.vcxproj", "{92E725FE-D87B-4FDE-8371-5B2CE60945FD}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Blaze", "Blaze\Blaze.vcxproj", "{92E725FE-D87B-4FDE-8371-5B2CE60945FD}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution

BIN
Blaze/Assets/Models/DamagedHelmet.glb (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -192,41 +192,42 @@
<None Include="vcpkg.json" /> <None Include="vcpkg.json" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="Blaze\AppState.h" /> <ClCompile Include="Source\AppState.cpp" />
<ClInclude Include="Blaze\BufferManager.h" /> <ClCompile Include="Source\Blaze.cpp" />
<ClInclude Include="Blaze\EntityManager.h" /> <ClCompile Include="Source\BufferManager.cpp" />
<ClInclude Include="Blaze\Frame.h" /> <ClCompile Include="Source\CgltfImpl.cpp" />
<ClInclude Include="Blaze\FreeList.h" /> <ClCompile Include="Source\EntityManager.cpp" />
<ClInclude Include="Blaze\GlobalMemory.h" /> <ClCompile Include="Source\Frame.cpp" />
<ClInclude Include="Blaze\MacroUtils.h" /> <ClCompile Include="Source\FreeList.cpp" />
<ClInclude Include="Blaze\MathUtil.h" /> <ClCompile Include="Source\GlobalMemory.cpp" />
<ClInclude Include="Blaze\MiscData.h" /> <ClCompile Include="Source\MiscData.cpp" />
<ClInclude Include="Blaze\ModelLoader.h" /> <ClCompile Include="Source\ModelLoader.cpp" />
<ClInclude Include="Blaze\RenderDevice.h" /> <ClCompile Include="Source\RenderDevice.cpp" />
<ClInclude Include="Blaze\RID.h" /> <ClCompile Include="Source\RID.cpp" />
<ClInclude Include="Blaze\TextureManager.h" /> <ClCompile Include="Source\StbImpl.cpp" />
<ClInclude Include="Blaze\VulkanHeader.h" /> <ClCompile Include="Source\TextureManager.cpp" />
</ItemGroup> <ClCompile Include="Source\VmaImpl.cpp" />
<ItemGroup>
<ClCompile Include="Blaze\AppState.cpp" />
<ClCompile Include="Blaze\Blaze.cpp" />
<ClCompile Include="Blaze\BufferManager.cpp" />
<ClCompile Include="Blaze\CgltfImpl.cpp" />
<ClCompile Include="Blaze\EntityManager.cpp" />
<ClCompile Include="Blaze\Frame.cpp" />
<ClCompile Include="Blaze\FreeList.cpp" />
<ClCompile Include="Blaze\GlobalMemory.cpp" />
<ClCompile Include="Blaze\MiscData.cpp" />
<ClCompile Include="Blaze\ModelLoader.cpp" />
<ClCompile Include="Blaze\RenderDevice.cpp" />
<ClCompile Include="Blaze\StbImpl.cpp" />
<ClCompile Include="Blaze\TextureManager.cpp" />
<ClCompile Include="Blaze\VmaImpl.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Image Include="Assets\Textures\container2.png" /> <Image Include="Assets\Textures\container2.png" />
<Image Include="Assets\Textures\wall.jpg" /> <Image Include="Assets\Textures\wall.jpg" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ClInclude Include="Source\AppState.h" />
<ClInclude Include="Source\BufferManager.h" />
<ClInclude Include="Source\EntityManager.h" />
<ClInclude Include="Source\Frame.h" />
<ClInclude Include="Source\FreeList.h" />
<ClInclude Include="Source\GlobalMemory.h" />
<ClInclude Include="Source\MacroUtils.h" />
<ClInclude Include="Source\MathUtil.h" />
<ClInclude Include="Source\MiscData.h" />
<ClInclude Include="Source\ModelLoader.h" />
<ClInclude Include="Source\RenderDevice.h" />
<ClInclude Include="Source\RID.h" />
<ClInclude Include="Source\TextureManager.h" />
<ClInclude Include="Source\VulkanHeader.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>

View File

@ -25,6 +25,18 @@
<Filter Include="Resource Files\Config"> <Filter Include="Resource Files\Config">
<UniqueIdentifier>{1f13daa9-d8c1-4fda-b5a5-09ed652775e7}</UniqueIdentifier> <UniqueIdentifier>{1f13daa9-d8c1-4fda-b5a5-09ed652775e7}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Header Files\Util">
<UniqueIdentifier>{6b9bb9b7-fdb7-49cc-8427-707aaa6f1188}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\Render">
<UniqueIdentifier>{62595ae4-a41b-43d1-b506-c6e3409aee5c}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\Util">
<UniqueIdentifier>{3efea666-256f-4bf9-974f-5d43717b8364}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\Render">
<UniqueIdentifier>{ad0bf107-cc94-4190-844a-748793cabc17}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="README.md"> <None Include="README.md">
@ -56,92 +68,51 @@
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="Blaze\AppState.h"> <ClCompile Include="Source\AppState.cpp">
<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>
<ClInclude Include="Blaze\EntityManager.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Blaze\TextureManager.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Blaze\VulkanHeader.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Blaze\BufferManager.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Blaze\FreeList.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Blaze\RID.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Blaze\ModelLoader.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="Blaze\AppState.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Blaze\Blaze.cpp"> <ClCompile Include="Source\Blaze.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Blaze\Frame.cpp"> <ClCompile Include="Source\EntityManager.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Blaze\GlobalMemory.cpp"> <ClCompile Include="Source\MiscData.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Blaze\MiscData.cpp"> <ClCompile Include="Source\ModelLoader.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Blaze\RenderDevice.cpp"> <ClCompile Include="Source\StbImpl.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Blaze\StbImpl.cpp">
<Filter>Source Files\HeaderOnlyImpl</Filter> <Filter>Source Files\HeaderOnlyImpl</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Blaze\VmaImpl.cpp"> <ClCompile Include="Source\VmaImpl.cpp">
<Filter>Source Files\HeaderOnlyImpl</Filter> <Filter>Source Files\HeaderOnlyImpl</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Blaze\EntityManager.cpp"> <ClCompile Include="Source\CgltfImpl.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Blaze\TextureManager.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Blaze\BufferManager.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Blaze\FreeList.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Blaze\ModelLoader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Blaze\CgltfImpl.cpp">
<Filter>Source Files\HeaderOnlyImpl</Filter> <Filter>Source Files\HeaderOnlyImpl</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Source\FreeList.cpp">
<Filter>Source Files\Util</Filter>
</ClCompile>
<ClCompile Include="Source\GlobalMemory.cpp">
<Filter>Source Files\Util</Filter>
</ClCompile>
<ClCompile Include="Source\BufferManager.cpp">
<Filter>Source Files\Render</Filter>
</ClCompile>
<ClCompile Include="Source\TextureManager.cpp">
<Filter>Source Files\Render</Filter>
</ClCompile>
<ClCompile Include="Source\RID.cpp">
<Filter>Source Files\Render</Filter>
</ClCompile>
<ClCompile Include="Source\RenderDevice.cpp">
<Filter>Source Files\Render</Filter>
</ClCompile>
<ClCompile Include="Source\Frame.cpp">
<Filter>Source Files\Render</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Image Include="Assets\Textures\container2.png"> <Image Include="Assets\Textures\container2.png">
@ -156,4 +127,48 @@
<Filter>Resource Files\Shader Files</Filter> <Filter>Resource Files\Shader Files</Filter>
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
<ItemGroup>
<ClInclude Include="Source\AppState.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Source\EntityManager.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Source\MiscData.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Source\ModelLoader.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Source\MathUtil.h">
<Filter>Header Files\Util</Filter>
</ClInclude>
<ClInclude Include="Source\MacroUtils.h">
<Filter>Header Files\Util</Filter>
</ClInclude>
<ClInclude Include="Source\FreeList.h">
<Filter>Header Files\Util</Filter>
</ClInclude>
<ClInclude Include="Source\GlobalMemory.h">
<Filter>Header Files\Util</Filter>
</ClInclude>
<ClInclude Include="Source\VulkanHeader.h">
<Filter>Header Files\Util</Filter>
</ClInclude>
<ClInclude Include="Source\BufferManager.h">
<Filter>Header Files\Render</Filter>
</ClInclude>
<ClInclude Include="Source\Frame.h">
<Filter>Header Files\Render</Filter>
</ClInclude>
<ClInclude Include="Source\RenderDevice.h">
<Filter>Header Files\Render</Filter>
</ClInclude>
<ClInclude Include="Source\RID.h">
<Filter>Header Files\Render</Filter>
</ClInclude>
<ClInclude Include="Source\TextureManager.h">
<Filter>Header Files\Render</Filter>
</ClInclude>
</ItemGroup>
</Project> </Project>

View File

@ -83,5 +83,5 @@ AppState* AppState_Create( GlobalMemory* memory, uint32_t const width, uint32_t
AppState::~AppState() AppState::~AppState()
{ {
ASSERT( !isInit() ); ASSERT( not isInit() );
} }

View File

@ -41,7 +41,7 @@ private:
RenderDevice* m_pRenderDevice; RenderDevice* m_pRenderDevice;
// Texture Manager // Buffer Manager
Buffer* m_aBuffers; Buffer* m_aBuffers;
uint32_t m_count; uint32_t m_count;
uint32_t m_capacity; uint32_t m_capacity;

View File

@ -6,10 +6,7 @@
#include <span> #include <span>
#include "VulkanHeader.h" #include "VulkanHeader.h"
// TODO: Remove this dependency
#include "BufferManager.h"
#include "ModelLoader.h" #include "ModelLoader.h"
#include "TextureManager.h"
struct Entity; struct Entity;
struct RenderDevice; struct RenderDevice;