Merge branch 'development' of https://github.com/o3de/o3de into daimini/gitflow_211027_o3de

Code/Framework/AzToolsFramework/AzToolsFramework/Application/EditorEntityManager.cpp

@@ -9,9 +9,27 @@
 #include <AzToolsFramework/Application/EditorEntityManager.h>
 
 #include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzToolsFramework/Entity/EditorEntityHelpers.h>
 
 namespace AzToolsFramework
 {
+    static bool AreEntitiesValidForDuplication(const EntityIdList& entityIds)
+    {
+        for (AZ::EntityId entityId : entityIds)
+        {
+            if (GetEntityById(entityId) == nullptr)
+            {
+                AZ_Error(
+                    "Entity", false,
+                    "Entity with id '%llu' is not found. This can happen when you try to duplicate the entity before it is created. Please "
+                    "ensure entities are created before trying to duplicate them.",
+                    static_cast<AZ::u64>(entityId));
+                return false;
+            }
+        }
+        return true;
+    }
+
     void EditorEntityManager::Start()
     {
         m_prefabPublicInterface = AZ::Interface<Prefab::PrefabPublicInterface>::Get();
@@ -62,7 +80,11 @@ namespace AzToolsFramework
         EntityIdList selectedEntities;
         ToolsApplicationRequestBus::BroadcastResult(selectedEntities, &ToolsApplicationRequests::GetSelectedEntities);
 
-        m_prefabPublicInterface->DuplicateEntitiesInInstance(selectedEntities);
+        if (AreEntitiesValidForDuplication(selectedEntities))
+        {
+            m_prefabPublicInterface->DuplicateEntitiesInInstance(selectedEntities);
+        }
+
     }
 
     void EditorEntityManager::DuplicateEntityById(AZ::EntityId entityId)
@@ -72,7 +94,10 @@ namespace AzToolsFramework
 
     void EditorEntityManager::DuplicateEntities(const EntityIdList& entities)
     {
-        m_prefabPublicInterface->DuplicateEntitiesInInstance(entities);
+        if (AreEntitiesValidForDuplication(entities))
+        {
+            m_prefabPublicInterface->DuplicateEntitiesInInstance(entities);
+        }
     }
 }
 

Code/Framework/AzToolsFramework/AzToolsFramework/Application/EditorEntityManager.h

@@ -34,5 +34,4 @@ namespace AzToolsFramework
     private:
         Prefab::PrefabPublicInterface* m_prefabPublicInterface = nullptr;
     };
-
 }

Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp

@@ -1110,7 +1110,8 @@ namespace AzToolsFramework
                 // Select the duplicated entities/instances
                 auto selectionUndo = aznew SelectionCommand(duplicatedEntityAndInstanceIds, "Select Duplicated Entities/Instances");
                 selectionUndo->SetParent(undoBatch.GetUndoBatch());
-                ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequestBus::Events::SetSelectedEntities, duplicatedEntityAndInstanceIds);
+                ToolsApplicationRequestBus::Broadcast(
+                    &ToolsApplicationRequestBus::Events::SetSelectedEntities, duplicatedEntityAndInstanceIds);
             }
 
             return AZ::Success(AZStd::move(duplicatedEntityAndInstanceIds));

Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportRenderer.cpp

@@ -128,10 +128,10 @@ namespace EMStudio
         AZ_Assert(m_gridEntity != nullptr, "Failed to create grid entity.");
 
         AZ::Render::GridComponentConfig gridConfig;
-        gridConfig.m_gridSize = 4.0f;
+        gridConfig.m_gridSize = 20.0f;
         gridConfig.m_axisColor = AZ::Color(0.5f, 0.5f, 0.5f, 1.0f);
         gridConfig.m_primaryColor = AZ::Color(0.3f, 0.3f, 0.3f, 1.0f);
-        gridConfig.m_secondaryColor = AZ::Color(0.5f, 0.1f, 0.1f, 1.0f);
+        gridConfig.m_secondaryColor = AZ::Color(0.5f, 0.5f, 0.5f, 1.0f);
         auto gridComponent = m_gridEntity->CreateComponent(AZ::Render::GridComponentTypeId);
         gridComponent->SetConfiguration(gridConfig);
 

Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportWidget.cpp

@@ -6,10 +6,11 @@
  *
  */
 
-#include <AzCore/Settings/SettingsRegistry.h>
+#include <AzCore/Math/MatrixUtils.h>
 #include <AzFramework/Viewport/ViewportControllerList.h>
 #include <AzFramework/Viewport/CameraInput.h>
 #include <Atom/RPI.Public/ViewportContext.h>
+#include <Atom/RPI.Public/View.h>
 #include <AtomToolsFramework/Viewport/ModularViewportCameraController.h>
 #include <EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioManager.h>
 
@@ -166,6 +167,26 @@ namespace EMStudio
         GetViewportContext()->SetCameraTransform(AZ::Transform::CreateLookAt(cameraPosition, targetPosition));
     }
 
+    void AnimViewportWidget::OnTick(float deltaTime, AZ::ScriptTimePoint time)
+    {
+        RenderViewportWidget::OnTick(deltaTime, time);
+        CalculateCameraProjection();
+    }
+
+    void AnimViewportWidget::CalculateCameraProjection()
+    {
+        auto viewportContext = GetViewportContext();
+        auto windowSize = viewportContext->GetViewportSize();
+        // Prevent devided by zero
+        const float height = AZStd::max<float>(aznumeric_cast<float>(windowSize.m_height), 1.0f);
+        const float aspectRatio = aznumeric_cast<float>(windowSize.m_width) / height;
+
+        AZ::Matrix4x4 viewToClipMatrix;
+        AZ::MakePerspectiveFovMatrixRH(viewToClipMatrix, AZ::Constants::HalfPi, aspectRatio, DepthNear, DepthFar, true);
+
+        viewportContext->GetDefaultView()->SetViewToClipMatrix(viewToClipMatrix);
+    }
+
     void AnimViewportWidget::ToggleRenderFlag(EMotionFX::ActorRenderFlag flag)
     {
         m_renderFlags[flag] = !m_renderFlags[flag];

Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportWidget.h

@@ -30,6 +30,9 @@ namespace EMStudio
         EMotionFX::ActorRenderFlagBitset GetRenderFlags() const;
 
     private:
+        void OnTick(float deltaTime, AZ::ScriptTimePoint time) override;
+
+        void CalculateCameraProjection();
         void SetupCameras();
         void SetupCameraController();
 
@@ -42,6 +45,8 @@ namespace EMStudio
         void ToggleRenderFlag(EMotionFX::ActorRenderFlag flag);
 
         static constexpr float CameraDistance = 2.0f;
+        static constexpr float DepthNear = 0.01f;
+        static constexpr float DepthFar = 100.0f;
 
         AZStd::unique_ptr<AnimViewportRenderer> m_renderer;
         AZStd::shared_ptr<AzFramework::RotateCameraInput> m_rotateCamera;