Make it run again

krupitskas · Sep 30, 2024 · aaa80ac · aaa80ac
1 parent e107448
commit aaa80ac
Show file tree

Hide file tree

Showing 9 changed files with 180 additions and 188 deletions.
diff --git a/Yasno/Graphics/Primitive.hpp b/Yasno/Graphics/Primitive.hpp
@@ -25,6 +25,7 @@ namespace ysn
 		D3D12_INDEX_BUFFER_VIEW index_buffer_view;
 
 		uint32_t index_count = 0;
+		int material_id = -1;
 
 		std::unordered_map<std::string, Attribute> attributes;
 	};

diff --git a/Yasno/Graphics/RenderScene.hpp b/Yasno/Graphics/RenderScene.hpp
@@ -22,16 +22,16 @@ namespace ysn
 
 	struct ModelRenderParameters
 	{
-		bool should_cast_shadow		= false;
-
+		bool should_cast_shadow = false;
 	};
 
 	struct Model
 	{
-		std::string name			= "Unnamed Model";
+		std::string name = "Unnamed Model";
 		ModelRenderParameters render_parameters;
 
 		std::vector<Mesh> meshes;
+		std::vector<Material> materials;
 
 		// Not sure about that
 		std::vector<GpuResource> buffers;
@@ -41,7 +41,7 @@ namespace ysn
 		std::vector<GpuResource> node_buffers; // Per node GPU data
 		std::vector<D3D12_SAMPLER_DESC> sampler_descs;
 	};
-	
+
 	struct RenderScene
 	{
 		std::shared_ptr<Camera> camera;

diff --git a/Yasno/Graphics/Techniques/ShadowMapPass.hpp b/Yasno/Graphics/Techniques/ShadowMapPass.hpp
@@ -9,6 +9,7 @@
 
 #include <System/GltfLoader.hpp>
 #include <Renderer/DescriptorHeap.hpp>
+#include <Renderer/DxRenderer.hpp>
 
 namespace ysn
 {

diff --git a/Yasno/Renderer/CommandQueue.cpp b/Yasno/Renderer/CommandQueue.cpp
@@ -74,7 +74,7 @@ namespace ysn
 		return commandList;
 	}
 
-	wil::com_ptr<ID3D12GraphicsCommandList4> CommandQueue::GetCommandList()
+	wil::com_ptr<ID3D12GraphicsCommandList4> CommandQueue::GetCommandList(std::string name)
 	{
 		wil::com_ptr<ID3D12CommandAllocator> commandAllocator;
 		wil::com_ptr<ID3D12GraphicsCommandList4> commandList;
@@ -103,6 +103,10 @@ namespace ysn
 			commandList = CreateCommandList(commandAllocator);
 		}
 
+	#ifndef YSN_RELEASE
+		commandList->SetName(std::wstring(name.begin(), name.end()).c_str());
+	#endif
+
 		// Associate the command allocator with the command list so that it can be
 		// retrieved when the command list is executed.
 		ThrowIfFailed(commandList->SetPrivateDataInterface(__uuidof(ID3D12CommandAllocator), commandAllocator.get()));

diff --git a/Yasno/Renderer/CommandQueue.hpp b/Yasno/Renderer/CommandQueue.hpp
@@ -14,7 +14,7 @@ namespace ysn
 		CommandQueue(wil::com_ptr<ID3D12Device5> device, D3D12_COMMAND_LIST_TYPE type);
 		virtual ~CommandQueue();
 
-		wil::com_ptr<ID3D12GraphicsCommandList4> GetCommandList();
+		wil::com_ptr<ID3D12GraphicsCommandList4> GetCommandList(std::string name = "Neyasno Command List");
 
 		// Execute a command list.
 		// Returns the fence value to wait for this command list.

diff --git a/Yasno/Renderer/GpuResource.hpp b/Yasno/Renderer/GpuResource.hpp
@@ -7,6 +7,8 @@ namespace ysn
 {
     struct GpuResource
     {
+        GpuResource() = default;
+
         GpuResource(wil::com_ptr<ID3D12Resource> res) : resource(res) {}
 
         D3D12_GPU_VIRTUAL_ADDRESS GetGPUVirtualAddress() const