Mesh: Started with the pipeline initialization.

Serialized the root signature

Author: PR3C14D0

src/private/Core/GameObject/Component/Mesh.cpp

@@ -11,6 +11,7 @@ Mesh::Mesh(std::string name) : Component::Component(name) {
 	this->m_renderer = this->m_core->GetRenderer();
 
 	this->m_bMeshLoaded = false;
+	this->m_nTotalVertices = 0;
 }
 
 void Mesh::Init() {
@@ -66,21 +67,64 @@ void Mesh::UploadVertices() {
 void Mesh::Update() {
 	Component::Update();
 
+}
+
+void Mesh::Render() {
+	this->m_list->IASetPrimitiveTopology(D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
 	this->m_list->IASetVertexBuffers(0, this->m_VBVs.size(), &this->m_VBVs[0]);
+
+	this->m_list->DrawInstanced(this->m_nTotalVertices, 1, 0, 0);
+	//for (D3D12_VERTEX_BUFFER_VIEW vbv : this->m_VBVs) {
+	//	//this->m_list->DrawInstanced(nVertexCount, )
+	//}
+}
+
+void Mesh::InitPipeline() {
+	this->m_shader = new Shader("GBufferPass.hlsl", "VertexMain", "PixelMain");
+
+	LPVOID lpVertex, lpPixel = nullptr;
+	UINT nVertexSize = this->m_shader->GetBuffer(SHADER_BUFFER::VERTEX, lpVertex);
+	UINT nPixelSize = this->m_shader->GetBuffer(SHADER_BUFFER::VERTEX, lpVertex);
+
+	D3D12_ROOT_SIGNATURE_DESC rootDesc = { };
+	rootDesc.pParameters = nullptr;
+	rootDesc.NumParameters = 0;
+	rootDesc.pStaticSamplers = nullptr;
+	rootDesc.NumStaticSamplers = 0;
+	rootDesc.Flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT;
+
+	ComPtr<ID3DBlob> rsBlob, rsErrBlob;
+	ThrowIfFailed(D3D12SerializeRootSignature(&rootDesc, D3D_ROOT_SIGNATURE_VERSION_1, rsBlob.GetAddressOf(), rsErrBlob.GetAddressOf()));
+
+	if (rsErrBlob) {
+		spdlog::error("{0}: Error serializing root signature. {1}", this->m_name, (char*)rsErrBlob->GetBufferPointer());
+		return;
+	}
+
+	D3D12_INPUT_ELEMENT_DESC layout[] = {
+		{ "POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, NULL },
+		{ "TEXCOORD", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 12, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, NULL }
+	};
+
+	D3D12_GRAPHICS_PIPELINE_STATE_DESC plDesc = { };
 }
 
 void Mesh::D3D12Init(D3D12* renderer) {
 	renderer->GetDevice(this->m_dev);
 	renderer->GetCommandList(this->m_list);
 
 	this->UploadVertices();
+	this->InitPipeline();
 }
 
 /*
 	Load a model from an FBX file with assimp.
 */
 void Mesh::LoadModel(std::string filename) {
-	if (this->m_bMeshLoaded) return;
+	if (this->m_bMeshLoaded) {
+		spdlog::error("{0}: Tried to load another file when meshes already loaded", this->m_name);
+		return;
+	};
 
 	Assimp::Importer importer;
 	const aiScene* scene = importer.ReadFile(filename, NULL);
@@ -89,6 +133,7 @@ void Mesh::LoadModel(std::string filename) {
 		aiMesh* mesh = scene->mMeshes[i];
 		aiMaterial* material = scene->mMaterials[mesh->mMaterialIndex];
 		std::vector<Vertex> vertices;
+		this->m_nTotalVertices += mesh->mNumVertices;
 
 		for (UINT x = 0; x < mesh->mNumVertices; x++) {
 			aiVector3D vec = mesh->mVertices[x];

src/private/Core/GameObject/GameObject.cpp

@@ -18,4 +18,12 @@ void GameObject::Update() {
 	for (Component* component : this->m_components) {
 		component->Update();
 	}
+}
+
+void GameObject::Render() {
+	for (Component* component : this->m_components) {
+		if (Mesh* mesh = dynamic_cast<Mesh*>(component)) {
+			mesh->Render();
+		}
+	}
 }

src/private/Core/Renderer/D3D12.cpp

@@ -1,5 +1,6 @@
 #include "Core/Renderer/D3D12.h"
 #include "Core/Renderer/ScreenQuad.h"
+#include "Core/Scene/SceneManager.h"
 
 D3D12::D3D12() : Renderer::Renderer() {
 	this->m_nBackBuffers = 2;
@@ -10,6 +11,7 @@ D3D12::D3D12() : Renderer::Renderer() {
 	this->m_nAlbedoIndex = 0;
 	this->m_nUVIndex = 0;
 	this->m_nPositionIndex = 0;
+	this->sceneMgr = SceneManager::GetInstance();
 }
 
 void D3D12::Init(HWND hwnd) {
@@ -215,6 +217,8 @@ void D3D12::Update() {
 	};
 	this->m_list->OMSetRenderTargets(_countof(gbuffers), gbuffers, FALSE, &dsv.cpuHandle);
 
+	this->sceneMgr->Render();
+
 	Descriptor rtv = this->m_rtvHeap->GetDescriptor(this->m_nActualBackBuffer);
 	this->m_list->OMSetRenderTargets(1, &rtv.cpuHandle, FALSE, nullptr);
 	this->m_list->ClearRenderTargetView(rtv.cpuHandle, RGBA{ 0.f, 0.f, 0.f, 1.f }, 0, nullptr);

src/private/Core/Scene/Scene.cpp

@@ -18,6 +18,12 @@ void Scene::Update() {
 	}
 }
 
+void Scene::Render() {
+	for (GameObject* object : this->m_gameObjects) {
+		object->Render();
+	}
+}
+
 void Scene::AddGameObject(GameObject* object) {
 	this->m_gameObjects.push_back(object);
 }

src/private/Core/Scene/SceneManager.cpp

@@ -47,6 +47,10 @@ void SceneManager::LoadScene(std::string name) {
 	this->m_actualScene = this->m_scenes[name];
 }
 
+void SceneManager::Render() {
+	this->m_actualScene->Render();
+}
+
 SceneManager* SceneManager::GetInstance() {
 	if (SceneManager::m_instance == nullptr)
 		SceneManager::m_instance = new SceneManager();

src/public/Core/GameObject/Component/Mesh.h

@@ -11,6 +11,7 @@
 #include "Util.h"
 
 #include "Core/GameObject/Component/Component.h"
+#include "Core/Renderer/Shader.h"
 
 using namespace Microsoft::WRL;
 
@@ -42,13 +43,19 @@ class Mesh : public Component {
 
 	std::map<UINT, ComPtr<ID3D12Resource>> m_VBOs;
 	std::map<UINT, ComPtr<ID3D12Resource>> m_IBOs;
+	Shader* m_shader;
+
+	UINT m_nTotalVertices;
 
 	void UploadVertices();
+	void InitPipeline();
 public:
 	Mesh(std::string name);
 
 	void Init();
 	void Update();
 
+	void Render();
+
 	void LoadModel(std::string filename);
 };

src/public/Core/GameObject/GameObject.h

@@ -12,9 +12,11 @@ class GameObject {
 
 	std::vector<Component*> m_components;
 	Mesh* m_mesh;
+
 public:
 	GameObject(std::string name);
 
 	void Init();
 	void Update();
+	void Render();
 };

src/public/Core/Renderer/D3D12.h

@@ -18,12 +18,14 @@ enum VSYNC {
 };
 
 class ScreenQuad;
+class SceneManager;
 
 class D3D12 : public Renderer {
 	friend ScreenQuad;
 	friend class ResourceManager;
 	friend class Mesh;
 private:
+
 	ComPtr<IDXGIFactory4> m_factory;
 	ComPtr<IDXGIAdapter1> m_adapter;
 
@@ -66,6 +68,7 @@ class D3D12 : public Renderer {
 	D3D12_RECT m_scissor;
 
 	ScreenQuad* m_screenQuad;
+	SceneManager* sceneMgr;
 
 	void ResourceBarrier(ComPtr<ID3D12Resource> resource, D3D12_RESOURCE_STATES oldState, D3D12_RESOURCE_STATES newState);
 

src/public/Core/Scene/Scene.h

@@ -17,5 +17,7 @@ class Scene {
 	void Init();
 	void Update();
 
+	void Render();
+
 	void AddGameObject(GameObject* object);
 };

src/public/Core/Scene/SceneManager.h

@@ -24,5 +24,7 @@ class SceneManager {
 	Scene* GetScene(std::string name);
 	void AddScene(Scene* scene);
 
+	void Render();
+
 	void LoadScene(std::string name);
 };