Merge commit '593f03efb4996ae8bb8e1f53a55e2ba00e022449' into puvvadar/gitflow_211118_o3de

2021-11-18 09:37:11 -08:00
parent 69dc2ff2f6 593f03efb4
commit 4c8bb5694b
10 changed files with 197 additions and 29 deletions
@@ -235,7 +235,10 @@ namespace AtomToolsFramework
                return t * t * t * (t * (t * 6.0f - 15.0f) + 10.0f);
            };

-            m_cameraAnimation.m_time = AZ::GetClamp(m_cameraAnimation.m_time + event.m_deltaTime.count(), 0.0f, 1.0f);
+            m_cameraAnimation.m_time = AZ::GetClamp(
+                m_cameraAnimation.m_time +
+                    (event.m_deltaTime.count() / ModularViewportCameraControllerRequests::InterpolateToTransformDuration),
+                0.0f, 1.0f);

            const auto& [transformStart, transformEnd, animationTime] = m_cameraAnimation;

@@ -263,10 +266,22 @@ namespace AtomToolsFramework
        m_updatingTransformInternally = false;
    }

-    void ModularViewportCameraControllerInstance::InterpolateToTransform(const AZ::Transform& worldFromLocal)
+    bool ModularViewportCameraControllerInstance::InterpolateToTransform(const AZ::Transform& worldFromLocal)
    {
-        m_cameraMode = CameraMode::Animation;
-        m_cameraAnimation = CameraAnimation{ CombinedCameraTransform(), worldFromLocal, 0.0f };
+        if (!IsInterpolating())
+        {
+            m_cameraMode = CameraMode::Animation;
+            m_cameraAnimation = CameraAnimation{ CombinedCameraTransform(), worldFromLocal, 0.0f };
+
+            return true;
+        }
+
+        return false;
+    }
+
+    bool ModularViewportCameraControllerInstance::IsInterpolating() const
+    {
+        return m_cameraMode == CameraMode::Animation;
    }

    void ModularViewportCameraControllerInstance::StartTrackingTransform(const AZ::Transform& worldFromLocal)