From 8a9b76a468d740636af96ddb3d9afdffaaa56770 Mon Sep 17 00:00:00 2001 From: Ruan Lucas <79365912+RuanLucasGD@users.noreply.github.com> Date: Wed, 19 Jul 2023 16:28:15 -0400 Subject: [PATCH] clean code --- .../CustomEditors/Dedicated/SplineEditor.cs | 80 +++++++++---------- 1 file changed, 38 insertions(+), 42 deletions(-) diff --git a/Source/Editor/CustomEditors/Dedicated/SplineEditor.cs b/Source/Editor/CustomEditors/Dedicated/SplineEditor.cs index b4cac340f..694a51bf9 100644 --- a/Source/Editor/CustomEditors/Dedicated/SplineEditor.cs +++ b/Source/Editor/CustomEditors/Dedicated/SplineEditor.cs @@ -154,11 +154,7 @@ namespace FlaxEditor.CustomEditors.Dedicated private void SmoothIfNotAligned(Spline spline, int index) { - var keyframe = spline.GetSplineKeyframe(index); - var angle = Vector3.Dot(keyframe.TangentIn.Translation.Normalized, keyframe.TangentOut.Translation.Normalized); - var isAligned = angle <= -0.99f; - - if (!isAligned) + if (!IsAlignedTangentMode(spline, index)) { SetPointSmooth(spline, index); } @@ -342,43 +338,6 @@ namespace FlaxEditor.CustomEditors.Dedicated _currentTangentMode.OnSetMode(SelectedSpline, _lastPointSelected.Index); } - private bool IsFreeTangentMode(Spline spline, int index) - { - if (IsLinearTangentMode(spline, index) || IsAlignedTangentMode(spline, index)) - { - return false; - } - - return true; - } - - private bool IsLinearTangentMode(Spline spline, int index) - { - var keyframe = spline.GetSplineKeyframe(index); - return keyframe.TangentIn.Translation.Length == 0 && keyframe.TangentOut.Translation.Length == 0; - } - - private bool IsAlignedTangentMode(Spline spline, int index) - { - var keyframe = spline.GetSplineKeyframe(index); - var tangentIn = keyframe.TangentIn.Translation; - var tangentOut = keyframe.TangentOut.Translation; - - if (tangentIn.Length == 0 || tangentOut.Length == 0) - { - return false; - } - - var angleBetweenTwoTangents = Vector3.Dot(tangentIn.Normalized,tangentOut.Normalized); - - if (angleBetweenTwoTangents < -0.99f) - { - return true; - } - - return false; - } - private void UpdateSelectedPoint() { // works only if select one spline @@ -484,5 +443,42 @@ namespace FlaxEditor.CustomEditors.Dedicated } } } + + private static bool IsFreeTangentMode(Spline spline, int index) + { + if (IsLinearTangentMode(spline, index) || IsAlignedTangentMode(spline, index)) + { + return false; + } + + return true; + } + + private static bool IsLinearTangentMode(Spline spline, int index) + { + var keyframe = spline.GetSplineKeyframe(index); + return keyframe.TangentIn.Translation.Length == 0 && keyframe.TangentOut.Translation.Length == 0; + } + + private static bool IsAlignedTangentMode(Spline spline, int index) + { + var keyframe = spline.GetSplineKeyframe(index); + var tangentIn = keyframe.TangentIn.Translation; + var tangentOut = keyframe.TangentOut.Translation; + + if (tangentIn.Length == 0 || tangentOut.Length == 0) + { + return false; + } + + var angleBetweenTwoTangents = Vector3.Dot(tangentIn.Normalized, tangentOut.Normalized); + + if (angleBetweenTwoTangents < -0.99f) + { + return true; + } + + return false; + } } }