Fixed WVP Constant buffer's View member.

Now is attached to the Current scene's camera transform

Author: PR3C14D0

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

@@ -2,9 +2,12 @@
 #include "Core/Core.h"
 #include "Core/Renderer/ResourceManager.h"
 #include "Core/Renderer/DescriptorHeap.h"
+#include "Core/Scene/SceneManager.h"
+
 
 Mesh::Mesh(std::string name, Transform& parentTransform) : Component::Component(name) {
 	this->m_core = Core::GetInstance();
+	this->m_sceneMgr = SceneManager::GetInstance();
 
 	this->m_dev = nullptr;
 	this->m_list = nullptr;
@@ -28,12 +31,19 @@ Mesh::Mesh(std::string name, Transform& parentTransform) : Component::Component(
 	this->m_wvp.World *= XMMatrixTranspose(XMMatrixRotationY(XMConvertToRadians(this->m_transform.rotation.y)));
 	this->m_wvp.World *= XMMatrixTranspose(XMMatrixRotationZ(XMConvertToRadians(this->m_transform.rotation.z)));
 
-	this->m_wvp.View = XMMatrixTranspose(XMMatrixIdentity() * XMMatrixTranslation(0.f, 0.f, 2.f));
+	this->m_wvp.View = XMMatrixTranspose(XMMatrixIdentity());
 	this->m_wvp.Projection = XMMatrixTranspose(XMMatrixPerspectiveFovLH(XMConvertToRadians(90.f), static_cast<float>(nWidth) / static_cast<float>(nHeight), 0.01f, 3000.f));
 }
 
 void Mesh::Init() {
 	Component::Init();
+	Transform cameraTransform = this->m_sceneMgr->GetCurrentScene()->GetCurrentCamera()->transform;
+	this->m_wvp.View = XMMatrixTranspose(XMMatrixIdentity());
+	this->m_wvp.View *= XMMatrixTranspose(XMMatrixTranslation(cameraTransform.location.x, cameraTransform.location.y, cameraTransform.location.z));
+
+	this->m_wvp.View *= XMMatrixTranspose(XMMatrixRotationX(XMConvertToRadians(cameraTransform.rotation.x)));
+	this->m_wvp.View *= XMMatrixTranspose(XMMatrixRotationY(XMConvertToRadians(cameraTransform.rotation.y)));
+	this->m_wvp.View *= XMMatrixTranspose(XMMatrixRotationZ(XMConvertToRadians(cameraTransform.rotation.z)));
 
 	if (D3D12* d3d12 = dynamic_cast<D3D12*>(this->m_renderer)) {
 		this->D3D12Init(d3d12);
@@ -107,7 +117,14 @@ void Mesh::UpdateConstantBuffer() {
 	this->m_wvp.World *= XMMatrixTranspose(XMMatrixRotationY(XMConvertToRadians(this->m_transform.rotation.y)));
 	this->m_wvp.World *= XMMatrixTranspose(XMMatrixRotationZ(XMConvertToRadians(this->m_transform.rotation.z)));
 
-	this->m_wvp.View = XMMatrixTranspose(XMMatrixIdentity() * XMMatrixTranslation(0.f, 0.f, 2.f));
+	Transform cameraTransform = this->m_sceneMgr->GetCurrentScene()->GetCurrentCamera()->transform;
+	this->m_wvp.View = XMMatrixTranspose(XMMatrixIdentity());
+	this->m_wvp.View *= XMMatrixTranspose(XMMatrixTranslation(cameraTransform.location.x, cameraTransform.location.y, cameraTransform.location.z));
+	
+	this->m_wvp.View *= XMMatrixTranspose(XMMatrixRotationX(XMConvertToRadians(cameraTransform.rotation.x)));
+	this->m_wvp.View *= XMMatrixTranspose(XMMatrixRotationY(XMConvertToRadians(cameraTransform.rotation.y)));
+	this->m_wvp.View *= XMMatrixTranspose(XMMatrixRotationZ(XMConvertToRadians(cameraTransform.rotation.z)));
+	
 	//this->m_wvp.Projection = XMMatrixTranspose(XMMatrixPerspectiveLH(XMConvertToRadians(90.f), static_cast<float>(nWidth) / static_cast<float>(nHeight), 0.01f, 3000.f));
 
 	PVOID pData;

src/private/Core/Scene/SceneManager.cpp

@@ -37,6 +37,10 @@ Scene* SceneManager::GetScene(std::string name) {
 	return this->m_scenes[name];
 }
 
+Scene* SceneManager::GetCurrentScene() {
+	return this->m_actualScene;
+}
+
 void SceneManager::LoadScene(std::string name) {
 	if (!(this->m_scenes.count(name) > 0)) {
 		MessageBox(NULL, "Scene not found", "Error", MB_OK | MB_ICONERROR);

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

@@ -23,6 +23,7 @@ class Core;
 class Renderer;
 class D3D12;
 class DescriptorHeap;
+class SceneManager;
 
 class Mesh : public Component {
 private:
@@ -71,6 +72,7 @@ class Mesh : public Component {
 	void InitSampler(D3D12* renderer);
 
 	Transform m_transform;
+	SceneManager* m_sceneMgr;
 public:
 	Mesh(std::string name, Transform& parentTransform);
 

src/public/Core/Scene/SceneManager.h

@@ -22,6 +22,7 @@ class SceneManager {
 	void Update();
 
 	Scene* GetScene(std::string name);
+	Scene* GetCurrentScene();
 	void AddScene(Scene* scene);
 
 	void Render();