Added ImGuizmo and implemented a sample grid to the editor

Author: PR3C14D0

src/CMakeLists.txt

@@ -28,11 +28,18 @@ file(GLOB "IMGUI_SRC"
 	"${PUBLIC_INCLUDE}/imgui/*.h"
 )
 
+file(GLOB "IMGUIZMO_SRC" 
+	"${PUBLIC_INCLUDE}/ImGuizmo/*.cpp"
+	"${PUBLIC_INCLUDE}/ImGuizmo/*.h"
+)
+
 add_library("ImGUI" STATIC ${IMGUI_SRC})
+add_library("ImGuizmo" STATIC ${IMGUIZMO_SRC})
 
 target_link_libraries(Exeon "d3d12.lib;dxgi.lib;d3dcompiler.lib")
 target_link_libraries(Exeon "${LIB}/assimp-vc143-mt.lib;${LIB}/DirectXTK12.lib;${LIB}/spdlogd.lib")
 target_link_libraries(Exeon ImGUI)
+target_link_libraries(Exeon ImGuizmo)
 
 target_include_directories(Exeon PRIVATE "${PRIVATE_INCLUDE}")
-target_include_directories(Exeon PUBLIC "${PUBLIC_INCLUDE}")
+include_directories("${PUBLIC_INCLUDE}")

src/Shader/LightPass.hlsl

@@ -99,89 +99,16 @@ float3 ReconstructPosition(int2 pixelCoord, uint index)
 }
 
 float3 ViewDirectionFromUV(float2 uv)
