Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into cgalvan/FixLCGraphNotOpeningOnEdit

2021-07-01 14:07:03 -05:00
parent d7b516b518 8f7a0a0dbd
commit 4145b4663a
66 changed files with 667 additions and 388 deletions
@@ -403,7 +403,12 @@ namespace AZ
        {
            if (!parentValue->EraseMember(tokens[path.GetTokenCount() - 1].name))
            {
-                return settings.m_reporting(R"(The "remove" operation failed to remove member from object.)",
+                rapidjson::StringBuffer pathString;
+                path.Stringify(pathString);
+                return settings.m_reporting(
+                    AZStd::string::format(
+                        R"(The "remove" operation failed to remove member '%s' from object at path '%s'.)",
+                        tokens[path.GetTokenCount() - 1].name, pathString.GetString()),
                    ResultCode(Tasks::Merge, Outcomes::Invalid), element);
            }
        }
@@ -34,6 +34,28 @@ namespace AzPhysics
    const CollisionGroup CollisionGroup::All_NoTouchBend = CollisionGroup::All.GetMask() & ~CollisionLayer::TouchBend.GetMask();
 #endif

+    void CollisionGroupScriptConstructor(CollisionGroup* thisPtr, AZ::ScriptDataContext& scriptDataContext)
+    {
+        if (int numArgs = scriptDataContext.GetNumArguments();
+            numArgs != 1)
+        {
+            scriptDataContext.GetScriptContext()->Error(AZ::ScriptContext::ErrorType::Error, true,
+                "CollisionGroup() accepts only 1 argument, not %d", numArgs);
+            return;
+        }
+
+        if (!scriptDataContext.IsString(0))
+        {
+            scriptDataContext.GetScriptContext()->Error(AZ::ScriptContext::ErrorType::Error, true,
+                "Argument to CollisionGroup() should be string");
+            return;
+        }
+
+        AZStd::string groupName;
+        scriptDataContext.ReadArg(0, groupName);
+        *thisPtr = CollisionGroup(groupName);
+    }
+
    void CollisionGroup::Reflect(AZ::ReflectContext* context)
    {
        if (auto* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
@@ -50,7 +72,9 @@ namespace AzPhysics
                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
                ->Attribute(AZ::Script::Attributes::Module, "physics")
                ->Attribute(AZ::Script::Attributes::Category, "AzPhysics")
-                ->Constructor<const AZStd::string>()
+                ->Constructor<const AZStd::string&>()
+                ->Attribute(AZ::Script::Attributes::Storage, AZ::Script::Attributes::StorageType::Value)
+                ->Attribute(AZ::Script::Attributes::ConstructorOverride, &CollisionGroupScriptConstructor)
                ;
        }
    }
@@ -88,6 +88,19 @@ namespace AzPhysics
                    ;
            }
        }
+
+        if (auto* behaviorContext = azdynamic_cast<AZ::BehaviorContext*>(context))
+        {
+            behaviorContext->Class<SceneQueryRequest>("SceneQueryRequest")
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
+                ->Attribute(AZ::Script::Attributes::Module, "physics")
+                ->Attribute(AZ::Script::Attributes::Category, "PhysX")
+                ->Property("Collision", BehaviorValueProperty(&SceneQueryRequest::m_collisionGroup))
+                // Until enum class support for behavior context is done, expose this as an int
+                ->Property("QueryType", [](const SceneQueryRequest& self) { return static_cast<int>(self.m_queryType); },
+                    [](SceneQueryRequest& self, int newQueryType) { self.m_queryType = SceneQuery::QueryType(newQueryType); })
+                ;
+        }
    }

    /*static*/ void RayCastRequest::Reflect(AZ::ReflectContext* context)
@@ -123,10 +136,6 @@ namespace AzPhysics
                ->Property("Distance", BehaviorValueProperty(&RayCastRequest::m_distance))
                ->Property("Start", BehaviorValueProperty(&RayCastRequest::m_start))
                ->Property("Direction", BehaviorValueProperty(&RayCastRequest::m_direction))
