Procházet zdrojové kódy

Adjustments to ROS 2 gem interface and system components. (#852)

Signed-off-by: Michał Pełka <[email protected]>
Michał Pełka před 3 měsíci
rodič
revize
ae30741e51

+ 5 - 1
Gems/ROS2/Code/Source/Camera/ROS2CameraSystemComponent.cpp

@@ -41,7 +41,11 @@ namespace ROS2
    void ROS2SystemCameraComponent::GetRequiredServices([[maybe_unused]] AZ::ComponentDescriptor::DependencyArrayType& required)
    {
        required.push_back(AZ_CRC_CE("ROS2Service"));
-       required.push_back(AZ_CRC_CE("RPISystem"));
+   }
+
+   void ROS2SystemCameraComponent::GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent)
+   {
+       dependent.push_back(AZ_CRC_CE("RPISystem"));
    }
 
    void ROS2SystemCameraComponent::InitPassTemplateMappingsHandler()

+ 1 - 0
Gems/ROS2/Code/Source/Camera/ROS2CameraSystemComponent.h

@@ -24,6 +24,7 @@ namespace ROS2
        static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
        static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
        static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
+       static void GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent);
 
        void InitPassTemplateMappingsHandler();
 

+ 4 - 0
Gems/ROS2/Code/Source/Camera/ROS2EditorCameraSystemComponent.cpp

@@ -35,6 +35,10 @@ namespace ROS2
     {
         BaseSystemComponent::GetRequiredServices(required);
     }
+    void ROS2EditorCameraSystemComponent::GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent)
+    {
+        BaseSystemComponent::GetDependentServices(dependent);
+    }
 
     void ROS2EditorCameraSystemComponent::Activate()
     {

+ 1 - 0
Gems/ROS2/Code/Source/Camera/ROS2EditorCameraSystemComponent.h

@@ -28,6 +28,7 @@ namespace ROS2
         static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
         static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
         static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
+        static void GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent);
 
         //////////////////////////////////////////////////////////////////////////
         // Component overrides

+ 0 - 1
Gems/ROS2/Code/Source/ROS2ModuleInterface.h

@@ -74,7 +74,6 @@ namespace ROS2
                     ROS2WheelOdometryComponent::CreateDescriptor(),
                     ROS2FrameComponent::CreateDescriptor(),
                     ROS2RobotControlComponent::CreateDescriptor(),
-                    ROS2CameraSensorComponent::CreateDescriptor(),
                     ROS2ImageEncodingConversionComponent::CreateDescriptor(),
                     AckermannControlComponent::CreateDescriptor(),
                     RigidBodyTwistControlComponent::CreateDescriptor(),

+ 0 - 1
Gems/ROS2/Code/Source/SystemComponents/ROS2SystemComponent.cpp

@@ -81,7 +81,6 @@ namespace ROS2
     void ROS2SystemComponent::GetRequiredServices([[maybe_unused]] AZ::ComponentDescriptor::DependencyArrayType& required)
     {
         required.push_back(AZ_CRC("AssetDatabaseService", 0x3abf5601));
-        required.push_back(AZ_CRC("RPISystem", 0xf2add773));
     }
 
     void ROS2SystemComponent::GetDependentServices([[maybe_unused]] AZ::ComponentDescriptor::DependencyArrayType& dependent)