Skip to content

Fixed hover outline not rendering #300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
litelawliet merged 1 commit into from
Jun 11, 2024
Merged

Fixed hover outline not rendering #300

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions Sources/Overload/OvEditor/src/OvEditor/Rendering/DebugSceneRenderer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ const OvMaths::FVector3 kLightVolumeColor = { 1.0f, 1.0f, 0.0f };
const OvMaths::FVector3 kColliderColor = { 0.0f, 1.0f, 0.0f };
const OvMaths::FVector3 kFrustumColor = { 1.0f, 1.0f, 1.0f };

const OvMaths::FVector4 kDefaultOutlineColor{ 1.0f, 0.7f, 0.0f, 1.0f };
const OvMaths::FVector4 kSelectedOutlineColor{ 1.0f, 1.0f, 0.0f, 1.0f };
const OvMaths::FVector4 kHoveredOutlineColor{ 1.0f, 1.0f, 0.0f, 1.0f };
const OvMaths::FVector4 kSelectedOutlineColor{ 1.0f, 0.7f, 0.0f, 1.0f };

constexpr float kDefaultOutlineWidth = 2.5f;
constexpr float kHoveredOutlineWidth = 2.5f;
constexpr float kSelectedOutlineWidth = 5.0f;

OvMaths::FMatrix4 CalculateCameraModelMatrix(OvCore::ECS::Actor& p_actor)
Expand Down Expand Up @@ -174,8 +174,16 @@ class DebugActorRenderPass : public OvRendering::Core::ARenderPass
if (debugSceneDescriptor.selectedActor)
{
auto& selectedActor = debugSceneDescriptor.selectedActor.value();
const bool isActorHovered = debugSceneDescriptor.highlightedActor && debugSceneDescriptor.highlightedActor->GetID() == selectedActor.GetID();

DrawActorDebugElements(selectedActor);
m_renderer.GetFeature<OvEditor::Rendering::OutlineRenderFeature>().DrawOutline(selectedActor, kSelectedOutlineColor, kSelectedOutlineWidth);
m_renderer.GetFeature<OvEditor::Rendering::OutlineRenderFeature>().DrawOutline(
selectedActor,
isActorHovered ?
kHoveredOutlineColor :
kSelectedOutlineColor,
kSelectedOutlineWidth
);
m_renderer.Clear(false, true, false, OvMaths::FVector3::Zero);
m_renderer.GetFeature<OvEditor::Rendering::GizmoRenderFeature>().DrawGizmo(
selectedActor.transform.GetWorldPosition(),
Expand All @@ -185,6 +193,17 @@ class DebugActorRenderPass : public OvRendering::Core::ARenderPass
debugSceneDescriptor.highlightedGizmoDirection
);
}

if (debugSceneDescriptor.highlightedActor)
{
auto& highlightedActor = debugSceneDescriptor.highlightedActor.value();

// Render the outline only if the actor is not already selected (as its outline render should have been handled already).
if (!debugSceneDescriptor.selectedActor || highlightedActor.GetID() != debugSceneDescriptor.selectedActor->GetID())
{
m_renderer.GetFeature<OvEditor::Rendering::OutlineRenderFeature>().DrawOutline(highlightedActor, kHoveredOutlineColor, kHoveredOutlineWidth);
}
}
}

void DrawActorDebugElements(OvCore::ECS::Actor& p_actor)
Expand Down