-                ->Property("Collision", BehaviorValueProperty(&RayCastRequest::m_collisionGroup))
-                // Until enum class support for behavior context is done, expose this as an int
-                ->Property("QueryType", [](const RayCastRequest& self) { return static_cast<int>(self.m_queryType); },
-                    [](RayCastRequest& self, int newQueryType) { self.m_queryType = SceneQuery::QueryType(newQueryType); })
                ;
        }
    }
@@ -73,21 +73,22 @@ namespace Physics
        {
            if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
            {
-                behaviorContext->EBus<Physics::CharacterRequestBus>("CharacterControllerRequestBus", "Character Controller")
-                    ->Attribute(AZ::Script::Attributes::Storage, AZ::Script::Attributes::StorageType::RuntimeOwn)
+                behaviorContext->EBus<CharacterRequestBus>("CharacterControllerRequestBus")
+                    ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
+                    ->Attribute(AZ::Script::Attributes::Module, "physics")
                    ->Attribute(AZ::Edit::Attributes::Category, "PhysX")
-                    ->Event("GetBasePosition", &Physics::CharacterRequests::GetBasePosition, "Get Base Position")
-                    ->Event("SetBasePosition", &Physics::CharacterRequests::SetBasePosition, "Set Base Position")
-                    ->Event("GetCenterPosition", &Physics::CharacterRequests::GetCenterPosition, "Get Center Position")
-                    ->Event("GetStepHeight", &Physics::CharacterRequests::GetStepHeight, "Get Step Height")
-                    ->Event("SetStepHeight", &Physics::CharacterRequests::SetStepHeight, "Set Step Height")
-                    ->Event("GetUpDirection", &Physics::CharacterRequests::GetUpDirection, "Get Up Direction")
-                    ->Event("GetSlopeLimitDegrees", &Physics::CharacterRequests::GetSlopeLimitDegrees, "Get Slope Limit (Degrees)")
-                    ->Event("SetSlopeLimitDegrees", &Physics::CharacterRequests::SetSlopeLimitDegrees, "Set Slope Limit (Degrees)")
-                    ->Event("GetMaximumSpeed", &Physics::CharacterRequests::GetMaximumSpeed, "Get Maximum Speed")
-                    ->Event("SetMaximumSpeed", &Physics::CharacterRequests::SetMaximumSpeed, "Set Maximum Speed")
-                    ->Event("GetVelocity", &Physics::CharacterRequests::GetVelocity, "Get Velocity")
-                    ->Event("AddVelocity", &Physics::CharacterRequests::AddVelocity, "Add Velocity")
+                    ->Event("GetBasePosition", &CharacterRequests::GetBasePosition, "Get Base Position")
+                    ->Event("SetBasePosition", &CharacterRequests::SetBasePosition, "Set Base Position")
+                    ->Event("GetCenterPosition", &CharacterRequests::GetCenterPosition, "Get Center Position")
+                    ->Event("GetStepHeight", &CharacterRequests::GetStepHeight, "Get Step Height")
+                    ->Event("SetStepHeight", &CharacterRequests::SetStepHeight, "Set Step Height")
+                    ->Event("GetUpDirection", &CharacterRequests::GetUpDirection, "Get Up Direction")
+                    ->Event("GetSlopeLimitDegrees", &CharacterRequests::GetSlopeLimitDegrees, "Get Slope Limit (Degrees)")
+                    ->Event("SetSlopeLimitDegrees", &CharacterRequests::SetSlopeLimitDegrees, "Set Slope Limit (Degrees)")
+                    ->Event("GetMaximumSpeed", &CharacterRequests::GetMaximumSpeed, "Get Maximum Speed")
+                    ->Event("SetMaximumSpeed", &CharacterRequests::SetMaximumSpeed, "Set Maximum Speed")
+                    ->Event("GetVelocity", &CharacterRequests::GetVelocity, "Get Velocity")
+                    ->Event("AddVelocity", &CharacterRequests::AddVelocity, "Add Velocity")
                    ;
            }
        }
@@ -280,9 +280,11 @@ namespace AzToolsFramework
                }
            }