-{
-    float2 ndc = uv * 2.0f - 1.0f;
-
-    float3 rayView = normalize(mul(float4(-ndc.x, ndc.y, 1.0f, 0.0f), InverseProjection).xyz);
-
-    float3 rayWorld = normalize(mul(float4(rayView, 0.0f), InverseView).xyz);
+{ 
+    float2 uvOffset = uv * 2.0f - 1.0f;
+    uvOffset.y *= -1.0f;
 
-    return -rayWorld;
-}
-
-
-float3 SampleSkybox(float3 dir)
-{
-    float3 absDir = abs(dir);
-    float ma;
-    float2 uv;
-    float3 color;
-
-    if (absDir.x >= absDir.y && absDir.x >= absDir.z)
-    {
-        ma = absDir.x;
-        if (dir.x > 0)
-        {
-            // Right face (+X)
-            uv = float2(-dir.z, -dir.y) / ma * 0.5 + 0.5;
-            color = rightTex.Sample(skyboxSampler, uv).rgb;
-        }
-        else
-        {
-            // Left face (-X)
-            uv = float2(dir.z, -dir.y) / ma * 0.5 + 0.5;
-            color = leftTex.Sample(skyboxSampler, uv).rgb;
-        }
-    }
-    else if (absDir.y >= absDir.x && absDir.y >= absDir.z)
-    {
-        ma = absDir.y;
-        if (dir.y > 0)
-        {
-            // Top face (+Y)
-            uv = float2(dir.x, dir.z) / ma * 0.5 + 0.5;
-            color = topTex.Sample(skyboxSampler, uv).rgb;
-        }
-        else
-        {
-            // Bottom face (-Y)
-            uv = float2(dir.x, -dir.z) / ma * 0.5 + 0.5;
-            color = bottomTex.Sample(skyboxSampler, uv).rgb;
-        }
-    }
-    else
-    {
-        ma = absDir.z;
-        if (dir.z > 0)
-        {
-            // Front face (+Z)
-            uv = float2(dir.x, -dir.y) / ma * 0.5 + 0.5;
-            color = frontTex.Sample(skyboxSampler, uv).rgb;
-        }
-        else
-        {
-            // Back face (-Z)
-            uv = float2(-dir.x, -dir.y) / ma * 0.5 + 0.5;
-            color = backTex.Sample(skyboxSampler, uv).rgb;
-        }
-    }
-
-    return color;
+    float3 dir = float3(uvOffset.x, uvOffset.y, 1.0f);
+    return normalize(dir);
 }
 
 PixelOutput PixelMain(VertexOutput input, uint index : SV_SampleIndex)
-{
-    //float depth = depthTex.Load(input.position.xy, index).r;
-    //if (depth >= 1.0f - 1e-5)
-    //{
-    //    float3 dir = ViewDirectionFromUV(input.uv);
-    //    float3 skyColor = SampleSkybox(dir);
-
-    //    PixelOutput outSky;
-    //    outSky.screen = float4(skyColor, 1.0f);
-    //    return outSky;
-    //}
-    
+{   
     float3 lightPos = float3(0.f, 1.f, -2.f);
     float3 lightColor = float3(100.f, 100.f, 100.f);
 

src/private/Core/Editor/Editor.cpp

@@ -5,9 +5,12 @@ Editor* Editor::m_instance;
 Editor::Editor() {
     this->m_bMenuOpen = false;
     this->m_sceneMgr = nullptr;
+    this->m_inspectorObj = nullptr;
+    this->m_nWidth = 0;
+    this->m_nHeight = 0;
 }
 
-void Editor::Init() {
+void Editor::Init(UINT nWidth, UINT nHeight) {
     this->m_sceneMgr = SceneManager::GetInstance();
 
     ImGuiIO& io = ImGui::GetIO();
@@ -98,6 +101,9 @@ void Editor::Init() {
     style->GrabRounding = 3;
     style->LogSliderDeadzone = 4;
     style->TabRounding = 4;
+
+    this->m_nWidth = nWidth;
+    this->m_nHeight = nHeight;
 }
 
 void Editor::Update() {
@@ -122,14 +128,111 @@ void Editor::Update() {
     ImGui::EndMainMenuBar();
 
     if (this->m_sceneMgr) {
+
+        float identityMatrix[16] = {
+        1.0f, 0.0f, 0.0f, 0.0f,
+        0.0f, 1.0f, 0.0f, 0.0f,
+        0.0f, 0.0f, 1.0f, 0.0f,
+        0.0f, 0.0f, 0.0f, 1.0f  // Posición del cubo (X=1.0f, Y=1.0f, Z=0.0f)
+        };
+
+        ImGuizmo::Enable(true);
+
         ImGui::SetNextWindowSize(ImVec2{ 300.f, 600.f });
         ImGui::Begin("Scene");
 
         Scene* scene = this->m_sceneMgr->GetCurrentScene();
+        Camera* camera = scene->GetCurrentCamera();
+
+        Transform cameraTransform = camera->transform;
+
+        XMVECTOR eye = XMVectorSet(
+            cameraTransform.location.x,
+            cameraTransform.location.y,
+            cameraTransform.location.z,
+            1.0f
+        );
+
+        float pitch = XMConvertToRadians(cameraTransform.rotation.x);
+        float yaw = XMConvertToRadians(cameraTransform.rotation.y);
+
+        XMVECTOR forward = XMVectorSet(
+            cosf(pitch) * sinf(yaw),
+            -sinf(pitch),
+            -cosf(pitch) * cosf(yaw),
+            0.0f
+        );
+
+        XMVECTOR at = XMVectorAdd(eye, forward);
+
+        XMVECTOR up = XMVectorSet(0.0f, 1.0f, 0.0f, 0.0f);
+
+        this->m_wvp.View = (XMMatrixLookAtLH(eye, at, up));
+        this->m_wvp.World = (XMMatrixIdentity());
+        this->m_wvp.Projection = (XMMatrixPerspectiveFovLH(XMConvertToRadians(70.f), static_cast<float>(this->m_nWidth) / static_cast<float>(this->m_nHeight), 0.01f, 3000.f));
+
+        /* Convert our View Projection matrices to a length 16 array of floats */
+        float viewMatrix[16];
+        float projectionMatrix[16];
+        XMStoreFloat4x4(reinterpret_cast<XMFLOAT4X4*>(viewMatrix), this->m_wvp.View);
+        XMStoreFloat4x4(reinterpret_cast<XMFLOAT4X4*>(projectionMatrix), this->m_wvp.Projection);
+
+        ImGuizmo::DrawGrid(viewMatrix, projectionMatrix, identityMatrix, 100);
+
+        float worldMatrix[16];
+
+        float objectMatrix[16] = {
+        1.0f, 0.0f, 0.0f, 0.0f,
+        0.0f, 1.0f, 0.0f, 0.0f,
+        0.0f, 0.0f, 1.0f, 0.0f,
+        1.0f, 1.0f, 0.0f, 1.0f  // Posición del cubo (X=1.0f, Y=1.0f, Z=0.0f)
+        };
 
         for (std::pair<std::string, GameObject*> object : scene->m_gameObjects) {
-            if(ImGui::Button(object.second->m_name.c_str())) {}
+            if(ImGui::Button(object.second->m_name.c_str())) {
+                this->m_inspectorObj = object.second;
+            }
+        }
+
+        ImGui::SetNextWindowSize(ImVec2{ 300.f, 600.f });
+        ImGui::SetNextWindowPos(ImVec2{ 1575,180 });
+        ImGui::Begin("Inspector");
+        if (this->m_inspectorObj) {
+            Transform* pObjTransform = &this->m_inspectorObj->transform;
+           
+            this->m_wvp.World *= (XMMatrixRotationX(XMConvertToRadians(pObjTransform->rotation.x)));
+            this->m_wvp.World *= (XMMatrixRotationY(XMConvertToRadians(pObjTransform->rotation.y)));
+            this->m_wvp.World *= (XMMatrixRotationZ(XMConvertToRadians(pObjTransform->rotation.z)));
+            this->m_wvp.World *= (XMMatrixTranslation(
+                pObjTransform->location.x,
+                pObjTransform->location.y,
+                pObjTransform->location.z));
+
+            this->m_wvp.World = XMMatrixTranspose(this->m_wvp.World);
+            XMStoreFloat4x4(reinterpret_cast<XMFLOAT4X4*>(worldMatrix), this->m_wvp.World);
+
+            ImGuizmo::Manipulate(viewMatrix, projectionMatrix, ImGuizmo::OPERATION::TRANSLATE, ImGuizmo::MODE::WORLD, worldMatrix);
+
+            ImGui::Text(this->m_inspectorObj->m_name.c_str());
+            ImGui::Text("Location");
+            ImGui::PushItemWidth(100);
+
+            ImGui::InputFloat("##X", &pObjTransform->location.x, 0.1f, 1.f, "%.2f");
+            ImGui::InputFloat("##Y", &pObjTransform->location.y, 0.1f, 1.f, "%.2f");
+            ImGui::InputFloat("##Z", &pObjTransform->location.z, 0.1f, 1.f, "%.2f");
+            ImGui::PopItemWidth();
+            ImGui::Text("Rotation");
+            ImGui::PushItemWidth(100);
+
+            ImGui::InputFloat("##X", &pObjTransform->rotation.x, 5.f, 10.f, "%.2f");
+            ImGui::InputFloat("##Y", &pObjTransform->rotation.y, 5.f, 10.f, "%.2f");
+            ImGui::InputFloat("##Z", &pObjTransform->rotation.z, 5.f, 10.f, "%.2f");
+            ImGui::PopItemWidth();
+        }
+        else {
+            ImGui::Text("Select an object...");
         }
+        ImGui::End();
 
         ImGui::End();
     }

src/private/Core/Renderer/D3D12.cpp

@@ -179,7 +179,7 @@ void D3D12::Init(HWND hwnd) {
 
 	ImGui::StyleColorsDark();
 
-	this->m_editor->Init();
+	this->m_editor->Init(this->m_nWidth, this->m_nHeight);
 }
 
 void D3D12::InitDepth() {
@@ -311,6 +311,16 @@ void D3D12::Update() {
 	ImGui_ImplWin32_NewFrame();
 	ImGui_ImplDX12_NewFrame();
 	ImGui::NewFrame();
+	ImGuizmo::BeginFrame();
+
+	ImGuizmo::BeginFrame();
+	ImGuizmo::SetDrawlist(ImGui::GetBackgroundDrawList());
+	ImGuizmo::SetRect(0, 0, this->m_nWidth, this->m_nHeight);
+
+	// Establecer el área donde se dibujará el guizmo en la ventana
+	ImGuizmo::SetRect(0.0f, 0.0f, static_cast<float>(this->m_nWidth), static_cast<float>(this->m_nHeight));
+
+
 
 	this->m_editor->Update();
 

src/public/Core/Editor/Editor.h

@@ -1,17 +1,26 @@
 #pragma once
 #include <iostream>
 #include <imgui/imgui.h>
+#include <ImGuizmo/ImGuizmo.h>
+#include <DXMath/DirectXMath.h>
 #include "Fonts/Roboto.h"
 #include "Core/Scene/SceneManager.h"
+#include "Util.h"
 
 class Editor {
 private:
 	static Editor* m_instance;
 	bool m_bMenuOpen;
 	SceneManager* m_sceneMgr;
+	GameObject* m_inspectorObj;
+
+	UINT m_nWidth;
+	UINT m_nHeight;
+
+	WVP m_wvp;
 public:
 	Editor();
-	void Init();
+	void Init(UINT nWidth, UINT nHeight);
 	void Update();
 
 	static Editor* GetInstance();

src/public/Core/Renderer/D3D12.h

@@ -12,6 +12,7 @@
 #include <imgui/imgui_impl_dx12.h>
 #include <imgui/imgui_impl_win32.h>
 #include "Core/Editor/Editor.h"
+#include <ImGuizmo/ImGuizmo.h>
 
 using namespace Microsoft::WRL;