Disabled smoothing action in Editor (#75)

Signed-off-by: Michał Pełka <[email protected]>

Author: michalpelka

Gems/Smoothing/Code/Source/Clients/SmoothingComponent.cpp

@@ -132,6 +132,10 @@ namespace Smoothing
     void SmoothingComponentController::OnTick(float deltaTime, AZ::ScriptTimePoint time)
     {
         AZ_UNUSED(time);
+        if (!m_smoothingEnabled)
+        {
+            return;
+        }
         // get transform of entity to track
         AZ::Transform targetTransform = AZ::Transform::CreateIdentity();
         AZ::Transform ourTransform = AZ::Transform::CreateIdentity();
@@ -255,4 +259,14 @@ namespace Smoothing
     {
         SmoothingComponentBase::Deactivate();
     }
+
+    void SmoothingComponentController::SetSmoothingEnabled(bool enabled)
+    {
+        m_smoothingEnabled = enabled;
+    }
+
+    bool SmoothingComponentController::GetSmoothingEnabled() const
+    {
+        return m_smoothingEnabled;
+    }
 } // namespace Smoothing

Gems/Smoothing/Code/Source/Clients/SmoothingComponent.h

@@ -63,6 +63,9 @@ namespace Smoothing
         void OnTick(float deltaTime, AZ::ScriptTimePoint time) override;
         int GetTickOrder() override;
 
+        void SetSmoothingEnabled(bool enabled);
+        bool GetSmoothingEnabled() const;
+
     protected:
         SmoothingConfig m_config;
         SmoothingUtils::SmoothingCache m_smoothingCache;
@@ -72,6 +75,7 @@ namespace Smoothing
         AZ::Vector3 m_ourLastVelocity;
         AZ::Vector3 m_ourLastAngularVelocity;
         bool m_isFirstTick = true;
+        bool m_smoothingEnabled = true;
     };
     using SmoothingComponentBase = AzFramework::Components::ComponentAdapter<SmoothingComponentController, SmoothingConfig>;
 

Gems/Smoothing/Code/Source/Tools/SmoothingEditorComponent.cpp

@@ -14,7 +14,8 @@ namespace Smoothing
         AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
         if (serializeContext)
         {
-            serializeContext->Class<SmoothingComponentEditorComponent, SmoothingComponentEditorBase>()->Version(1);
+            serializeContext->Class<SmoothingComponentEditorComponent, SmoothingComponentEditorBase>()->Version(1)->Field(
+                "ActiveInEditor", &SmoothingComponentEditorComponent::m_activeInEditor);
 
             AZ::EditContext* editContext = serializeContext->GetEditContext();
             if (editContext)
@@ -24,14 +25,22 @@ namespace Smoothing
                         AZ::Edit::ClassElements::EditorData, "Components allows to follow movement of the another entity with smoothing.")
                     ->Attribute(AZ::Edit::Attributes::Category, "Smoothing")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"))
-                    ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly);
+                    ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
+                    ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
+                    ->DataElement(
+                        AZ::Edit::UIHandlers::CheckBox,
+                        &SmoothingComponentEditorComponent::m_activeInEditor,
+                        "Active In Editor",
+                        "Smoothing action should be shown in the editor")
+                    ->Attribute(AZ::Edit::Attributes::ChangeNotify, &SmoothingComponentEditorComponent::OnActiveInEditorChanged);
             }
         }
     }
 
     void SmoothingComponentEditorComponent::Activate()
     {
         SmoothingComponentEditorBase::Activate();
+        SmoothingComponentEditorBase::m_controller.SetSmoothingEnabled(m_activeInEditor);
     }
 
     void SmoothingComponentEditorComponent::Deactivate()
@@ -43,4 +52,9 @@ namespace Smoothing
     {
         return true;
     };
+
+    void SmoothingComponentEditorComponent::OnActiveInEditorChanged()
+    {
+        SmoothingComponentEditorBase::m_controller.SetSmoothingEnabled(m_activeInEditor);
+    }
 } // namespace Smoothing

Gems/Smoothing/Code/Source/Tools/SmoothingEditorComponent.h

@@ -23,5 +23,9 @@ namespace Smoothing
         void Activate() override;
         void Deactivate() override;
         bool ShouldActivateController() const override;
+
+    private:
+        bool m_activeInEditor = false;
+        void OnActiveInEditorChanged();
     };
 } // namespace Smoothing