merge from main

Code/Framework/AzFramework/AzFramework/Components/AzFrameworkConfigurationSystemComponent.cpp

@@ -17,7 +17,7 @@
 #include <AzCore/RTTI/BehaviorContext.h>
 #include <AzCore/Debug/Trace.h>
 #include <AzFramework/Scene/Scene.h>
-#include <AzFramework/Scene/SceneSystemBus.h>
+#include <AzFramework/Scene/SceneSystemInterface.h>
 #include <AzFramework/Entity/GameEntityContextComponent.h>
 
 namespace AzFramework
@@ -50,36 +50,34 @@ namespace AzFramework
 
     void AzFrameworkConfigurationSystemComponent::Activate()
     {
-        // Create the defaults scene and associate the GameEntityContext with it.
-        AZ::Outcome<Scene*, AZStd::string> createSceneOutcome = AZ::Failure<AZStd::string>("SceneSystemRequests bus not responding.");
-        SceneSystemRequestBus::BroadcastResult(createSceneOutcome, &AzFramework::SceneSystemRequests::CreateScene, "default");
+        AZ::Outcome<AZStd::shared_ptr<Scene>, AZStd::string> createSceneOutcome =
+            SceneSystemInterface::Get()->CreateScene(Scene::MainSceneName);
         if (createSceneOutcome)
         {
-            Scene* scene = createSceneOutcome.GetValue();
-            bool success = false;
-            EntityContextId gameEntityContextId = EntityContextId::CreateNull();
-            GameEntityContextRequestBus::BroadcastResult(gameEntityContextId, &GameEntityContextRequests::GetGameEntityContextId);
-
-            if (!gameEntityContextId.IsNull())
+            AZStd::shared_ptr<Scene> scene = createSceneOutcome.TakeValue();
+            EntityContext* gameEntityContext = nullptr;
+            GameEntityContextRequestBus::BroadcastResult(gameEntityContext, &GameEntityContextRequests::GetGameEntityContextInstance);
+            if (gameEntityContext != nullptr)
             {
-                SceneSystemRequestBus::BroadcastResult(success, &AzFramework::SceneSystemRequests::SetSceneForEntityContextId, gameEntityContextId, scene);
+                [[maybe_unused]] bool result = scene->SetSubsystem<EntityContext::SceneStorageType&>(gameEntityContext);
+                AZ_Assert(result, "Unable to register main entity context with the main scene.");
+            }
+            else
+            {
+                AZ_Assert(false, "Unable to retrieve the game entity context instance.");
             }
-            AZ_Assert(success, "The application was unable to setup a scene for the game entity context, this should always work");
         }
         else
         {
-            AZ_Assert(false, "%s", createSceneOutcome.GetError().data());
+            AZ_Assert(false, "Unable to create main scene due to: %s", createSceneOutcome.GetError().c_str());
         }
 
     }
 
     void AzFrameworkConfigurationSystemComponent::Deactivate()
     {
-        bool success = false;
-        SceneSystemRequestBus::BroadcastResult(
-            success, &AzFramework::SceneSystemRequestBus::Events::RemoveScene, "default");
-
-        AZ_Assert(success, "\"default\" scene was not removed");
+        [[maybe_unused]] bool success = SceneSystemInterface::Get()->RemoveScene(Scene::MainSceneName);
+        AZ_Assert(success, "Unable to remove the main scene.");
     }
 
     void AzFrameworkConfigurationSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)

Code/Framework/AzFramework/AzFramework/Components/AzFrameworkConfigurationSystemComponent.h

@@ -37,4 +37,4 @@ namespace AzFramework
         static void GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent);
 
     };
-} // AzFramework
+} // AzFramework

Code/Framework/AzFramework/AzFramework/Components/ConsoleBus.h

@@ -69,4 +69,4 @@ namespace AzFramework
 
 } // namespace AzFramework
 
-#endif // AZFRAMEWORK_CONSOLE_BUS_H
+#endif // AZFRAMEWORK_CONSOLE_BUS_H

Code/Framework/AzFramework/AzFramework/Components/NonUniformScaleComponent.cpp

@@ -36,28 +36,7 @@ namespace AzFramework
 
     void NonUniformScaleComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC_CE("DebugDrawObbService"));
-        incompatible.push_back(AZ_CRC_CE("DebugDrawService"));
-        incompatible.push_back(AZ_CRC_CE("EMotionFXActorService"));
-        incompatible.push_back(AZ_CRC_CE("EMotionFXSimpleMotionService"));
-        incompatible.push_back(AZ_CRC_CE("GradientTransformService"));
-        incompatible.push_back(AZ_CRC_CE("LegacyMeshService"));
-        incompatible.push_back(AZ_CRC_CE("LookAtService"));
-        incompatible.push_back(AZ_CRC_CE("SequenceService"));
-        incompatible.push_back(AZ_CRC_CE("ClothMeshService"));
-        incompatible.push_back(AZ_CRC_CE("PhysXJointService"));
-        incompatible.push_back(AZ_CRC_CE("PhysXCharacterControllerService"));
-        incompatible.push_back(AZ_CRC_CE("PhysXRagdollService"));
-        incompatible.push_back(AZ_CRC_CE("WhiteBoxService"));
-        incompatible.push_back(AZ_CRC_CE("NavigationAreaService"));
-        incompatible.push_back(AZ_CRC_CE("GeometryService"));
-        incompatible.push_back(AZ_CRC_CE("CapsuleShapeService"));
-        incompatible.push_back(AZ_CRC_CE("CompoundShapeService"));
-        incompatible.push_back(AZ_CRC_CE("CylinderShapeService"));
-        incompatible.push_back(AZ_CRC_CE("DiskShapeService"));
-        incompatible.push_back(AZ_CRC_CE("SphereShapeService"));
-        incompatible.push_back(AZ_CRC_CE("SplineService"));
-        incompatible.push_back(AZ_CRC_CE("TubeShapeService"));
+        incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
     }
 
     void NonUniformScaleComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)

