From b8bedd6cb2a3ad6ff217c4594beccc8e2a34fb0b Mon Sep 17 00:00:00 2001 From: antopilo Date: Mon, 14 Apr 2025 17:43:54 -0400 Subject: [PATCH] Selection now works for all gizmos --- Data/Shaders/Vulkan/gizmo.frag | 1 + .../Editor/Windows/SceneEditor/Widgets/ViewportWidget.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Data/Shaders/Vulkan/gizmo.frag b/Data/Shaders/Vulkan/gizmo.frag index 20776473..0e44d1ce 100644 --- a/Data/Shaders/Vulkan/gizmo.frag +++ b/Data/Shaders/Vulkan/gizmo.frag @@ -135,6 +135,7 @@ PSOutput main(PSInput input) else { output.oEntityID = float4(0, 0, 0, 0); // Or leave it unassigned if default is zero + discard; } } } diff --git a/Editor/Source/Editor/Windows/SceneEditor/Widgets/ViewportWidget.cpp b/Editor/Source/Editor/Windows/SceneEditor/Widgets/ViewportWidget.cpp index d7b21fa9..c7b1015a 100644 --- a/Editor/Source/Editor/Windows/SceneEditor/Widgets/ViewportWidget.cpp +++ b/Editor/Source/Editor/Windows/SceneEditor/Widgets/ViewportWidget.cpp @@ -257,7 +257,7 @@ void DrawIconGizmo(DebugCmd& debugCmd, const std::string& icon, const EditorCont gizmoTransform = glm::inverse(scene->GetCurrentCamera()->GetTransform()); gizmoTransform[3] = initialTransform[3]; gizmoTransform = glm::scale(gizmoTransform, gizmoSize * GetGizmoScale(cameraPosition, initialTransform[3])); - debugCmd.DrawTexturedQuad(proj * view * gizmoTransform, TextureManager::Get()->GetTexture2(icon), isSelected ? Color(1, 1, 0, 1) : Color(1, 1, 1, 1)); + debugCmd.DrawTexturedQuad(proj * view * gizmoTransform, TextureManager::Get()->GetTexture2(icon), isSelected ? Engine::GetProject()->Settings.PrimaryColor : Color(1, 1, 1, 1), (int32_t)e); } } @@ -471,7 +471,7 @@ void ViewportWidget::OnDebugDraw(DebugCmd& debugCmd) } // Billboard + scaling logic - drawGizmoIcon(transform, texturePath, isSelected ? Color(1, 1, 0, 1) : Color(1, 1, 1, 1), (int32_t)e); + drawGizmoIcon(transform, texturePath, isSelected ? Engine::GetProject()->Settings.PrimaryColor : Color(1, 1, 1, 1), (int32_t)e); } DrawIconGizmo(debugCmd, "Resources/Gizmos/Camera.png", editorContext);