Skip to content

Updated gizmo scaling behaviour to match translation #489

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
adriengivry merged 2 commits into from
May 7, 2025
Merged

Updated gizmo scaling behaviour to match translation #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
351a9fa
Updated gizmo scaling behaviour to match translation
Rishabh-Sukhwani May 6, 2025
bf76af6
fixed issue in gizmo scaling
Rishabh-Sukhwani May 7, 2025
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
3 changes: 2 additions & 1 deletion Sources/Overload/OvEditor/include/OvEditor/Core/GizmoBehaviour.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,10 @@ namespace OvEditor::Core
* Handle the scale behaviour
* @param p_viewMatrix
* @param p_projectionMatrix
* @param p_cameraPosition
* @param p_viewSize
*/
void ApplyScale(const OvMaths::FMatrix4& p_viewMatrix, const OvMaths::FMatrix4& p_projectionMatrix, const OvMaths::FVector2& p_viewSize) const;
void ApplyScale(const OvMaths::FMatrix4& p_viewMatrix, const OvMaths::FMatrix4& p_projectionMatrix, const OvMaths::FVector3& p_cameraPosition, const OvMaths::FVector2& p_viewSize);

private:
bool m_firstMouse = true;
Expand Down
72 changes: 63 additions & 9 deletions Sources/Overload/OvEditor/src/OvEditor/Core/GizmoBehaviour.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,22 +179,76 @@ void OvEditor::Core::GizmoBehaviour::ApplyRotation(const OvMaths::FMatrix4& p_vi
m_target->transform.SetWorldRotation(originRotation * rotationToApply);
}

void OvEditor::Core::GizmoBehaviour::ApplyScale(const OvMaths::FMatrix4& p_viewMatrix, const OvMaths::FMatrix4& p_projectionMatrix, const OvMaths::FVector2& p_viewSize) const
void OvEditor::Core::GizmoBehaviour::ApplyScale(const OvMaths::FMatrix4& p_viewMatrix, const OvMaths::FMatrix4& p_projectionMatrix, const OvMaths::FVector3& p_cameraPosition, const OvMaths::FVector2& p_viewSize)
{
auto unitsPerPixel = 0.01f;
auto originScale = m_originalTransform.GetWorldScale();
if (!m_target)
return;

auto screenDirection = GetScreenDirection(p_viewMatrix, p_projectionMatrix, p_viewSize);
const auto ray = GetMouseRay(m_currentMouse, p_viewMatrix, p_projectionMatrix, p_viewSize);

auto totalDisplacement = m_currentMouse - m_originMouse;
auto scaleCoefficient = OvMaths::FVector2::Dot(totalDisplacement, screenDirection) * unitsPerPixel;
const OvMaths::FVector3 gizmoAxisDirection = GetRealDirection(true);

OvMaths::FVector3 vectorToCamera = m_target->transform.GetWorldPosition() - p_cameraPosition;
if (OvMaths::FVector3::Dot(vectorToCamera, vectorToCamera) < 0.0001f)
{
vectorToCamera = m_originalTransform.GetWorldUp();
if (std::abs(OvMaths::FVector3::Dot(gizmoAxisDirection, vectorToCamera)) > 0.99f)
{
vectorToCamera = m_originalTransform.GetWorldRight();
}
}

const OvMaths::FVector3 planeTangent = OvMaths::FVector3::Cross(gizmoAxisDirection, vectorToCamera);

OvMaths::FVector3 tempPlaneNormal = OvMaths::FVector3::Cross(gizmoAxisDirection, planeTangent);
if (OvMaths::FVector3::Dot(tempPlaneNormal, tempPlaneNormal) < 0.0001f)
{
OvMaths::FVector3 nonCollinearVector = OvMaths::FVector3::Up;
if (std::abs(OvMaths::FVector3::Dot(gizmoAxisDirection, nonCollinearVector)) > 0.99f)
{
nonCollinearVector = OvMaths::FVector3::Right;
}
tempPlaneNormal = OvMaths::FVector3::Cross(gizmoAxisDirection, nonCollinearVector);
}
const OvMaths::FVector3 planeNormal = OvMaths::FVector3::Normalize(tempPlaneNormal);


const OvMaths::FVector3 planePoint = m_originalTransform.GetWorldPosition();

const float denom = OvMaths::FVector3::Dot(ray, planeNormal);

if (std::abs(denom) <= 0.001f)
return;

const float t = OvMaths::FVector3::Dot(planePoint - p_cameraPosition, planeNormal) / denom;

if (t <= 0.001f)
return;

const OvMaths::FVector3 pointOnPlane = p_cameraPosition + ray * t * 2.0f;

OvMaths::FVector3 displacementOnPlane;
if (m_firstPick)
{
m_initialOffset = m_originalTransform.GetWorldPosition() - pointOnPlane;
m_firstPick = false;
displacementOnPlane = OvMaths::FVector3::Zero;
}
else
{
displacementOnPlane = pointOnPlane - m_originalTransform.GetWorldPosition() + m_initialOffset;
}

float scaleDeltaCoefficient = OvMaths::FVector3::Dot(displacementOnPlane, gizmoAxisDirection);

if (IsSnappedBehaviourEnabled())
{
scaleCoefficient = SnapValue(scaleCoefficient, OvEditor::Settings::EditorSettings::ScalingSnapUnit);
scaleDeltaCoefficient = SnapValue(scaleDeltaCoefficient, OvEditor::Settings::EditorSettings::ScalingSnapUnit);
}

auto newScale = originScale + GetFakeDirection() * scaleCoefficient;
const auto originScale = m_originalTransform.GetWorldScale();

auto newScale = originScale + GetFakeDirection() * scaleDeltaCoefficient;

/* Prevent scale from being negative*/
newScale.x = std::max(newScale.x, 0.0001f);
Expand All @@ -217,7 +271,7 @@ void OvEditor::Core::GizmoBehaviour::ApplyOperation(const OvMaths::FMatrix4& p_v
break;

case EGizmoOperation::SCALE:
ApplyScale(p_viewMatrix, p_projectionMatrix, p_viewSize);
ApplyScale(p_viewMatrix, p_projectionMatrix, p_cameraPosition, p_viewSize);
break;
}
}
Expand Down