+            // Destroy the entities *before* clearing the lookup maps so that any lookups triggered during an entity's destructor
+            // are still valid.
+            m_entities.clear();
            m_instanceToTemplateEntityIdMap.clear();
            m_templateToInstanceEntityIdMap.clear();
-            m_entities.clear();
        }

        bool Instance::RegisterEntity(const AZ::EntityId& entityId, const EntityAlias& entityAlias)
@@ -157,7 +157,7 @@ namespace AzToolsFramework
                    "Prefab - EntityIdMapper: Entity with Id %s has no registered owning instance",
                    entityId.ToString().c_str());

-                return AZStd::string::format("Entity_%s", entityId.ToString().c_str());
+                return {};
            }

            Instance* owningInstance = &(owningInstanceReference->get());
@@ -70,7 +70,15 @@ namespace AzToolsFramework
                "Failed to find an owning instance for the entity with id %llu.", static_cast<AZ::u64>(entityId));
            Instance& instance = instanceReference->get();
            m_templateId = instance.GetTemplateId();
-            m_entityAlias = (instance.GetEntityAlias(entityId)).value();
+            auto aliasReference = instance.GetEntityAlias(entityId);
+            if (!aliasReference.has_value())
+            {
+                AZ_Error(
+                    "Prefab", aliasReference.has_value(), "Failed to find the entity alias for entity %s.", entityId.ToString().c_str());
+                return;
+            }
+
+            m_entityAlias = aliasReference.value();

            //generate undo/redo patches
            m_instanceToTemplateInterface->GeneratePatch(m_redoPatch, initialState, endState);
@@ -488,6 +488,13 @@ namespace AzToolsFramework
        return worldFromLocal.TransformPoint(CalculateCenterOffset(entityId, pivot));
    }

+    void EditorTransformComponentSelection::SetAllViewportUiVisible(const bool visible)
+    {
+        SetViewportUiClusterVisible(m_transformModeClusterId, visible);
+        SetViewportUiClusterVisible(m_spaceCluster.m_spaceClusterId, visible);
+        m_viewportUiVisible = visible;
+    }
+
    void EditorTransformComponentSelection::UpdateSpaceCluster(const ReferenceFrame referenceFrame)
    {
        auto buttonIdFromFrameFn = [this](const ReferenceFrame referenceFrame)
@@ -1009,6 +1016,7 @@ namespace AzToolsFramework
        ToolsApplicationNotificationBus::Handler::BusConnect();
        Camera::EditorCameraNotificationBus::Handler::BusConnect();
        ComponentModeFramework::EditorComponentModeNotificationBus::Handler::BusConnect(entityContextId);
+        EditorEntityContextNotificationBus::Handler::BusConnect();
        EditorEntityVisibilityNotificationBus::Router::BusRouterConnect();
        EditorEntityLockComponentNotificationBus::Router::BusRouterConnect();
        EditorManipulatorCommandUndoRedoRequestBus::Handler::BusConnect(entityContextId);
@@ -1037,6 +1045,7 @@ namespace AzToolsFramework
        EditorManipulatorCommandUndoRedoRequestBus::Handler::BusDisconnect();
        EditorEntityLockComponentNotificationBus::Router::BusRouterDisconnect();
        EditorEntityVisibilityNotificationBus::Router::BusRouterDisconnect();
+        EditorEntityContextNotificationBus::Handler::BusDisconnect();
        ComponentModeFramework::EditorComponentModeNotificationBus::Handler::BusDisconnect();
        Camera::EditorCameraNotificationBus::Handler::BusDisconnect();
        ToolsApplicationNotificationBus::Handler::BusDisconnect();
@@ -2387,9 +2396,7 @@ namespace AzToolsFramework
            /*ID_VIEWPORTUI_VISIBLE=*/50040, "Toggle Viewport UI", "Hide/Show Viewport UI",
            [this]()
            {
-                SetViewportUiClusterVisible(m_transformModeClusterId, !m_viewportUiVisible);
-                SetViewportUiClusterVisible(m_spaceCluster.m_spaceClusterId, !m_viewportUiVisible);
-                m_viewportUiVisible = !m_viewportUiVisible;
+                SetAllViewportUiVisible(!m_viewportUiVisible);
            });

        EditorMenuRequestBus::Broadcast(&EditorMenuRequests::RestoreEditMenuToDefault);
