Solved a bug with the ORM texture loading.

Author: PR3C14D0

src/Shader/LightPass.hlsl

@@ -89,8 +89,8 @@ float3 ReconstructPosition(int2 pixelCoord, uint index)
 
 PixelOutput PixelMain(VertexOutput input, uint index : SV_SampleIndex)
 {
-    float3 lightPos = float3(0.f, 20.f, 20.f);
-    float3 lightColor = float3(500.f, 500.f, 500.f);
+    float3 lightPos = float3(2.f, 2.f, 2.f);
+    float3 lightColor = float3(50.f, 50.f, 50.f);
 
     int2 pixelCoord = int2(input.position.xy);
 

src/private/Core/GameObject/Camera/EditorCamera.cpp

@@ -4,7 +4,7 @@ EditorCamera::EditorCamera(std::string name) : Camera(name) {
 	this->m_fSensX = 5.f;
 	this->m_fSensY = 5.f;
 
-	this->m_fSpeed = 15.f;
+	this->m_fSpeed = 150.f;
 }
 
 void EditorCamera::Init() {

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

@@ -293,7 +293,7 @@ void Mesh::InitSampler(D3D12* renderer) {
 	UINT nNumORMTextures = this->m_ORMTextures.size();
 	this->m_cbv_srvHeap->Allocate(nNumTextures + nNumORMTextures);
 	UINT nLastIndex = m_cbv_srvHeap->GetLastDescriptorIndex();
-	UINT nFirstIndex = nLastIndex - nNumTextures;
+	UINT nFirstIndex = nLastIndex - (nNumTextures + nNumORMTextures);
 
 	UINT nActualIndex = nFirstIndex;
 	for (std::pair<UINT, ComPtr<ID3D12Resource>> resource : this->m_textures) {
@@ -351,6 +351,8 @@ void Mesh::LoadModel(std::string filename) {
 		return;
 	};
 
+	UINT nIndex = 0;
+
 	Assimp::Importer importer;
 	const aiScene* scene = importer.ReadFile(filename, NULL);
 
@@ -401,12 +403,14 @@ void Mesh::LoadModel(std::string filename) {
 
 		aiString texPath;
 		aiString metalPath;
+		nIndex++;
 		if (material->GetTextureCount(aiTextureType_BASE_COLOR) > 0 && material->GetTexture(aiTextureType_DIFFUSE, 0, &texPath) == AI_SUCCESS) {
 			const aiTexture* texture = scene->GetEmbeddedTexture(texPath.C_Str());
 			if (texture != nullptr) {
 				ResourceManager* resMgr = ResourceManager::GetInstance();
+				std::string name = std::string(texPath.C_Str());
 				ComPtr<ID3D12Resource> resource;
-				resMgr->LoadTexture((BYTE*)texture->pcData, texture->mWidth, texture->mFilename.C_Str(), resource);
+				resMgr->LoadTexture((BYTE*)texture->pcData, texture->mWidth, name, resource);
 				resource->SetName(L"Mesh Base color");
 				this->m_textures[i] = resource;
 			}
@@ -417,8 +421,9 @@ void Mesh::LoadModel(std::string filename) {
 
 			if (texture != nullptr) {
 				ResourceManager* resMgr = ResourceManager::GetInstance();
+				std::string name = std::string(metalPath.C_Str());
 				ComPtr<ID3D12Resource> resource;
-				resMgr->LoadTexture((BYTE*)texture->pcData, texture->mWidth, texture->mFilename.C_Str(), resource);
+				resMgr->LoadTexture((BYTE*)texture->pcData, texture->mWidth, name, resource);
 				resource->SetName(L"Mesh Metallic Roughness");
 				this->m_ORMTextures[i] = resource;
 			}

src/private/Core/Scene/Scene.cpp

@@ -8,7 +8,7 @@ Scene::Scene(std::string name) {
 void Scene::Init() {
 	Mesh* m_mesh = new Mesh("StaticMeshComponent", &m_go->transform);
 	m_go->m_components.push_back(m_mesh);
-	m_mesh->LoadModel("barrel.glb");
+	m_mesh->LoadModel("sponza_atrium_3.glb");
 	this->AddGameObject(m_go);
 
 	this->m_editorCamera = new EditorCamera("EditorCamera");

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

@@ -10,6 +10,7 @@
 #include <assimp/postprocess.h>
 #include <map>
 #include "Util.h"
+#include <string>
 
 #include "Core/GameObject/Component/Component.h"
 #include "Core/Renderer/Shader.h"