Code/Framework/AzFramework/AzFramework/Components/TransformComponent.cpp

@@ -11,10 +11,12 @@
 */
 
 #include <AzFramework/Components/TransformComponent.h>
+#include <AzFramework/Visibility/EntityBoundsUnionBus.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/RTTI/BehaviorContext.h>
 #include <AzCore/Component/Entity.h>
 #include <AzCore/Component/ComponentApplicationBus.h>
+#include <AzCore/Interface/Interface.h>
 #include <AzCore/Math/Transform.h>
 #include <AzCore/Math/Quaternion.h>
 
@@ -597,9 +599,8 @@ namespace AzFramework
             parentId = handler->GetParentId();
         }
 #endif
-
-        AZ::Entity* parentEntity = nullptr;
-        EBUS_EVENT_RESULT(parentEntity, AZ::ComponentApplicationBus, FindEntity, parentEntityId);
+        AZ::ComponentApplicationRequests* componentApplication = AZ::Interface<AZ::ComponentApplicationRequests>::Get();
+        AZ::Entity* parentEntity = (componentApplication != nullptr) ? componentApplication->FindEntity(parentEntityId) : nullptr;
         AZ_Assert(parentEntity, "We expect to have a parent entity associated with the provided parent's entity Id.");
         if (parentEntity)
         {
@@ -648,8 +649,8 @@ namespace AzFramework
         m_parentId = parentId;
         if (m_parentId.IsValid())
         {
-            AZ::Entity* parentEntity = nullptr;
-            AZ::ComponentApplicationBus::BroadcastResult(parentEntity, &AZ::ComponentApplicationBus::Events::FindEntity, m_parentId);
+            AZ::ComponentApplicationRequests* componentApplication = AZ::Interface<AZ::ComponentApplicationRequests>::Get();
+            AZ::Entity* parentEntity = (componentApplication != nullptr) ? componentApplication->FindEntity(m_parentId) : nullptr;
             m_parentActive = parentEntity && (parentEntity->GetState() == AZ::Entity::State::Active);
 
             m_onNewParentKeepWorldTM = isKeepWorldTM;
@@ -736,6 +737,12 @@ namespace AzFramework
 
         EBUS_EVENT_PTR(m_notificationBus, AZ::TransformNotificationBus, OnTransformChanged, m_localTM, m_worldTM);
         m_transformChangedEvent.Signal(m_localTM, m_worldTM);
+
+        AzFramework::IEntityBoundsUnion* boundsUnion = AZ::Interface<AzFramework::IEntityBoundsUnion>::Get();
+        if (boundsUnion != nullptr)
+        {
+            boundsUnion->OnTransformUpdated(GetEntity());
+        }
     }
 
     void TransformComponent::ComputeWorldTM()
@@ -775,15 +782,15 @@ namespace AzFramework
         AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflection);
         if (serializeContext)
         {
-            serializeContext->Class<TransformComponent, AZ::Component, NetBindable>()
-                ->Version(4, &TransformComponentVersionConverter)
+            serializeContext->ClassDeprecate("NetBindable", "{80206665-D429-4703-B42E-94434F82F381}");
+
+            serializeContext->Class<TransformComponent, AZ::Component>()
+                ->Version(5, &TransformComponentVersionConverter)
                 ->Field("Parent", &TransformComponent::m_parentId)
                 ->Field("Transform", &TransformComponent::m_worldTM)
                 ->Field("LocalTransform", &TransformComponent::m_localTM)
                 ->Field("ParentActivationTransformMode", &TransformComponent::m_parentActivationTransformMode)
                 ->Field("IsStatic", &TransformComponent::m_isStatic)
-                ->Field("InterpolatePosition", &TransformComponent::m_interpolatePosition)
-                ->Field("InterpolateRotation", &TransformComponent::m_interpolateRotation)
                 ;
         }
 

Code/Framework/AzFramework/AzFramework/Components/TransformComponent.h

@@ -17,7 +17,6 @@
 #include <AzCore/Component/EntityBus.h>
 #include <AzCore/Component/TickBus.h>
 #include <AzCore/EBus/Event.h>
-#include <AzFramework/Network/NetBindable.h>
 
 namespace AzToolsFramework
 {
@@ -41,10 +40,9 @@ namespace AzFramework
         , public AZ::TransformBus::Handler
         , public AZ::TransformNotificationBus::Handler
         , private AZ::TransformHierarchyInformationBus::Handler
-        , public NetBindable
     {
     public:
-        AZ_COMPONENT(TransformComponent, AZ::TransformComponentTypeId, NetBindable, AZ::TransformInterface);
+        AZ_COMPONENT(TransformComponent, AZ::TransformComponentTypeId, AZ::TransformInterface);
 
         friend class AzToolsFramework::Components::TransformComponent;
 
@@ -208,11 +206,5 @@ namespace AzFramework
         bool m_parentActive = false; ///< Keeps track of the state of the parent entity.
         bool m_onNewParentKeepWorldTM = true; ///< If set, recompute localTM instead of worldTM when parent becomes active.
         bool m_isStatic = false; ///< If true, the transform is static and doesn't move while entity is active.
-
-        //! @deprecated
-        //! @{
-        AZ::InterpolationMode m_interpolatePosition = AZ::InterpolationMode::NoInterpolation;
-        AZ::InterpolationMode m_interpolateRotation = AZ::InterpolationMode::NoInterpolation;
-        //! @}
     };
 }   // namespace AZ