@@ -3560,7 +3567,7 @@ namespace AzToolsFramework

    void EditorTransformComponentSelection::EnteredComponentMode([[maybe_unused]] const AZStd::vector<AZ::Uuid>& componentModeTypes)
    {
-        SetViewportUiClusterVisible(m_transformModeClusterId, false);
+        SetAllViewportUiVisible(false);

        EditorEntityLockComponentNotificationBus::Router::BusRouterDisconnect();
        EditorEntityVisibilityNotificationBus::Router::BusRouterDisconnect();
@@ -3569,7 +3576,7 @@ namespace AzToolsFramework

    void EditorTransformComponentSelection::LeftComponentMode([[maybe_unused]] const AZStd::vector<AZ::Uuid>& componentModeTypes)
    {
-        SetViewportUiClusterVisible(m_transformModeClusterId, true);
+        SetAllViewportUiVisible(true);

        ToolsApplicationNotificationBus::Handler::BusConnect();
        EditorEntityVisibilityNotificationBus::Router::BusRouterConnect();
@@ -3625,6 +3632,16 @@ namespace AzToolsFramework
        ETCS::SetEntityLocalRotation(entityId, localRotation, m_transformChangedInternally);
    }

+    void EditorTransformComponentSelection::OnStartPlayInEditor()
+    {
+        SetAllViewportUiVisible(false);
+    }
+
+    void EditorTransformComponentSelection::OnStopPlayInEditor()
+    {
+        SetAllViewportUiVisible(true);
+    }
+
    namespace ETCS
    {
        // little raii wrapper to switch a value from true to false and back
@@ -128,6 +128,7 @@ namespace AzToolsFramework
        , private ToolsApplicationNotificationBus::Handler
        , private Camera::EditorCameraNotificationBus::Handler
        , private ComponentModeFramework::EditorComponentModeNotificationBus::Handler
+        , private EditorEntityContextNotificationBus::Handler
        , private EditorEntityVisibilityNotificationBus::Router
        , private EditorEntityLockComponentNotificationBus::Router
        , private EditorManipulatorCommandUndoRedoRequestBus::Handler
@@ -264,6 +265,10 @@ namespace AzToolsFramework
        void EnteredComponentMode(const AZStd::vector<AZ::Uuid>& componentModeTypes) override;
        void LeftComponentMode(const AZStd::vector<AZ::Uuid>& componentModeTypes) override;

+        // EditorEntityContextNotificationBus overrides ...
+        void OnStartPlayInEditor() override;
+        void OnStopPlayInEditor() override;
+
        // Helpers to safely interact with the TransformBus (requests).
        void SetEntityWorldTranslation(AZ::EntityId entityId, const AZ::Vector3& worldTranslation);
        void SetEntityLocalTranslation(AZ::EntityId entityId, const AZ::Vector3& localTranslation);
@@ -271,9 +276,12 @@ namespace AzToolsFramework
        void SetEntityLocalScale(AZ::EntityId entityId, float localScale);
        void SetEntityLocalRotation(AZ::EntityId entityId, const AZ::Vector3& localRotation);

-        // Responsible for keeping the space cluster in sync with the current reference frame.
+        //! Responsible for keeping the space cluster in sync with the current reference frame.
        void UpdateSpaceCluster(ReferenceFrame referenceFrame);

+        //! Hides/Shows all viewportUi toolbars.
+        void SetAllViewportUiVisible(bool visible);
+
        AZ::EntityId m_hoveredEntityId; //!< What EntityId is the mouse currently hovering over (if any).
        AZ::EntityId m_cachedEntityIdUnderCursor; //!< Store the EntityId on each mouse move for use in Display.
        AZ::EntityId m_editorCameraComponentEntityId; //!< The EditorCameraComponent EntityId if it is set.