diff --git a/Blaze.sln b/Blaze.sln index dc95fe3..b94dc0c 100644 --- a/Blaze.sln +++ b/Blaze.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.13.36105.23 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 Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Assets/Models/Box.glb b/Blaze/Assets/Models/Box.glb similarity index 100% rename from Assets/Models/Box.glb rename to Blaze/Assets/Models/Box.glb diff --git a/Assets/Models/BoxTextured.glb b/Blaze/Assets/Models/BoxTextured.glb similarity index 100% rename from Assets/Models/BoxTextured.glb rename to Blaze/Assets/Models/BoxTextured.glb diff --git a/Assets/Models/BoxVertexColors.glb b/Blaze/Assets/Models/BoxVertexColors.glb similarity index 100% rename from Assets/Models/BoxVertexColors.glb rename to Blaze/Assets/Models/BoxVertexColors.glb diff --git a/Blaze/Assets/Models/DamagedHelmet.glb b/Blaze/Assets/Models/DamagedHelmet.glb new file mode 100644 index 0000000..a8c16b5 --- /dev/null +++ b/Blaze/Assets/Models/DamagedHelmet.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a1e3b04de97b11de564ce6e53b95f02954a297f0008183ac63a4f5974f6b32d8 +size 3773916 diff --git a/Assets/Models/OrientationTest.glb b/Blaze/Assets/Models/OrientationTest.glb similarity index 100% rename from Assets/Models/OrientationTest.glb rename to Blaze/Assets/Models/OrientationTest.glb diff --git a/Assets/Shaders/Bindless.slang b/Blaze/Assets/Shaders/Bindless.slang similarity index 100% rename from Assets/Shaders/Bindless.slang rename to Blaze/Assets/Shaders/Bindless.slang diff --git a/Assets/Shaders/Material.slang b/Blaze/Assets/Shaders/Material.slang similarity index 100% rename from Assets/Shaders/Material.slang rename to Blaze/Assets/Shaders/Material.slang diff --git a/Assets/Shaders/Mesh.slang b/Blaze/Assets/Shaders/Mesh.slang similarity index 100% rename from Assets/Shaders/Mesh.slang rename to Blaze/Assets/Shaders/Mesh.slang diff --git a/Assets/Shaders/PBR.slang b/Blaze/Assets/Shaders/PBR.slang similarity index 100% rename from Assets/Shaders/PBR.slang rename to Blaze/Assets/Shaders/PBR.slang diff --git a/Assets/Textures/container2.png b/Blaze/Assets/Textures/container2.png similarity index 100% rename from Assets/Textures/container2.png rename to Blaze/Assets/Textures/container2.png diff --git a/Assets/Textures/wall.jpg b/Blaze/Assets/Textures/wall.jpg similarity index 100% rename from Assets/Textures/wall.jpg rename to Blaze/Assets/Textures/wall.jpg diff --git a/Blaze.vcxproj b/Blaze/Blaze.vcxproj similarity index 87% rename from Blaze.vcxproj rename to Blaze/Blaze.vcxproj index 3d8e7cd..3b94c06 100644 --- a/Blaze.vcxproj +++ b/Blaze/Blaze.vcxproj @@ -192,41 +192,42 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Blaze.vcxproj.filters b/Blaze/Blaze.vcxproj.filters similarity index 58% rename from Blaze.vcxproj.filters rename to Blaze/Blaze.vcxproj.filters index 9846623..5c98252 100644 --- a/Blaze.vcxproj.filters +++ b/Blaze/Blaze.vcxproj.filters @@ -25,6 +25,18 @@ {1f13daa9-d8c1-4fda-b5a5-09ed652775e7} + + {6b9bb9b7-fdb7-49cc-8427-707aaa6f1188} + + + {62595ae4-a41b-43d1-b506-c6e3409aee5c} + + + {3efea666-256f-4bf9-974f-5d43717b8364} + + + {ad0bf107-cc94-4190-844a-748793cabc17} + @@ -56,92 +68,51 @@ - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header 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 - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - + Source Files\HeaderOnlyImpl + + Source Files\Util + + + Source Files\Util + + + Source Files\Render + + + Source Files\Render + + + Source Files\Render + + + Source Files\Render + + + Source Files\Render + @@ -156,4 +127,48 @@ Resource Files\Shader Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files\Util + + + Header Files\Util + + + Header Files\Util + + + Header Files\Util + + + Header Files\Util + + + Header Files\Render + + + Header Files\Render + + + Header Files\Render + + + Header Files\Render + + + Header Files\Render + + \ No newline at end of file diff --git a/Blaze/AppState.cpp b/Blaze/Source/AppState.cpp similarity index 98% rename from Blaze/AppState.cpp rename to Blaze/Source/AppState.cpp index 33e4620..42e3638 100644 --- a/Blaze/AppState.cpp +++ b/Blaze/Source/AppState.cpp @@ -83,5 +83,5 @@ AppState* AppState_Create( GlobalMemory* memory, uint32_t const width, uint32_t AppState::~AppState() { - ASSERT( !isInit() ); + ASSERT( not isInit() ); } diff --git a/Blaze/AppState.h b/Blaze/Source/AppState.h similarity index 100% rename from Blaze/AppState.h rename to Blaze/Source/AppState.h diff --git a/Blaze/Blaze.cpp b/Blaze/Source/Blaze.cpp similarity index 100% rename from Blaze/Blaze.cpp rename to Blaze/Source/Blaze.cpp diff --git a/Blaze/BufferManager.cpp b/Blaze/Source/BufferManager.cpp similarity index 100% rename from Blaze/BufferManager.cpp rename to Blaze/Source/BufferManager.cpp diff --git a/Blaze/BufferManager.h b/Blaze/Source/BufferManager.h similarity index 99% rename from Blaze/BufferManager.h rename to Blaze/Source/BufferManager.h index e85accf..8be077d 100644 --- a/Blaze/BufferManager.h +++ b/Blaze/Source/BufferManager.h @@ -41,7 +41,7 @@ private: RenderDevice* m_pRenderDevice; - // Texture Manager + // Buffer Manager Buffer* m_aBuffers; uint32_t m_count; uint32_t m_capacity; diff --git a/Blaze/CgltfImpl.cpp b/Blaze/Source/CgltfImpl.cpp similarity index 100% rename from Blaze/CgltfImpl.cpp rename to Blaze/Source/CgltfImpl.cpp diff --git a/Blaze/EntityManager.cpp b/Blaze/Source/EntityManager.cpp similarity index 100% rename from Blaze/EntityManager.cpp rename to Blaze/Source/EntityManager.cpp diff --git a/Blaze/EntityManager.h b/Blaze/Source/EntityManager.h similarity index 96% rename from Blaze/EntityManager.h rename to Blaze/Source/EntityManager.h index 2c5771a..8da37ad 100644 --- a/Blaze/EntityManager.h +++ b/Blaze/Source/EntityManager.h @@ -6,10 +6,7 @@ #include #include "VulkanHeader.h" -// TODO: Remove this dependency -#include "BufferManager.h" #include "ModelLoader.h" -#include "TextureManager.h" struct Entity; struct RenderDevice; diff --git a/Blaze/Frame.cpp b/Blaze/Source/Frame.cpp similarity index 100% rename from Blaze/Frame.cpp rename to Blaze/Source/Frame.cpp diff --git a/Blaze/Frame.h b/Blaze/Source/Frame.h similarity index 100% rename from Blaze/Frame.h rename to Blaze/Source/Frame.h diff --git a/Blaze/FreeList.cpp b/Blaze/Source/FreeList.cpp similarity index 100% rename from Blaze/FreeList.cpp rename to Blaze/Source/FreeList.cpp diff --git a/Blaze/FreeList.h b/Blaze/Source/FreeList.h similarity index 100% rename from Blaze/FreeList.h rename to Blaze/Source/FreeList.h diff --git a/Blaze/GlobalMemory.cpp b/Blaze/Source/GlobalMemory.cpp similarity index 100% rename from Blaze/GlobalMemory.cpp rename to Blaze/Source/GlobalMemory.cpp diff --git a/Blaze/GlobalMemory.h b/Blaze/Source/GlobalMemory.h similarity index 100% rename from Blaze/GlobalMemory.h rename to Blaze/Source/GlobalMemory.h diff --git a/Blaze/MacroUtils.h b/Blaze/Source/MacroUtils.h similarity index 100% rename from Blaze/MacroUtils.h rename to Blaze/Source/MacroUtils.h diff --git a/Blaze/MathUtil.h b/Blaze/Source/MathUtil.h similarity index 100% rename from Blaze/MathUtil.h rename to Blaze/Source/MathUtil.h diff --git a/Blaze/MiscData.cpp b/Blaze/Source/MiscData.cpp similarity index 100% rename from Blaze/MiscData.cpp rename to Blaze/Source/MiscData.cpp diff --git a/Blaze/MiscData.h b/Blaze/Source/MiscData.h similarity index 100% rename from Blaze/MiscData.h rename to Blaze/Source/MiscData.h diff --git a/Blaze/ModelLoader.cpp b/Blaze/Source/ModelLoader.cpp similarity index 100% rename from Blaze/ModelLoader.cpp rename to Blaze/Source/ModelLoader.cpp diff --git a/Blaze/ModelLoader.h b/Blaze/Source/ModelLoader.h similarity index 100% rename from Blaze/ModelLoader.h rename to Blaze/Source/ModelLoader.h diff --git a/Blaze/RID.cpp b/Blaze/Source/RID.cpp similarity index 100% rename from Blaze/RID.cpp rename to Blaze/Source/RID.cpp diff --git a/Blaze/RID.h b/Blaze/Source/RID.h similarity index 100% rename from Blaze/RID.h rename to Blaze/Source/RID.h diff --git a/Blaze/RenderDevice.cpp b/Blaze/Source/RenderDevice.cpp similarity index 100% rename from Blaze/RenderDevice.cpp rename to Blaze/Source/RenderDevice.cpp diff --git a/Blaze/RenderDevice.h b/Blaze/Source/RenderDevice.h similarity index 100% rename from Blaze/RenderDevice.h rename to Blaze/Source/RenderDevice.h diff --git a/Blaze/StbImpl.cpp b/Blaze/Source/StbImpl.cpp similarity index 100% rename from Blaze/StbImpl.cpp rename to Blaze/Source/StbImpl.cpp diff --git a/Blaze/TextureManager.cpp b/Blaze/Source/TextureManager.cpp similarity index 100% rename from Blaze/TextureManager.cpp rename to Blaze/Source/TextureManager.cpp diff --git a/Blaze/TextureManager.h b/Blaze/Source/TextureManager.h similarity index 100% rename from Blaze/TextureManager.h rename to Blaze/Source/TextureManager.h diff --git a/Blaze/VmaImpl.cpp b/Blaze/Source/VmaImpl.cpp similarity index 100% rename from Blaze/VmaImpl.cpp rename to Blaze/Source/VmaImpl.cpp diff --git a/Blaze/VulkanHeader.h b/Blaze/Source/VulkanHeader.h similarity index 100% rename from Blaze/VulkanHeader.h rename to Blaze/Source/VulkanHeader.h