celisej567/Nuake
1
0
Fork 0
mirror of https://github.com/antopilo/Nuake.git synced 2026-09-09 20:08:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed imguizmo with reverse-z

Browse Source
This commit is contained in:
antopilo
2025-01-04 11:07:25 -05:00
parent 8548fc8133
commit 55901f8603
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Editor/src/Windows/EditorInterface.cpp
View File

@@ -754,8 +754,7 @@ namespace Nuake {
ImGuizmo::SetDrawlist();
ImGuizmo::AllowAxisFlip(true);
ImGuizmo::SetRect(imagePos.x, imagePos.y + 0.0f, viewportPanelSize.x, viewportPanelSize.y);
ImGuizmo::SetRect(imagePos.x, imagePos.y, viewportPanelSize.x, viewportPanelSize.y);
if (m_DrawGrid && !Engine::IsPlayMode())
{
ImGuizmo::DrawGrid(glm::value_ptr(Engine::GetCurrentScene()->GetCurrentCamera()->GetTransform()),
@@ -777,17 +776,19 @@ namespace Nuake {
Matrix4 transform = tc.GetGlobalTransform();
const auto& editorCam = Engine::GetCurrentScene()->GetCurrentCamera();
Matrix4 cameraView = editorCam->GetTransform();
Matrix4 cameraProjection = editorCam->GetPerspective();
// Since imguizmo doesnt support reverse-Z, we need to create a new projection matrix
// With a normal near and far plane.
Matrix4 normalZProjection = glm::perspectiveFov(glm::radians(editorCam->Fov), 9.0f * editorCam->AspectRatio, 9.0f, editorCam->Far, editorCam->Near);
static Vector3 camPreviousPos = Engine::GetCurrentScene()->m_EditorCamera->Translation;
static Vector3 camNewPos = Vector3(0, 0, 0);
Vector3 camDelta = camNewPos - camPreviousPos;
Vector3 previousGlobalPos = transform[3];
// Imguizmo calculates the delta from the gizmo,
ImGuizmo::Manipulate(
glm::value_ptr(cameraView),
glm::value_ptr(cameraProjection),
glm::value_ptr(Engine::GetCurrentScene()->GetCurrentCamera()->GetTransform()),
glm::value_ptr(normalZProjection),
CurrentOperation, CurrentMode,
glm::value_ptr(transform), NULL,
UseSnapping ? &CurrentSnapping.x : NULL

1
Nuake/src/Rendering/Camera.cpp
View File

@@ -68,6 +68,7 @@ namespace Nuake
{
//TODO: Add perspective options
m_Perspective = glm::perspectiveFov(glm::radians(Fov), 9.0f * AspectRatio, 9.0f, Near, Far);
return m_Perspective;
}

4
Nuake/src/Rendering/Camera.h
View File

@@ -27,10 +27,10 @@ namespace Nuake
Matrix4 m_Perspective;
Matrix4 m_View;
float Near = 400.0f;
float Far = 0.001f;
public:
float Near = 400.0f;
float Far = 0.001f;
float AspectRatio = 16.0f / 9.0f;
Vector3 Direction = Vector3(0, 0, 1);