From d2912b4f40f7b9e1e98eb896e4fb1af38029219f Mon Sep 17 00:00:00 2001 From: Sezz Date: Tue, 30 May 2023 01:52:06 +1000 Subject: [PATCH] Simplify --- TombEngine/Game/Hud/TargetHighlighter.cpp | 9 +++++---- TombEngine/Game/Hud/TargetHighlighter.h | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/TombEngine/Game/Hud/TargetHighlighter.cpp b/TombEngine/Game/Hud/TargetHighlighter.cpp index 0418f07a5..e7f351c66 100644 --- a/TombEngine/Game/Hud/TargetHighlighter.cpp +++ b/TombEngine/Game/Hud/TargetHighlighter.cpp @@ -15,15 +15,16 @@ using TEN::Renderer::g_Renderer; namespace TEN::Hud { - Vector2 CrosshairData::Get2DPositionOffset(short segmentOrient2D) const + Vector2 CrosshairData::Get2DPositionOffset(short orientOffset2D) const { constexpr auto ANGLE_OFFSET = ANGLE(-45.0f); float offsetDist = (Size / 2) * RadiusScalar; - auto posOffset2D = Vector2(offsetDist, 0.0f); - auto rotMatrix = Matrix::CreateRotationZ(TO_RAD(Orientation2D + segmentOrient2D + ANGLE_OFFSET)); + auto relPosOffset2D = Vector2(offsetDist, 0.0f); + auto rotMatrix = Matrix::CreateRotationZ(TO_RAD(Orientation2D + orientOffset2D + ANGLE_OFFSET)); - return GetAspectCorrect2DPosition(Vector2::Transform(posOffset2D, rotMatrix)); + auto posOffset2D = Vector2::Transform(relPosOffset2D, rotMatrix); + return GetAspectCorrect2DPosition(posOffset2D); } bool CrosshairData::IsOffscreen() const diff --git a/TombEngine/Game/Hud/TargetHighlighter.h b/TombEngine/Game/Hud/TargetHighlighter.h index a9cb2f114..42cd5bf74 100644 --- a/TombEngine/Game/Hud/TargetHighlighter.h +++ b/TombEngine/Game/Hud/TargetHighlighter.h @@ -32,7 +32,7 @@ namespace TEN::Hud std::array Segments = {}; - Vector2 Get2DPositionOffset(short segmentOrient2D) const; + Vector2 Get2DPositionOffset(short orientOffset2D) const; bool IsOffscreen() const; void Update(const Vector3& cameraPos, bool doPulse, bool isActive); };