Simulation Interfaces Gems merge (#877)

* SimulationInterfaces and SimulationInterfacesROS2 into one gem

Signed-off-by: Norbert Prokopiuk <[email protected]>

* Namespace changes from SimulationInterfacesROS2 > ROS2SimulationInterfaces, fixed test building

Signed-off-by: Norbert Prokopiuk <[email protected]>

* Changes to make successfull release build with export-project

Signed-off-by: Norbert Prokopiuk <[email protected]>

* rebase missed change added

Signed-off-by: Norbert Prokopiuk <[email protected]>

* Disable empty client tests

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

---------

Signed-off-by: Norbert Prokopiuk <[email protected]>
Signed-off-by: Michał Pełka <[email protected]>
Co-authored-by: Michał Pełka <[email protected]>

Gems/SimulationInterfaces/Code/CMakeLists.txt

@@ -58,7 +58,7 @@ ly_add_target(
         PRIVATE
             Gem::ROS2.Static
 )
-target_depends_on_ros2_packages(${gem_name}.Private.Object simulation_interfaces)
+target_depends_on_ros2_packages(${gem_name}.Private.Object rclcpp std_msgs geometry_msgs simulation_interfaces rclcpp_action)
 
 # Here add ${gem_name} target, it depends on the Private Object library and Public API interface
 ly_add_target(
@@ -140,8 +140,10 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
                 Include
                 Source
         BUILD_DEPENDENCIES
+                
             PUBLIC
                 AZ::AzToolsFramework
+                Gem::ROS2.API
                 ${gem_name}.Private.Object
     )
 
@@ -285,6 +287,37 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
             ly_add_googletest(
                     NAME Gem::${gem_name}.TestApp
             )
+
+            ly_add_target(
+                    NAME ${gem_name}.ROS2Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
+                    NAMESPACE Gem
+                    FILES_CMAKE
+                    ros2_simulationinterfaces_tests_files.cmake
+                    INCLUDE_DIRECTORIES
+                    PRIVATE
+                    Tests
+                    Source
+                    Include
+                    BUILD_DEPENDENCIES
+                    PRIVATE
+                    AZ::AzTest
+                    AZ::AzTestShared
+                    AZ::AzToolsFramework
+                    Legacy::CryCommon
+                    Legacy::EditorCommon
+                    Legacy::Editor.Headers
+                    AZ::AzManipulatorTestFramework.Static
+                    Gem::${gem_name}.API
+                    Gem::${gem_name}.Editor.Private.Object
+                    Gem::SimulationInterfaces.API
+                    Gem::ROS2.Static
+                    Gem::${gem_name}.Editor.Private.Object
+                )
+
+                # Add ${gem_name}.Editor.Tests to googletest
+                ly_add_googletest(
+                        NAME Gem::${gem_name}.ROS2Tests
+                )
         endif()
     endif()
 endif()

Gems/SimulationInterfacesROS2/Code/Include/SimulationInterfacesROS2/SimulationInterfacesROS2RequestBus.h → Gems/SimulationInterfaces/Code/Include/SimulationInterfaces/ROS2SimulationInterfacesRequestBus.h

@@ -8,27 +8,27 @@
 
 #pragma once
 
-#include <SimulationInterfacesROS2/SimulationInterfacesROS2TypeIds.h>
+#include <SimulationInterfaces/ROS2SimulationInterfacesTypeIds.h>
 
 #include <AzCore/EBus/EBus.h>
 #include <AzCore/Interface/Interface.h>
 #include <AzCore/std/containers/unordered_set.h>
 
-namespace SimulationInterfacesROS2
+namespace ROS2SimulationInterfaces
 {
-    class SimulationInterfacesROS2Requests
+    class ROS2SimulationInterfacesRequests
     {
     public:
-        AZ_RTTI(SimulationInterfacesROS2Requests, SimulationInterfacesROS2RequestBusTypeId);
-        virtual ~SimulationInterfacesROS2Requests() = default;
+        AZ_RTTI(ROS2SimulationInterfacesRequests, ROS2SimulationInterfacesRequestBusTypeId);
+        virtual ~ROS2SimulationInterfacesRequests() = default;
 
-        //! Returns set of simulation features available in SimulationInterfacesROS2 Gem
+        //! Returns set of simulation features available in ROS2SimulationInterfaces Gem
         //! SimulationFeatures follows definition available at:
         //! @see https://github.com/ros-simulation/simulation_interfaces/blob/main/msg/SimulatorFeatures.msg
         virtual AZStd::unordered_set<AZ::u8> GetSimulationFeatures() = 0;
     };
 
-    class SimulationInterfacesROS2RequestBusTraits : public AZ::EBusTraits
+    class ROS2SimulationInterfacesRequestBusTraits : public AZ::EBusTraits
     {
     public:
         //////////////////////////////////////////////////////////////////////////
@@ -38,7 +38,7 @@ namespace SimulationInterfacesROS2
         //////////////////////////////////////////////////////////////////////////
     };
 
-    using SimulationInterfacesROS2RequestBus = AZ::EBus<SimulationInterfacesROS2Requests, SimulationInterfacesROS2RequestBusTraits>;
-    using SimulationInterfacesROS2RequestBusInterface = AZ::Interface<SimulationInterfacesROS2Requests>;
+    using ROS2SimulationInterfacesRequestBus = AZ::EBus<ROS2SimulationInterfacesRequests, ROS2SimulationInterfacesRequestBusTraits>;
+    using ROS2SimulationInterfacesRequestBusInterface = AZ::Interface<ROS2SimulationInterfacesRequests>;
 
-} // namespace SimulationInterfacesROS2
+} // namespace ROS2SimulationInterfaces

Gems/SimulationInterfacesROS2/Code/Include/SimulationInterfacesROS2/SimulationInterfacesROS2TypeIds.h → Gems/SimulationInterfaces/Code/Include/SimulationInterfaces/ROS2SimulationInterfacesTypeIds.h

@@ -8,19 +8,19 @@
 
 #pragma once
 
-namespace SimulationInterfacesROS2
+namespace ROS2SimulationInterfaces
 {
     // System Component TypeIds
-    inline constexpr const char* SimulationInterfacesROS2SystemComponentTypeId = "{9CD6E9FA-5C17-454C-B8FA-033DF572B160}";
-    inline constexpr const char* SimulationInterfacesROS2EditorSystemComponentTypeId = "{AF5BE964-4B5F-49A4-A308-0B6077E5BB26}";
+    inline constexpr const char* ROS2SimulationInterfacesSystemComponentTypeId = "{9CD6E9FA-5C17-454C-B8FA-033DF572B160}";
+    inline constexpr const char* ROS2SimulationInterfacesEditorSystemComponentTypeId = "{AF5BE964-4B5F-49A4-A308-0B6077E5BB26}";
 
     // Module derived classes TypeIds
-    inline constexpr const char* SimulationInterfacesROS2ModuleInterfaceTypeId = "{2F1ED7E1-6808-420D-939F-7D5C9CBFB3C9}";
-    inline constexpr const char* SimulationInterfacesROS2ModuleTypeId = "{4002B625-F939-44AC-845B-820B20AFC6C5}";
+    inline constexpr const char* ROS2SimulationInterfacesModuleInterfaceTypeId = "{2F1ED7E1-6808-420D-939F-7D5C9CBFB3C9}";
+    inline constexpr const char* ROS2SimulationInterfacesModuleTypeId = "{4002B625-F939-44AC-845B-820B20AFC6C5}";
     // The Editor Module by default is mutually exclusive with the Client Module
     // so they use the Same TypeId
-    inline constexpr const char* SimulationInterfacesROS2EditorModuleTypeId = SimulationInterfacesROS2ModuleTypeId;
+    inline constexpr const char* ROS2SimulationInterfacesEditorModuleTypeId = ROS2SimulationInterfacesModuleTypeId;
 
     // API TypeIds
-    inline constexpr const char* SimulationInterfacesROS2RequestBusTypeId = "{00d08870-e329-4bd7-bb8c-f67fe369de92}";
-} // namespace SimulationInterfacesROS2
+    inline constexpr const char* ROS2SimulationInterfacesRequestBusTypeId = "{00d08870-e329-4bd7-bb8c-f67fe369de92}";
+} // namespace ROS2SimulationInterfaces

Gems/SimulationInterfaces/Code/Platform/Linux/PAL_linux.cmake

@@ -5,5 +5,5 @@
 #
 
 set(PAL_TRAIT_SIMULATIONINTERFACES_SUPPORTED TRUE)
-set(PAL_TRAIT_SIMULATIONINTERFACES_TEST_SUPPORTED TRUE)
+set(PAL_TRAIT_SIMULATIONINTERFACES_TEST_SUPPORTED FALSE)
 set(PAL_TRAIT_SIMULATIONINTERFACES_EDITOR_TEST_SUPPORTED TRUE)

Gems/SimulationInterfacesROS2/Code/Source/Actions/ROS2ActionBase.h → Gems/SimulationInterfaces/Code/Source/Actions/ROS2ActionBase.h

@@ -15,7 +15,7 @@
 #include <rclcpp_action/rclcpp_action.hpp>
 #include <simulation_interfaces/msg/simulator_features.hpp>
 
-namespace SimulationInterfacesROS2
+namespace ROS2SimulationInterfaces
 {
     //! Base for each ROS 2 action server handler, forces declaration of features provided by the server
     //! combined information along all ROS 2 handlers gives information about simulation features
@@ -124,4 +124,4 @@ namespace SimulationInterfacesROS2
 
         ActionHandle m_actionHandle;
     };
-} // namespace SimulationInterfacesROS2
+} // namespace ROS2SimulationInterfaces

Gems/SimulationInterfacesROS2/Code/Source/Actions/SimulateStepsActionServerHandler.cpp → Gems/SimulationInterfaces/Code/Source/Actions/SimulateStepsActionServerHandler.cpp

@@ -8,7 +8,7 @@
 
 #include "SimulateStepsActionServerHandler.h"
 
-namespace SimulationInterfacesROS2
+namespace ROS2SimulationInterfaces
 {
 
     void SimulateStepsActionServerHandler::Initialize(rclcpp::Node::SharedPtr& node)
@@ -120,4 +120,4 @@ namespace SimulationInterfacesROS2
         PublishFeedback(feedback);
     }
 
-} // namespace SimulationInterfacesROS2
+} // namespace ROS2SimulationInterfaces

Gems/SimulationInterfacesROS2/Code/Source/Actions/SimulateStepsActionServerHandler.h → Gems/SimulationInterfaces/Code/Source/Actions/SimulateStepsActionServerHandler.h

@@ -13,7 +13,7 @@
 #include <SimulationInterfaces/SimulationMangerRequestBus.h>
 #include <simulation_interfaces/action/simulate_steps.hpp>
 
-namespace SimulationInterfacesROS2
+namespace ROS2SimulationInterfaces
 {
 
     class SimulateStepsActionServerHandler
@@ -47,4 +47,4 @@ namespace SimulationInterfacesROS2
         bool m_isCancelled{ false };
     };
 
-} // namespace SimulationInterfacesROS2
+} // namespace ROS2SimulationInterfaces

Gems/SimulationInterfacesROS2/Code/Source/Clients/SimulationInterfacesROS2SystemComponent.cpp → Gems/SimulationInterfaces/Code/Source/Clients/ROS2SimulationInterfacesSystemComponent.cpp

@@ -6,20 +6,20 @@
  *
  */
 
-#include "SimulationInterfacesROS2SystemComponent.h"
+#include "ROS2SimulationInterfacesSystemComponent.h"
 
 #include <Actions/SimulateStepsActionServerHandler.h>
 #include <AzCore/std/string/string.h>
 #include <Services/ROS2ServiceBase.h>
-#include <SimulationInterfacesROS2/SimulationInterfacesROS2RequestBus.h>
+#include <SimulationInterfaces/ROS2SimulationInterfacesRequestBus.h>
 
 #include <ROS2/ROS2Bus.h>
-#include <SimulationInterfacesROS2/SimulationInterfacesROS2TypeIds.h>
+#include <SimulationInterfaces/ROS2SimulationInterfacesTypeIds.h>
 
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/std/smart_ptr/make_shared.h>
 
-namespace SimulationInterfacesROS2
+namespace ROS2SimulationInterfaces
 {
 
     namespace
@@ -36,44 +36,44 @@ namespace SimulationInterfacesROS2
     } // namespace
 
     AZ_COMPONENT_IMPL(
-        SimulationInterfacesROS2SystemComponent, "SimulationInterfacesROS2SystemComponent", SimulationInterfacesROS2SystemComponentTypeId);
+        ROS2SimulationInterfacesSystemComponent, "ROS2SimulationInterfacesSystemComponent", ROS2SimulationInterfacesSystemComponentTypeId);
 
-    void SimulationInterfacesROS2SystemComponent::Reflect(AZ::ReflectContext* context)
+    void ROS2SimulationInterfacesSystemComponent::Reflect(AZ::ReflectContext* context)
     {
         if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
         {
-            serializeContext->Class<SimulationInterfacesROS2SystemComponent, AZ::Component>()->Version(0);
+            serializeContext->Class<ROS2SimulationInterfacesSystemComponent, AZ::Component>()->Version(0);
         }
     }
 
-    void SimulationInterfacesROS2SystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
+    void ROS2SimulationInterfacesSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC_CE("SimulationInterfacesROS2Service"));
+        provided.push_back(AZ_CRC_CE("ROS2SimulationInterfacesService"));
     }
 
-    void SimulationInterfacesROS2SystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
+    void ROS2SimulationInterfacesSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC_CE("SimulationInterfacesROS2Service"));
+        incompatible.push_back(AZ_CRC_CE("ROS2SimulationInterfacesService"));
     }
 
-    void SimulationInterfacesROS2SystemComponent::GetRequiredServices(
+    void ROS2SimulationInterfacesSystemComponent::GetRequiredServices(
         [[maybe_unused]] AZ::ComponentDescriptor::DependencyArrayType& required)
     {
         required.push_back(AZ_CRC_CE("ROS2Service"));
     }
 
-    void SimulationInterfacesROS2SystemComponent::GetDependentServices(
+    void ROS2SimulationInterfacesSystemComponent::GetDependentServices(
         [[maybe_unused]] AZ::ComponentDescriptor::DependencyArrayType& dependent)
     {
     }
 
-    void SimulationInterfacesROS2SystemComponent::Init()
+    void ROS2SimulationInterfacesSystemComponent::Init()
     {
     }
 
-    void SimulationInterfacesROS2SystemComponent::Activate()
+    void ROS2SimulationInterfacesSystemComponent::Activate()
     {
-        SimulationInterfacesROS2RequestBus::Handler::BusConnect();
+        ROS2SimulationInterfacesRequestBus::Handler::BusConnect();
 
         rclcpp::Node::SharedPtr ros2Node = rclcpp::Node::SharedPtr(ROS2::ROS2Interface::Get()->GetNode());
         AZ_Assert(ros2Node, "ROS2 node is not available.");
@@ -93,9 +93,9 @@ namespace SimulationInterfacesROS2
         RegisterInterface<StepSimulationServiceHandler>(m_availableRos2Interface, ros2Node);
     }
 
-    void SimulationInterfacesROS2SystemComponent::Deactivate()
+    void ROS2SimulationInterfacesSystemComponent::Deactivate()
     {
-        SimulationInterfacesROS2RequestBus::Handler::BusDisconnect();
+        ROS2SimulationInterfacesRequestBus::Handler::BusDisconnect();
 
         for (auto& [handlerType, handler] : m_availableRos2Interface)
         {
@@ -103,7 +103,7 @@ namespace SimulationInterfacesROS2
         }
     }
 
-    AZStd::unordered_set<AZ::u8> SimulationInterfacesROS2SystemComponent::GetSimulationFeatures()
+    AZStd::unordered_set<AZ::u8> ROS2SimulationInterfacesSystemComponent::GetSimulationFeatures()
     {
         AZStd::unordered_set<AZ::u8> result;
         for (auto& [handlerType, handler] : m_availableRos2Interface)
@@ -114,4 +114,4 @@ namespace SimulationInterfacesROS2
         return result;
     }
 
-} // namespace SimulationInterfacesROS2
+} // namespace ROS2SimulationInterfaces

Gems/SimulationInterfacesROS2/Code/Source/Clients/SimulationInterfacesROS2SystemComponent.h → Gems/SimulationInterfaces/Code/Source/Clients/ROS2SimulationInterfacesSystemComponent.h

@@ -24,20 +24,20 @@
 #include "Services/SetSimulationStateServiceHandler.h"
 #include "Services/SpawnEntityServiceHandler.h"
 #include "Services/StepSimulationServiceHandler.h"
-#include "SimulationInterfacesROS2/SimulationInterfacesROS2RequestBus.h"
+#include "SimulationInterfaces/ROS2SimulationInterfacesRequestBus.h"
 #include <AzCore/std/containers/unordered_map.h>
 #include <AzCore/std/optional.h>
 #include <AzCore/std/smart_ptr/shared_ptr.h>
 #include <AzCore/std/string/string.h>
 
-namespace SimulationInterfacesROS2
+namespace ROS2SimulationInterfaces
 {
-    class SimulationInterfacesROS2SystemComponent
+    class ROS2SimulationInterfacesSystemComponent
         : public AZ::Component
-        , public SimulationInterfacesROS2RequestBus::Handler
+        , public ROS2SimulationInterfacesRequestBus::Handler
     {
     public:
-        AZ_COMPONENT_DECL(SimulationInterfacesROS2SystemComponent);
+        AZ_COMPONENT_DECL(ROS2SimulationInterfacesSystemComponent);
 
         static void Reflect(AZ::ReflectContext* context);
 
@@ -46,8 +46,8 @@ namespace SimulationInterfacesROS2
         static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
         static void GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent);
 
-        SimulationInterfacesROS2SystemComponent() = default;
-        ~SimulationInterfacesROS2SystemComponent() = default;
+        ROS2SimulationInterfacesSystemComponent() = default;
+        ~ROS2SimulationInterfacesSystemComponent() = default;
 
     protected:
         // AZ::Component interface implementation
@@ -55,11 +55,11 @@ namespace SimulationInterfacesROS2
         void Activate() override;
         void Deactivate() override;
 
-        // SimulationInterfacesROS2RequestBus override
+        // ROS2SimulationInterfacesRequestBus override
         AZStd::unordered_set<AZ::u8> GetSimulationFeatures() override;
 
     private:
         AZStd::unordered_map<AZStd::string, AZStd::shared_ptr<IROS2HandlerBase>> m_availableRos2Interface;
     };
 
-} // namespace SimulationInterfacesROS2
+} // namespace ROS2SimulationInterfaces

Gems/SimulationInterfaces/Code/Source/Clients/SimulationEntitiesManager.h

@@ -60,7 +60,6 @@ namespace SimulationInterfaces
 
     private:
 
-
         //! Registers simulated entity to entity id mapping.
         //! Note that the entityId will be registered under unique name.
         //! \param entityId The entity id to register

Gems/SimulationInterfaces/Code/Source/Clients/SimulationInterfacesModule.cpp

@@ -20,8 +20,4 @@ namespace SimulationInterfaces
     };
 } // namespace SimulationInterfaces
 
-#if defined(O3DE_GEM_NAME)
-AZ_DECLARE_MODULE_CLASS(AZ_JOIN(Gem_, O3DE_GEM_NAME), SimulationInterfaces::SimulationInterfacesModule)
-#else
 AZ_DECLARE_MODULE_CLASS(Gem_SimulationInterfaces, SimulationInterfaces::SimulationInterfacesModule)
-#endif

Gems/SimulationInterfaces/Code/Source/Clients/SimulationManager.cpp

@@ -100,7 +100,7 @@ namespace SimulationInterfaces
                                                       simulation_interfaces::msg::SimulatorFeatures::STEP_SIMULATION_MULTIPLE,
                                                       simulation_interfaces::msg::SimulatorFeatures::STEP_SIMULATION_ACTION,
                                                       simulation_interfaces::msg::SimulatorFeatures::SIMULATION_STATE_SETTING,
-                                                      simulation_interfaces::msg::SimulatorFeatures::SIMULATION_STATE_GETTING});
+                                                      simulation_interfaces::msg::SimulatorFeatures::SIMULATION_STATE_GETTING });
         AZ::SystemTickBus::QueueFunction(
             [this]()
             {
@@ -148,7 +148,7 @@ namespace SimulationInterfaces
         auto* physicsSystem = AZ::Interface<AzPhysics::SystemInterface>::Get();
         AZ_Assert(physicsSystem, "Physics system is not available");
         const auto& sceneHandlers = physicsSystem->GetAllScenes();
-        auto* sceneInterface = AZ::Interface<AzPhysics::SceneInterface>::Get();
+        [[maybe_unused]] auto* sceneInterface = AZ::Interface<AzPhysics::SceneInterface>::Get();
         AZ_Assert(sceneInterface, "Physics scene interface is not available");
         for (auto& scene : sceneHandlers)
         {
@@ -183,7 +183,7 @@ namespace SimulationInterfaces
             });
 
         // get default scene
-        auto* physicsSystem = AZ::Interface<AzPhysics::SystemInterface>::Get();
+        [[maybe_unused]] auto* physicsSystem = AZ::Interface<AzPhysics::SystemInterface>::Get();
         AZ_Assert(physicsSystem, "Physics system is not available");
         auto* sceneInterface = AZ::Interface<AzPhysics::SceneInterface>::Get();
         AZ_Assert(sceneInterface, "Physics scene interface is not available");

Gems/SimulationInterfacesROS2/Code/Source/Interfaces/IROS2HandlerBase.h → Gems/SimulationInterfaces/Code/Source/Interfaces/IROS2HandlerBase.h

@@ -11,7 +11,7 @@
 #include <AzCore/std/string/string_view.h>
 #include <rclcpp/rclcpp.hpp>
 
-namespace SimulationInterfacesROS2
+namespace ROS2SimulationInterfaces
 {
     // common interface to store all simulation feature ros2  handlers in common container
     class IROS2HandlerBase
@@ -23,4 +23,4 @@ namespace SimulationInterfacesROS2
         virtual AZStd::string_view GetDefaultName() const = 0;
         virtual void Initialize(rclcpp::Node::SharedPtr& node) = 0;
     };
-} // namespace SimulationInterfacesROS2
+} // namespace ROS2SimulationInterfaces

Gems/SimulationInterfacesROS2/Code/Source/Services/DeleteEntityServiceHandler.cpp → Gems/SimulationInterfaces/Code/Source/Services/DeleteEntityServiceHandler.cpp

@@ -10,7 +10,7 @@
 #include <AzCore/std/string/string.h>
 #include <SimulationInterfaces/SimulationEntityManagerRequestBus.h>
 
-namespace SimulationInterfacesROS2
+namespace ROS2SimulationInterfaces
 {
 
     AZStd::unordered_set<AZ::u8> DeleteEntityServiceHandler::GetProvidedFeatures()
@@ -43,4 +43,4 @@ namespace SimulationInterfacesROS2
             });
         return AZStd::nullopt;
     }
-} // namespace SimulationInterfacesROS2
+} // namespace ROS2SimulationInterfaces

Gems/SimulationInterfacesROS2/Code/Source/Services/DeleteEntityServiceHandler.h → Gems/SimulationInterfaces/Code/Source/Services/DeleteEntityServiceHandler.h

@@ -12,7 +12,7 @@
 #include <AzCore/std/string/string_view.h>
 #include <simulation_interfaces/srv/delete_entity.hpp>
 
-namespace SimulationInterfacesROS2
+namespace ROS2SimulationInterfaces
 {
 
     class DeleteEntityServiceHandler : public ROS2ServiceBase<simulation_interfaces::srv::DeleteEntity>
@@ -34,4 +34,4 @@ namespace SimulationInterfacesROS2
     private:
     };
 
-} // namespace SimulationInterfacesROS2
+} // namespace ROS2SimulationInterfaces

Gems/SimulationInterfacesROS2/Code/Source/Services/GetEntitiesServiceHandler.cpp → Gems/SimulationInterfaces/Code/Source/Services/GetEntitiesServiceHandler.cpp

@@ -11,7 +11,7 @@
 #include <SimulationInterfaces/SimulationEntityManagerRequestBus.h>
 #include <Utils/Utils.h>
 
-namespace SimulationInterfacesROS2
+namespace ROS2SimulationInterfaces
 {
     AZStd::unordered_set<AZ::u8> GetEntitiesServiceHandler::GetProvidedFeatures()
     {
@@ -61,4 +61,4 @@ namespace SimulationInterfacesROS2
 
         return response;
     }
-} // namespace SimulationInterfacesROS2
+} // namespace ROS2SimulationInterfaces

Gems/SimulationInterfacesROS2/Code/Source/Services/GetEntitiesServiceHandler.h → Gems/SimulationInterfaces/Code/Source/Services/GetEntitiesServiceHandler.h

@@ -12,7 +12,7 @@
 #include <AzCore/std/string/string_view.h>
 #include <simulation_interfaces/srv/get_entities.hpp>
 
-namespace SimulationInterfacesROS2
+namespace ROS2SimulationInterfaces
 {
     class GetEntitiesServiceHandler : public ROS2ServiceBase<simulation_interfaces::srv::GetEntities>
     {
@@ -33,4 +33,4 @@ namespace SimulationInterfacesROS2
     private:
     };
 
-} // namespace SimulationInterfacesROS2
+} // namespace ROS2SimulationInterfaces

Gems/SimulationInterfacesROS2/Code/Source/Services/GetEntitiesStatesServiceHandler.cpp → Gems/SimulationInterfaces/Code/Source/Services/GetEntitiesStatesServiceHandler.cpp

@@ -12,7 +12,7 @@
 #include <SimulationInterfaces/SimulationEntityManagerRequestBus.h>
 #include <Utils/Utils.h>
 
-namespace SimulationInterfacesROS2
+namespace ROS2SimulationInterfaces
 {
     AZStd::unordered_set<AZ::u8> GetEntitiesStatesServiceHandler::GetProvidedFeatures()
     {
@@ -82,4 +82,4 @@ namespace SimulationInterfacesROS2
 
         return response;
     }
-} // namespace SimulationInterfacesROS2
+} // namespace ROS2SimulationInterfaces

Gems/SimulationInterfacesROS2/Code/Source/Services/GetEntitiesStatesServiceHandler.h → Gems/SimulationInterfaces/Code/Source/Services/GetEntitiesStatesServiceHandler.h

@@ -12,7 +12,7 @@
 #include <AzCore/std/string/string_view.h>
 #include <simulation_interfaces/srv/get_entities_states.hpp>
 
-namespace SimulationInterfacesROS2
+namespace ROS2SimulationInterfaces
 {
 
     class GetEntitiesStatesServiceHandler : public ROS2ServiceBase<simulation_interfaces::srv::GetEntitiesStates>
@@ -34,4 +34,4 @@ namespace SimulationInterfacesROS2
     private:
     };
 
-} // namespace SimulationInterfacesROS2
+} // namespace ROS2SimulationInterfaces

Gems/SimulationInterfacesROS2/Code/Source/Services/GetEntityStateServiceHandler.cpp → Gems/SimulationInterfaces/Code/Source/Services/GetEntityStateServiceHandler.cpp

@@ -11,7 +11,7 @@
 #include <ROS2/Utilities/ROS2Conversions.h>
 #include <SimulationInterfaces/SimulationEntityManagerRequestBus.h>
 
-namespace SimulationInterfacesROS2
+namespace ROS2SimulationInterfaces
 {
 
     AZStd::unordered_set<AZ::u8> GetEntityStateServiceHandler::GetProvidedFeatures()
@@ -51,4 +51,4 @@ namespace SimulationInterfacesROS2
         return response;
     }
 
-} // namespace SimulationInterfacesROS2
+} // namespace ROS2SimulationInterfaces

Gems/SimulationInterfacesROS2/Code/Source/Services/GetEntityStateServiceHandler.h → Gems/SimulationInterfaces/Code/Source/Services/GetEntityStateServiceHandler.h

@@ -12,7 +12,7 @@
 #include <AzCore/std/string/string_view.h>
 #include <simulation_interfaces/srv/get_entity_state.hpp>
 
-namespace SimulationInterfacesROS2
+namespace ROS2SimulationInterfaces
 {
 
     class GetEntityStateServiceHandler : public ROS2ServiceBase<simulation_interfaces::srv::GetEntityState>
@@ -33,4 +33,4 @@ namespace SimulationInterfacesROS2
 
     private:
     };
-} // namespace SimulationInterfacesROS2
+} // namespace ROS2SimulationInterfaces

Gems/SimulationInterfacesROS2/Code/Source/Services/GetSimulationFeaturesServiceHandler.cpp → Gems/SimulationInterfaces/Code/Source/Services/GetSimulationFeaturesServiceHandler.cpp

@@ -10,9 +10,9 @@
 #include <AzCore/base.h>
 #include <AzCore/std/containers/unordered_set.h>
 #include <SimulationInterfaces/SimulationFeaturesAggregatorRequestBus.h>
-#include <SimulationInterfacesROS2/SimulationInterfacesROS2RequestBus.h>
+#include <SimulationInterfaces/ROS2SimulationInterfacesRequestBus.h>
 
-namespace SimulationInterfacesROS2
+namespace ROS2SimulationInterfaces
 {
 
     AZStd::unordered_set<AZ::u8> GetSimulationFeaturesServiceHandler::GetProvidedFeatures()
@@ -24,9 +24,9 @@ namespace SimulationInterfacesROS2
     AZStd::optional<GetSimulationFeaturesServiceHandler::Response> GetSimulationFeaturesServiceHandler::HandleServiceRequest(
         const std::shared_ptr<rmw_request_id_t> header, const Request& request)
     {
-        // call bus to get simulation features in SimulationInterfacesROS2 Gem side
+        // call bus to get simulation features in ROS2SimulationInterfaces Gem side
         AZStd::unordered_set<AZ::u8> ros2Interfaces;
-        SimulationInterfacesROS2RequestBus::BroadcastResult(ros2Interfaces, &SimulationInterfacesROS2Requests::GetSimulationFeatures);
+        ROS2SimulationInterfacesRequestBus::BroadcastResult(ros2Interfaces, &ROS2SimulationInterfacesRequests::GetSimulationFeatures);
         // call bus to get simulation features on SimulationInterfaces Gem  side
         AZStd::unordered_set<SimulationInterfaces::SimulationFeatures> o3deInterfaces;
         SimulationInterfaces::SimulationFeaturesAggregatorRequestBus::BroadcastResult(
@@ -48,4 +48,4 @@ namespace SimulationInterfacesROS2
 
         return response;
     }
-} // namespace SimulationInterfacesROS2
+} // namespace ROS2SimulationInterfaces

Gems/SimulationInterfacesROS2/Code/Source/Services/GetSimulationFeaturesServiceHandler.h → Gems/SimulationInterfaces/Code/Source/Services/GetSimulationFeaturesServiceHandler.h

@@ -12,7 +12,7 @@
 #include <AzCore/std/string/string_view.h>
 #include <simulation_interfaces/srv/get_simulator_features.hpp>
 
-namespace SimulationInterfacesROS2
+namespace ROS2SimulationInterfaces
 {
 
     class GetSimulationFeaturesServiceHandler : public ROS2ServiceBase<simulation_interfaces::srv::GetSimulatorFeatures>
@@ -34,4 +34,4 @@ namespace SimulationInterfacesROS2
     private:
     };
 
-} // namespace SimulationInterfacesROS2
+} // namespace ROS2SimulationInterfaces

Gems/SimulationInterfacesROS2/Code/Source/Services/GetSimulationStateServiceHandler.cpp → Gems/SimulationInterfaces/Code/Source/Services/GetSimulationStateServiceHandler.cpp

@@ -11,7 +11,7 @@
 #include <simulation_interfaces/msg/result.hpp>
 #include <simulation_interfaces/msg/simulation_state.hpp>
 
-namespace SimulationInterfacesROS2
+namespace ROS2SimulationInterfaces
 {
     AZStd::unordered_set<AZ::u8> GetSimulationStateServiceHandler::GetProvidedFeatures()
     {
@@ -29,4 +29,4 @@ namespace SimulationInterfacesROS2
         response.state.state = currentState;
         return response;
     }
-} // namespace SimulationInterfacesROS2
+} // namespace ROS2SimulationInterfaces

Gems/SimulationInterfacesROS2/Code/Source/Services/GetSimulationStateServiceHandler.h → Gems/SimulationInterfaces/Code/Source/Services/GetSimulationStateServiceHandler.h

@@ -13,7 +13,7 @@
 #include <rclcpp/rclcpp.hpp>
 #include <simulation_interfaces/srv/get_simulation_state.hpp>
 
-namespace SimulationInterfacesROS2
+namespace ROS2SimulationInterfaces
 {
 
     class GetSimulationStateServiceHandler : public ROS2ServiceBase<simulation_interfaces::srv::GetSimulationState>
@@ -33,4 +33,4 @@ namespace SimulationInterfacesROS2
         AZStd::optional<Response> HandleServiceRequest(const std::shared_ptr<rmw_request_id_t> header, const Request& request) override;
     };
 
-} // namespace SimulationInterfacesROS2
+} // namespace ROS2SimulationInterfaces

Gems/SimulationInterfacesROS2/Code/Source/Services/GetSpawnablesServiceHandler.cpp → Gems/SimulationInterfaces/Code/Source/Services/GetSpawnablesServiceHandler.cpp

@@ -9,7 +9,7 @@
 #include "GetSpawnablesServiceHandler.h"
 #include <SimulationInterfaces/SimulationEntityManagerRequestBus.h>
 
-namespace SimulationInterfacesROS2
+namespace ROS2SimulationInterfaces
 {
 
     AZStd::unordered_set<AZ::u8> GetSpawnablesServiceHandler::GetProvidedFeatures()
@@ -51,4 +51,4 @@ namespace SimulationInterfacesROS2
 
         return response;
     }
-} // namespace SimulationInterfacesROS2
+} // namespace ROS2SimulationInterfaces

Gems/SimulationInterfacesROS2/Code/Source/Services/GetSpawnablesServiceHandler.h → Gems/SimulationInterfaces/Code/Source/Services/GetSpawnablesServiceHandler.h

@@ -12,7 +12,7 @@
 #include <AzCore/std/string/string_view.h>
 #include <simulation_interfaces/srv/get_spawnables.hpp>
 
-namespace SimulationInterfacesROS2
+namespace ROS2SimulationInterfaces
 {
 
     class GetSpawnablesServiceHandler : public ROS2ServiceBase<simulation_interfaces::srv::GetSpawnables>
@@ -34,4 +34,4 @@ namespace SimulationInterfacesROS2
     private:
     };
 
-} // namespace SimulationInterfacesROS2
+} // namespace ROS2SimulationInterfaces

Gems/SimulationInterfacesROS2/Code/Source/Services/ROS2ServiceBase.h → Gems/SimulationInterfaces/Code/Source/Services/ROS2ServiceBase.h

@@ -16,7 +16,7 @@
 #include <rclcpp/service.hpp>
 #include <simulation_interfaces/msg/simulator_features.hpp>
 
-namespace SimulationInterfacesROS2
+namespace ROS2SimulationInterfaces
 {
     //! Base for each ROS 2 service handler, forces declaration of features provided by the handler
     //! combined information along all ROS 2 handlers gives information about simulation features
@@ -89,4 +89,4 @@ namespace SimulationInterfacesROS2
         ServiceHandle m_serviceHandle;
     };
 
-} // namespace SimulationInterfacesROS2
+} // namespace ROS2SimulationInterfaces

Gems/SimulationInterfacesROS2/Code/Source/Services/ResetSimulationServiceHandler.cpp → Gems/SimulationInterfaces/Code/Source/Services/ResetSimulationServiceHandler.cpp

@@ -16,7 +16,7 @@
 #include <ROS2/ROS2Bus.h>
 #include <AzCore/Component/ComponentApplicationBus.h>
 
-namespace SimulationInterfacesROS2
+namespace ROS2SimulationInterfaces
 {
 
     AZStd::unordered_set<AZ::u8> ResetSimulationServiceHandler::GetProvidedFeatures()
@@ -114,4 +114,4 @@ namespace SimulationInterfacesROS2
         }
         return AZStd::nullopt;
     }
-} // namespace SimulationInterfacesROS2
+} // namespace ROS2SimulationInterfaces

Gems/SimulationInterfacesROS2/Code/Source/Services/ResetSimulationServiceHandler.h → Gems/SimulationInterfaces/Code/Source/Services/ResetSimulationServiceHandler.h

@@ -13,7 +13,7 @@
 #include <rclcpp/rclcpp.hpp>
 #include <simulation_interfaces/srv/reset_simulation.hpp>
 
-namespace SimulationInterfacesROS2
+namespace ROS2SimulationInterfaces
 {
     class ResetSimulationServiceHandler : public ROS2ServiceBase<simulation_interfaces::srv::ResetSimulation>
     {
@@ -32,4 +32,4 @@ namespace SimulationInterfacesROS2
         AZStd::optional<Response> HandleServiceRequest(const std::shared_ptr<rmw_request_id_t> header, const Request& request) override;
     };
 
-} // namespace SimulationInterfacesROS2
+} // namespace ROS2SimulationInterfaces

Gems/SimulationInterfacesROS2/Code/Source/Services/SetEntityStateServiceHandler.cpp → Gems/SimulationInterfaces/Code/Source/Services/SetEntityStateServiceHandler.cpp

@@ -10,7 +10,7 @@
 #include <ROS2/Utilities/ROS2Conversions.h>
 #include <SimulationInterfaces/SimulationEntityManagerRequestBus.h>
 
-namespace SimulationInterfacesROS2
+namespace ROS2SimulationInterfaces
 {
 
     AZStd::unordered_set<AZ::u8> SetEntityStateServiceHandler::GetProvidedFeatures()
@@ -42,4 +42,4 @@ namespace SimulationInterfacesROS2
 
         return response;
     }
-} // namespace SimulationInterfacesROS2
+} // namespace ROS2SimulationInterfaces

Gems/SimulationInterfacesROS2/Code/Source/Services/SetEntityStateServiceHandler.h → Gems/SimulationInterfaces/Code/Source/Services/SetEntityStateServiceHandler.h

@@ -12,7 +12,7 @@
 #include <AzCore/std/string/string_view.h>
 #include <simulation_interfaces/srv/set_entity_state.hpp>
 
-namespace SimulationInterfacesROS2
+namespace ROS2SimulationInterfaces
 {
 
     class SetEntityStateServiceHandler : public ROS2ServiceBase<simulation_interfaces::srv::SetEntityState>
@@ -34,4 +34,4 @@ namespace SimulationInterfacesROS2
     private:
     };
 
-} // namespace SimulationInterfacesROS2
+} // namespace ROS2SimulationInterfaces

Gems/SimulationInterfacesROS2/Code/Source/Services/SetSimulationStateServiceHandler.cpp → Gems/SimulationInterfaces/Code/Source/Services/SetSimulationStateServiceHandler.cpp

@@ -11,7 +11,7 @@
 #include <simulation_interfaces/msg/result.hpp>
 #include <simulation_interfaces/msg/simulation_state.hpp>
 
-namespace SimulationInterfacesROS2
+namespace ROS2SimulationInterfaces
 {
     AZStd::unordered_set<AZ::u8> SetSimulationStateServiceHandler::GetProvidedFeatures()
     {
@@ -38,4 +38,4 @@ namespace SimulationInterfacesROS2
         }
         return response;
     }
-} // namespace SimulationInterfacesROS2
+} // namespace ROS2SimulationInterfaces

Gems/SimulationInterfacesROS2/Code/Source/Services/SetSimulationStateServiceHandler.h → Gems/SimulationInterfaces/Code/Source/Services/SetSimulationStateServiceHandler.h

@@ -13,7 +13,7 @@
 #include <rclcpp/rclcpp.hpp>
 #include <simulation_interfaces/srv/set_simulation_state.hpp>
 
-namespace SimulationInterfacesROS2
+namespace ROS2SimulationInterfaces
 {
 
     class SetSimulationStateServiceHandler : public ROS2ServiceBase<simulation_interfaces::srv::SetSimulationState>
@@ -33,4 +33,4 @@ namespace SimulationInterfacesROS2
         AZStd::optional<Response> HandleServiceRequest(const std::shared_ptr<rmw_request_id_t> header, const Request& request) override;
     };
 
-} // namespace SimulationInterfacesROS2
+} // namespace ROS2SimulationInterfaces

Gems/SimulationInterfacesROS2/Code/Source/Services/SpawnEntityServiceHandler.cpp → Gems/SimulationInterfaces/Code/Source/Services/SpawnEntityServiceHandler.cpp

@@ -12,7 +12,7 @@
 #include <ROS2/Utilities/ROS2Conversions.h>
 #include <SimulationInterfaces/SimulationEntityManagerRequestBus.h>
 
-namespace SimulationInterfacesROS2
+namespace ROS2SimulationInterfaces
 {
 
     AZStd::unordered_set<AZ::u8> SpawnEntityServiceHandler::GetProvidedFeatures()
@@ -86,4 +86,4 @@ namespace SimulationInterfacesROS2
         return AZStd::regex_match(frameName, frameRegex);
     }
 
-} // namespace SimulationInterfacesROS2
+} // namespace ROS2SimulationInterfaces

Gems/SimulationInterfacesROS2/Code/Source/Services/SpawnEntityServiceHandler.h → Gems/SimulationInterfaces/Code/Source/Services/SpawnEntityServiceHandler.h

@@ -12,7 +12,7 @@
 #include <AzCore/std/string/string_view.h>
 #include <simulation_interfaces/srv/spawn_entity.hpp>
 #include <AzCore/std/string/regex.h>
-namespace SimulationInterfacesROS2
+namespace ROS2SimulationInterfaces
 {
     class SpawnEntityServiceHandler : public ROS2ServiceBase<simulation_interfaces::srv::SpawnEntity>
     {
@@ -37,4 +37,4 @@ namespace SimulationInterfacesROS2
 
     };
 
-} // namespace SimulationInterfacesROS2
+} // namespace ROS2SimulationInterfaces

Gems/SimulationInterfacesROS2/Code/Source/Services/StepSimulationServiceHandler.cpp → Gems/SimulationInterfaces/Code/Source/Services/StepSimulationServiceHandler.cpp

@@ -11,7 +11,7 @@
 #include <SimulationInterfaces/SimulationEntityManagerRequestBus.h>
 #include <SimulationInterfaces/SimulationMangerRequestBus.h>
 
-namespace SimulationInterfacesROS2
+namespace ROS2SimulationInterfaces
 {
 
     AZStd::unordered_set<AZ::u8> StepSimulationServiceHandler::GetProvidedFeatures()
@@ -53,4 +53,4 @@ namespace SimulationInterfacesROS2
             AZ::TickBus::Handler::BusDisconnect();
         }
     }
-} // namespace SimulationInterfacesROS2
+} // namespace ROS2SimulationInterfaces

Gems/SimulationInterfacesROS2/Code/Source/Services/StepSimulationServiceHandler.h → Gems/SimulationInterfaces/Code/Source/Services/StepSimulationServiceHandler.h

@@ -12,7 +12,7 @@
 #include <AzCore/std/string/string_view.h>
 #include <simulation_interfaces/srv/step_simulation.hpp>
 #include <AzCore/Component/TickBus.h>
-namespace SimulationInterfacesROS2
+namespace ROS2SimulationInterfaces
 {
 
     class StepSimulationServiceHandler
@@ -38,4 +38,4 @@ namespace SimulationInterfacesROS2
         void OnTick(float deltaTime, AZ::ScriptTimePoint time) override;
     };
 
-} // namespace SimulationInterfacesROS2
+} // namespace ROS2SimulationInterfaces

Gems/SimulationInterfaces/Code/Source/SimulationInterfacesModuleInterface.cpp

@@ -14,6 +14,7 @@
 #include "Clients/SimulationFeaturesAggregator.h"
 #include "Clients/SimulationManager.h"
 #include <Clients/SimulationEntitiesManager.h>
+#include <Clients/ROS2SimulationInterfacesSystemComponent.h>
 
 namespace SimulationInterfaces
 {
@@ -30,6 +31,7 @@ namespace SimulationInterfaces
                 SimulationEntitiesManager::CreateDescriptor(),
                 SimulationManager::CreateDescriptor(),
                 SimulationFeaturesAggregator::CreateDescriptor(),
+                ROS2SimulationInterfaces::ROS2SimulationInterfacesSystemComponent::CreateDescriptor(),
             });
     }
 
@@ -39,6 +41,7 @@ namespace SimulationInterfaces
             azrtti_typeid<SimulationEntitiesManager>(),
             azrtti_typeid<SimulationManager>(),
             azrtti_typeid<SimulationFeaturesAggregator>(),
+            azrtti_typeid<ROS2SimulationInterfaces::ROS2SimulationInterfacesSystemComponent>(),
         };
     }
 } // namespace SimulationInterfaces

Gems/SimulationInterfacesROS2/Code/Source/Tools/SimulationInterfacesROS2EditorSystemComponent.cpp → Gems/SimulationInterfaces/Code/Source/Tools/ROS2SimulationInterfacesEditorSystemComponent.cpp

@@ -6,82 +6,82 @@
  *
  */
 
-#include "SimulationInterfacesROS2EditorSystemComponent.h"
+#include "ROS2SimulationInterfacesEditorSystemComponent.h"
 #include <AzCore/Serialization/SerializeContext.h>
 
-#include <SimulationInterfacesROS2/SimulationInterfacesROS2TypeIds.h>
+#include <SimulationInterfaces/ROS2SimulationInterfacesTypeIds.h>
 
-namespace SimulationInterfacesROS2
+namespace ROS2SimulationInterfaces
 {
     AZ_COMPONENT_IMPL(
-        SimulationInterfacesROS2EditorSystemComponent,
-        "SimulationInterfacesROS2EditorSystemComponent",
-        SimulationInterfacesROS2EditorSystemComponentTypeId,
+        ROS2SimulationInterfacesEditorSystemComponent,
+        "ROS2SimulationInterfacesEditorSystemComponent",
+        ROS2SimulationInterfacesEditorSystemComponentTypeId,
         BaseSystemComponent);
 
-    void SimulationInterfacesROS2EditorSystemComponent::Reflect(AZ::ReflectContext* context)
+    void ROS2SimulationInterfacesEditorSystemComponent::Reflect(AZ::ReflectContext* context)
     {
         if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
         {
-            serializeContext->Class<SimulationInterfacesROS2EditorSystemComponent, SimulationInterfacesROS2SystemComponent>()->Version(0);
+            serializeContext->Class<ROS2SimulationInterfacesEditorSystemComponent, ROS2SimulationInterfacesSystemComponent>()->Version(0);
         }
     }
 
-    SimulationInterfacesROS2EditorSystemComponent::SimulationInterfacesROS2EditorSystemComponent()
+    ROS2SimulationInterfacesEditorSystemComponent::ROS2SimulationInterfacesEditorSystemComponent()
         : m_nodeHandler(
               [this](std::shared_ptr<rclcpp::Node> node)
               {
                   if (!m_systemComponentActivated)
                   {
-                      SimulationInterfacesROS2SystemComponent::Activate();
+                      ROS2SimulationInterfacesSystemComponent::Activate();
                       m_systemComponentActivated = true;
                   }
                   else
                   {
-                      SimulationInterfacesROS2SystemComponent::Deactivate();
+                      ROS2SimulationInterfacesSystemComponent::Deactivate();
                       m_systemComponentActivated = false;
                   }
               })
     {
     }
 
-    SimulationInterfacesROS2EditorSystemComponent::~SimulationInterfacesROS2EditorSystemComponent() = default;
+    ROS2SimulationInterfacesEditorSystemComponent::~ROS2SimulationInterfacesEditorSystemComponent() = default;
 
-    void SimulationInterfacesROS2EditorSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
+    void ROS2SimulationInterfacesEditorSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
         BaseSystemComponent::GetProvidedServices(provided);
-        provided.push_back(AZ_CRC_CE("SimulationInterfacesROS2EditorService"));
+        provided.push_back(AZ_CRC_CE("ROS2SimulationInterfacesEditorService"));
     }
 
-    void SimulationInterfacesROS2EditorSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
+    void ROS2SimulationInterfacesEditorSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
         BaseSystemComponent::GetIncompatibleServices(incompatible);
-        incompatible.push_back(AZ_CRC_CE("SimulationInterfacesROS2EditorService"));
+        incompatible.push_back(AZ_CRC_CE("ROS2SimulationInterfacesEditorService"));
     }
 
-    void SimulationInterfacesROS2EditorSystemComponent::GetRequiredServices(
+    void ROS2SimulationInterfacesEditorSystemComponent::GetRequiredServices(
         [[maybe_unused]] AZ::ComponentDescriptor::DependencyArrayType& required)
     {
         BaseSystemComponent::GetRequiredServices(required);
         required.push_back(AZ_CRC_CE("ROS2EditorService"));
     }
 
-    void SimulationInterfacesROS2EditorSystemComponent::GetDependentServices(
+    void ROS2SimulationInterfacesEditorSystemComponent::GetDependentServices(
         [[maybe_unused]] AZ::ComponentDescriptor::DependencyArrayType& dependent)
     {
         BaseSystemComponent::GetDependentServices(dependent);
     }
 
-    void SimulationInterfacesROS2EditorSystemComponent::Activate()
+    void ROS2SimulationInterfacesEditorSystemComponent::Activate()
     {
         AzToolsFramework::EditorEvents::Bus::Handler::BusConnect();
         ROS2::ROS2Interface::Get()->ConnectOnNodeChanged(m_nodeHandler);
     }
 
-    void SimulationInterfacesROS2EditorSystemComponent::Deactivate()
+    void ROS2SimulationInterfacesEditorSystemComponent::Deactivate()
     {
         m_nodeHandler.Disconnect();
         AzToolsFramework::EditorEvents::Bus::Handler::BusDisconnect();
     }
 
-} // namespace SimulationInterfacesROS2
+} // namespace ROS2SimulationInterfaces

Gems/SimulationInterfacesROS2/Code/Source/Tools/SimulationInterfacesROS2EditorSystemComponent.h → Gems/SimulationInterfaces/Code/Source/Tools/ROS2SimulationInterfacesEditorSystemComponent.h

@@ -11,25 +11,25 @@
 #include <AzToolsFramework/API/ToolsApplicationAPI.h>
 
 #include <AzToolsFramework/Entity/EditorEntityContextBus.h>
-#include <Clients/SimulationInterfacesROS2SystemComponent.h>
+#include <Clients/ROS2SimulationInterfacesSystemComponent.h>
 #include <ROS2/ROS2Bus.h>
 
-namespace SimulationInterfacesROS2
+namespace ROS2SimulationInterfaces
 {
-    /// System component for SimulationInterfacesROS2 editor
-    class SimulationInterfacesROS2EditorSystemComponent
-        : public SimulationInterfacesROS2SystemComponent
+    /// System component for ROS2SimulationInterfaces editor
+    class ROS2SimulationInterfacesEditorSystemComponent
+        : public ROS2SimulationInterfacesSystemComponent
         , protected AzToolsFramework::EditorEvents::Bus::Handler
     {
-        using BaseSystemComponent = SimulationInterfacesROS2SystemComponent;
+        using BaseSystemComponent = ROS2SimulationInterfacesSystemComponent;
 
     public:
-        AZ_COMPONENT_DECL(SimulationInterfacesROS2EditorSystemComponent);
+        AZ_COMPONENT_DECL(ROS2SimulationInterfacesEditorSystemComponent);
 
         static void Reflect(AZ::ReflectContext* context);
 
-        SimulationInterfacesROS2EditorSystemComponent();
-        ~SimulationInterfacesROS2EditorSystemComponent();
+        ROS2SimulationInterfacesEditorSystemComponent();
+        ~ROS2SimulationInterfacesEditorSystemComponent();
 
     private:
         static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
@@ -44,4 +44,4 @@ namespace SimulationInterfacesROS2
         bool m_systemComponentActivated = false;
         ROS2::ROS2Requests::NodeChangedEvent::Handler m_nodeHandler;
     };
-} // namespace SimulationInterfacesROS2
+} // namespace ROS2SimulationInterfaces

Gems/SimulationInterfaces/Code/Source/Tools/SimulationInterfacesEditorModule.cpp

@@ -6,6 +6,7 @@
  *
  */
 
+#include "ROS2SimulationInterfacesEditorSystemComponent.h"
 #include "SimulationEntitiesManagerEditor.h"
 #include "SimulationFeaturesAggregatorEditor.h"
 #include "SimulationManagerEditor.h"
@@ -27,6 +28,7 @@ namespace SimulationInterfaces
                     SimulationEntitiesManagerEditor::CreateDescriptor(),
                     SimulationManagerEditor::CreateDescriptor(),
                     SimulationFeaturesAggregatorEditor::CreateDescriptor(),
+                    ROS2SimulationInterfaces::ROS2SimulationInterfacesEditorSystemComponent::CreateDescriptor(),
                 });
         }
 
@@ -39,13 +41,10 @@ namespace SimulationInterfaces
             return AZ::ComponentTypeList{
                 azrtti_typeid<SimulationEntitiesManagerEditor>(),
                 azrtti_typeid<SimulationFeaturesAggregatorEditor>(),
+                azrtti_typeid<ROS2SimulationInterfaces::ROS2SimulationInterfacesEditorSystemComponent>(),
             };
         }
     };
 } // namespace SimulationInterfaces
 
-#if defined(O3DE_GEM_NAME)
-AZ_DECLARE_MODULE_CLASS(AZ_JOIN(Gem_, O3DE_GEM_NAME, _Editor), SimulationInterfaces::SimulationInterfacesEditorModule)
-#else
 AZ_DECLARE_MODULE_CLASS(Gem_SimulationInterfaces_Editor, SimulationInterfaces::SimulationInterfacesEditorModule)
-#endif

Gems/SimulationInterfacesROS2/Code/Source/Utils/RegistryUtils.cpp → Gems/SimulationInterfaces/Code/Source/Utils/RegistryUtils.cpp

@@ -10,7 +10,7 @@
 #include <AzCore/IO/Path/Path.h>
 #include <AzCore/Settings/SettingsRegistry.h>
 
-namespace SimulationInterfacesROS2::RegistryUtilities
+namespace ROS2SimulationInterfaces::RegistryUtilities
 {
     AZStd::string GetName(AZStd::string serviceType)
     {
@@ -21,4 +21,4 @@ namespace SimulationInterfacesROS2::RegistryUtilities
         settingsRegistry->Get(output, setRegPath.String());
         return output;
     }
-} // namespace SimulationInterfacesROS2::RegistryUtilities
+} // namespace ROS2SimulationInterfaces::RegistryUtilities

Gems/SimulationInterfacesROS2/Code/Source/Utils/RegistryUtils.h → Gems/SimulationInterfaces/Code/Source/Utils/RegistryUtils.h

@@ -9,12 +9,12 @@
 
 #include <AzCore/std/string/string.h>
 
-namespace SimulationInterfacesROS2::RegistryUtilities
+namespace ROS2SimulationInterfaces::RegistryUtilities
 {
     // prefix for settings registry related to ros2 topics names
-    inline constexpr const char* RegistryPrefix = "/SimulationInterfacesROS2";
+    inline constexpr const char* RegistryPrefix = "/ROS2SimulationInterfaces";
 
     //! Gets name of the service with defined type form settings registry
     //! @return string with service name, if setting registry doesn't exits returns empty string
     [[nodiscard]] AZStd::string GetName(AZStd::string serviceType);
-} // namespace SimulationInterfacesROS2::RegistryUtilities
+} // namespace ROS2SimulationInterfaces::RegistryUtilities

Gems/SimulationInterfacesROS2/Code/Source/Utils/Utils.h → Gems/SimulationInterfaces/Code/Source/Utils/Utils.h

@@ -13,7 +13,7 @@
 #include <SimulationInterfaces/SimulationEntityManagerRequestBus.h>
 #include <simulation_interfaces/msg/bounds.hpp>
 
-namespace SimulationInterfacesROS2::Utils
+namespace ROS2SimulationInterfaces::Utils
 {
     template<typename RequestType>
     AZ::Outcome<SimulationInterfaces::EntityFilters, AZStd::string> GetEntityFiltersFromRequest(const RequestType& request)
@@ -59,4 +59,4 @@ namespace SimulationInterfacesROS2::Utils
         }
         return AZ::Success(AZStd::move(filter));
     }
-} // namespace SimulationInterfacesROS2::Utils
+} // namespace ROS2SimulationInterfaces::Utils

Gems/SimulationInterfaces/Code/Tests/Clients/ROS2SimulationInterfacesTest.cpp

@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+ 
+#include <AzTest/AzTest.h>
+
+AZ_UNIT_TEST_HOOK(DEFAULT_UNIT_TEST_ENV);

Gems/SimulationInterfacesROS2/Code/Tests/Tools/InterfacesTest.cpp → Gems/SimulationInterfaces/Code/Tests/Tools/InterfacesTest.cpp

@@ -23,7 +23,7 @@
 #include <AzToolsFramework/ToolsComponents/TransformComponent.h>
 #include <AzToolsFramework/UnitTest/ToolsTestApplication.h>
 
-#include "Clients/SimulationInterfacesROS2SystemComponent.h"
+#include "Clients/ROS2SimulationInterfacesSystemComponent.h"
 #include "Mocks/SimulationEntityManagerMock.h"
 #include "Mocks/SimulationFeaturesAggregatorRequestsHandlerMock.h"
 #include "Mocks/SimulationManagerMock.h"
@@ -57,13 +57,13 @@ namespace UnitTest
 
     void SimulationInterfaceROS2TestEnvironment::AddGemsAndComponents()
     {
-        using namespace SimulationInterfacesROS2;
+        using namespace ROS2SimulationInterfaces;
         AddActiveGems(AZStd::to_array<AZStd::string_view>({ "ROS2" }));
         AddDynamicModulePaths({ "ROS2" });
         AddComponentDescriptors(AZStd::initializer_list<AZ::ComponentDescriptor*>{
-            SimulationInterfacesROS2SystemComponent::CreateDescriptor(),
+            ROS2SimulationInterfacesSystemComponent::CreateDescriptor(),
         });
-        AddRequiredComponents(AZStd::to_array<AZ::TypeId const>({ SimulationInterfacesROS2SystemComponent::TYPEINFO_Uuid() }));
+        AddRequiredComponents(AZStd::to_array<AZ::TypeId const>({ ROS2SimulationInterfacesSystemComponent::TYPEINFO_Uuid() }));
     }
 
     AZ::ComponentApplication* SimulationInterfaceROS2TestEnvironment::CreateApplicationInstance()

Gems/SimulationInterfacesROS2/Code/simulationinterfacesros2_editor_tests_files.cmake → Gems/SimulationInterfaces/Code/ros2_simulationinterfaces_tests_files.cmake

@@ -1,3 +1,8 @@
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
 
 set(FILES
     Tests/Tools/Mocks/SimulationManagerMock.h

Gems/SimulationInterfaces/Code/simulationinterfaces_api_files.cmake

@@ -11,4 +11,5 @@ set(FILES
     Include/SimulationInterfaces/SimulationInterfacesTypeIds.h
     Include/SimulationInterfaces/SimulationMangerRequestBus.h
     Include/SimulationInterfaces/SimulationFeaturesAggregatorRequestBus.h
+    Include/SimulationInterfaces/ROS2SimulationInterfacesTypeIds.h
 )

Gems/SimulationInterfaces/Code/simulationinterfaces_editor_private_files.cmake

@@ -11,4 +11,6 @@ set(FILES
         Source/Tools/SimulationEntitiesManagerEditor.h
         Source/Tools/SimulationFeaturesAggregatorEditor.cpp
         Source/Tools/SimulationFeaturesAggregatorEditor.h
+        Source/Tools/ROS2SimulationInterfacesEditorSystemComponent.cpp
+        Source/Tools/ROS2SimulationInterfacesEditorSystemComponent.h
 )

Gems/SimulationInterfaces/Code/simulationinterfaces_private_files.cmake

@@ -15,4 +15,42 @@ set(FILES
     Source/Clients/CommonUtilities.h
     Source/Clients/SimulationFeaturesAggregator.cpp
     Source/Clients/SimulationFeaturesAggregator.h
+    Source/Clients/ROS2SimulationInterfacesSystemComponent.cpp
+    Source/Clients/ROS2SimulationInterfacesSystemComponent.h
+    Source/Interfaces/IROS2HandlerBase.h
+    Source/Actions/SimulateStepsActionServerHandler.cpp
+    Source/Actions/SimulateStepsActionServerHandler.h
+    Source/Actions/ROS2ActionBase.h
+    Source/Services/ROS2ServiceBase.h
+    Source/Services/GetEntitiesServiceHandler.cpp
+    Source/Services/GetEntitiesServiceHandler.h
+    Source/Services/DeleteEntityServiceHandler.cpp
+    Source/Services/DeleteEntityServiceHandler.h
+    Source/Services/GetEntitiesServiceHandler.cpp
+    Source/Services/GetEntitiesServiceHandler.h
+    Source/Services/GetEntitiesStatesServiceHandler.cpp
+    Source/Services/GetEntitiesStatesServiceHandler.h
+    Source/Services/GetEntityStateServiceHandler.cpp
+    Source/Services/GetEntityStateServiceHandler.h
+    Source/Services/DeleteEntityServiceHandler.cpp
+    Source/Services/DeleteEntityServiceHandler.h
+    Source/Services/SetEntityStateServiceHandler.cpp
+    Source/Services/SetEntityStateServiceHandler.h
+    Source/Services/GetSpawnablesServiceHandler.cpp
+    Source/Services/GetSpawnablesServiceHandler.h
+    Source/Services/SpawnEntityServiceHandler.cpp
+    Source/Services/SpawnEntityServiceHandler.h
+    Source/Services/ResetSimulationServiceHandler.cpp
+    Source/Services/ResetSimulationServiceHandler.h
+    Source/Services/GetSimulationFeaturesServiceHandler.cpp
+    Source/Services/GetSimulationFeaturesServiceHandler.h
+    Source/Services/SetSimulationStateServiceHandler.cpp
+    Source/Services/SetSimulationStateServiceHandler.h
+    Source/Services/GetSimulationStateServiceHandler.cpp
+    Source/Services/GetSimulationStateServiceHandler.h
+    Source/Services/StepSimulationServiceHandler.cpp
+    Source/Services/StepSimulationServiceHandler.h
+    Source/Utils/RegistryUtils.cpp
+    Source/Utils/RegistryUtils.h
+    Source/Utils/Utils.h
 )

Gems/SimulationInterfacesROS2/.clang-format

@@ -1,61 +0,0 @@
-Language: Cpp
-
-AccessModifierOffset: -4
-AlignAfterOpenBracket: AlwaysBreak
-AlignConsecutiveAssignments: false
-AlignConsecutiveDeclarations: false
-AlignEscapedNewlines: Right
-AlignOperands: false
-AlignTrailingComments: false
-AllowAllArgumentsOnNextLine: true
-AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortFunctionsOnASingleLine: None
-AllowShortLambdasOnASingleLine: None
-AlwaysBreakAfterReturnType: None
-AlwaysBreakTemplateDeclarations: true
-BinPackArguments: false
-BinPackParameters: false
-BreakBeforeBraces: Custom
-BraceWrapping:
-    AfterClass: true
-    AfterControlStatement: true
-    AfterEnum: true
-    AfterFunction: true
-    AfterNamespace: true
-    BeforeLambdaBody: true
-    AfterStruct: true
-    BeforeElse: true
-    SplitEmptyFunction: true
-BreakBeforeTernaryOperators: true
-BreakConstructorInitializers: BeforeComma
-BreakInheritanceList: BeforeComma
-ColumnLimit: 140
-ConstructorInitializerIndentWidth: 4
-ContinuationIndentWidth: 4
-Cpp11BracedListStyle: false
-FixNamespaceComments: true
-IncludeBlocks: Preserve
-IndentCaseBlocks: true
-IndentCaseLabels: false
-IndentPPDirectives: None
-IndentWidth: 4
-KeepEmptyLinesAtTheStartOfBlocks: false
-MaxEmptyLinesToKeep: 1
-NamespaceIndentation: All
-PenaltyReturnTypeOnItsOwnLine: 1000
-PointerAlignment: Left
-SortIncludes: true
-SpaceAfterLogicalNot: false
-SpaceAfterTemplateKeyword: false
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeCpp11BracedList: false
-SpaceBeforeCtorInitializerColon: true
-SpaceBeforeInheritanceColon: true
-SpaceBeforeParens: ControlStatements
-SpaceBeforeRangeBasedForLoopColon: true
-SpaceInEmptyParentheses: false
-SpacesInAngles: false
-SpacesInCStyleCastParentheses: false
-SpacesInParentheses: false
-Standard: c++17
-UseTab: Never

Gems/SimulationInterfacesROS2/CMakeLists.txt

@@ -1,6 +0,0 @@
-
-o3de_gem_setup("SimulationInterfacesROS2")
-
-ly_add_external_target_path(${CMAKE_CURRENT_SOURCE_DIR}/3rdParty)
-
-add_subdirectory(Code)

Gems/SimulationInterfacesROS2/Code/CMakeLists.txt

@@ -1,262 +0,0 @@
-
-# Currently we are in the Code folder: ${CMAKE_CURRENT_LIST_DIR}
-# Get the platform specific folder ${pal_dir} for the current folder: ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME}
-# Note: o3de_pal_dir will take care of the details for us, as this may be a restricted platform
-#       in which case it will see if that platform is present here or in the restricted folder.
-#       i.e. It could here in our gem : Gems/SimulationInterfacesROS2/Code/Platform/<platorm_name>  or
-#            <restricted_folder>/<platform_name>/Gems/SimulationInterfacesROS2/Code
-o3de_pal_dir(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME} "${gem_restricted_path}" "${gem_path}" "${gem_parent_relative_path}")
-
-# Now that we have the platform abstraction layer (PAL) folder for this folder, thats where we will find the
-# traits for this platform. Traits for a platform are defines for things like whether or not something in this gem
-# is supported by this platform.
-include(${pal_dir}/PAL_${PAL_PLATFORM_NAME_LOWERCASE}.cmake)
-
-# Check to see if building the Gem Modules are supported for the current platform
-if(NOT PAL_TRAIT_SIMULATIONINTERFACESROS2_SUPPORTED)
-    return()
-endif()
-
-# The ${gem_name}.API target declares the common interface that users of this gem should depend on in their targets
-ly_add_target(
-    NAME ${gem_name}.API INTERFACE
-    NAMESPACE Gem
-    FILES_CMAKE
-        simulationinterfacesros2_api_files.cmake
-        ${pal_dir}/simulationinterfacesros2_api_files.cmake
-    INCLUDE_DIRECTORIES
-        INTERFACE
-            Include
-    BUILD_DEPENDENCIES
-        INTERFACE
-           AZ::AzCore
-           Gem::SimulationInterfaces.API
-)
-
-# The ${gem_name}.Private.Object target is an internal target
-# It should not be used outside of this Gems CMakeLists.txt
-ly_add_target(
-    NAME ${gem_name}.Private.Object STATIC
-    NAMESPACE Gem
-    FILES_CMAKE
-        simulationinterfacesros2_private_files.cmake
-        ${pal_dir}/simulationinterfacesros2_private_files.cmake
-    TARGET_PROPERTIES
-        O3DE_PRIVATE_TARGET TRUE
-    INCLUDE_DIRECTORIES
-        PRIVATE
-            Include
-            Source
-    BUILD_DEPENDENCIES
-        PRIVATE
-            Gem::SimulationInterfaces.API
-            Gem::ROS2.Static
-        PUBLIC
-            AZ::AzCore
-            AZ::AzFramework
-)
-
-target_depends_on_ros2_packages(${gem_name}.Private.Object rclcpp std_msgs geometry_msgs simulation_interfaces rclcpp_action)
-
-# Here add ${gem_name} target, it depends on the Private Object library and Public API interface
-ly_add_target(
-    NAME ${gem_name} ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
-    NAMESPACE Gem
-    FILES_CMAKE
-        simulationinterfacesros2_shared_files.cmake
-        ${pal_dir}/simulationinterfacesros2_shared_files.cmake
-    INCLUDE_DIRECTORIES
-        PUBLIC
-            Include
-        PRIVATE
-            Source
-    BUILD_DEPENDENCIES
-        PUBLIC
-            Gem::${gem_name}.API
-        PRIVATE
-            Gem::${gem_name}.Private.Object
-)
-
-# Include the gem name into the Client Module source file
-# for use with the AZ_DECLARE_MODULE_CLASS macro
-# This is to allow renaming of the gem to also cause
-# the CreateModuleClass_Gem_<gem-name> function which
-# is used to bootstrap the gem in monolithic builds to link to the new gem name
-ly_add_source_properties(
-SOURCES
-    Source/Clients/SimulationInterfacesROS2Module.cpp
-PROPERTY COMPILE_DEFINITIONS
-    VALUES
-        O3DE_GEM_NAME=${gem_name}
-        O3DE_GEM_VERSION=${gem_version})
-
-# By default, we will specify that the above target ${gem_name} would be used by
-# Client and Server type targets when this gem is enabled.  If you don't want it
-# active in Clients or Servers by default, delete one of both of the following lines:
-ly_create_alias(NAME ${gem_name}.Clients NAMESPACE Gem TARGETS Gem::${gem_name})
-ly_create_alias(NAME ${gem_name}.Servers NAMESPACE Gem TARGETS Gem::${gem_name})
-ly_create_alias(NAME ${gem_name}.Unified NAMESPACE Gem TARGETS Gem::${gem_name})
-
-# For the Client and Server variants of ${gem_name} Gem, an alias to the ${gem_name}.API target will be made
-ly_create_alias(NAME ${gem_name}.Clients.API NAMESPACE Gem TARGETS Gem::${gem_name}.API)
-ly_create_alias(NAME ${gem_name}.Servers.API NAMESPACE Gem TARGETS Gem::${gem_name}.API)
-ly_create_alias(NAME ${gem_name}.Unified.API NAMESPACE Gem TARGETS Gem::${gem_name}.API)
-
-# Add in CMake dependencies for each gem dependency listed in this gem's gem.json file
-# for the Clients, Servers, Unified gem variants
-o3de_add_variant_dependencies_for_gem_dependencies(GEM_NAME ${gem_name} VARIANTS Clients Servers Unified)
-
-# If we are on a host platform, we want to add the host tools targets like the ${gem_name}.Editor MODULE target
-if(PAL_TRAIT_BUILD_HOST_TOOLS)
-    # The ${gem_name}.Editor.API target can be used by other gems that want to interact with the ${gem_name}.Editor module
-    ly_add_target(
-        NAME ${gem_name}.Editor.API INTERFACE
-        NAMESPACE Gem
-        FILES_CMAKE
-            simulationinterfacesros2_editor_api_files.cmake
-            ${pal_dir}/simulationinterfacesros2_editor_api_files.cmake
-        INCLUDE_DIRECTORIES
-            INTERFACE
-                Include
-        BUILD_DEPENDENCIES
-            INTERFACE
-                AZ::AzToolsFramework
-    )
-
-    # The ${gem_name}.Editor.Private.Object target is an internal target
-    # which is only to be used by this gems CMakeLists.txt and any subdirectories
-    # Other gems should not use this target
-    ly_add_target(
-        NAME ${gem_name}.Editor.Private.Object STATIC
-        NAMESPACE Gem
-        FILES_CMAKE
-            simulationinterfacesros2_editor_private_files.cmake
-        TARGET_PROPERTIES
-            O3DE_PRIVATE_TARGET TRUE
-        INCLUDE_DIRECTORIES
-            PRIVATE
-                Include
-                Source
-        BUILD_DEPENDENCIES
-            PUBLIC
-                AZ::AzToolsFramework
-                Gem::ROS2.API
-                ${gem_name}.Private.Object
-    )
-
-    ly_add_target(
-        NAME ${gem_name}.Editor GEM_MODULE
-        NAMESPACE Gem
-        AUTOMOC
-        FILES_CMAKE
-            simulationinterfacesros2_editor_shared_files.cmake
-        INCLUDE_DIRECTORIES
-            PRIVATE
-                Source
-            PUBLIC
-                Include
-        BUILD_DEPENDENCIES
-            PUBLIC
-                Gem::${gem_name}.Editor.API
-            PRIVATE
-                Gem::${gem_name}.Editor.Private.Object
-    )
-
-    # Include the gem name into the Editor Module source file
-    # for use with the AZ_DECLARE_MODULE_CLASS macro
-    # This is to allow renaming of the gem to also cause
-    # the CreateModuleClass_Gem_<gem-name> function which
-    # is used to bootstrap the gem in monolithic builds to link to the new gem name
-    ly_add_source_properties(
-    SOURCES
-        Source/Tools/SimulationInterfacesROS2EditorModule.cpp
-    PROPERTY COMPILE_DEFINITIONS
-        VALUES
-            O3DE_GEM_NAME=${gem_name}
-            O3DE_GEM_VERSION=${gem_version})
-
-    # By default, we will specify that the above target ${gem_name} would be used by
-    # Tool and Builder type targets when this gem is enabled.  If you don't want it
-    # active in Tools or Builders by default, delete one of both of the following lines:
-    ly_create_alias(NAME ${gem_name}.Tools    NAMESPACE Gem TARGETS Gem::${gem_name}.Editor)
-    ly_create_alias(NAME ${gem_name}.Builders NAMESPACE Gem TARGETS Gem::${gem_name}.Editor)
-
-    # For the Tools and Builders variants of ${gem_name} Gem, an alias to the ${gem_name}.Editor API target will be made
-    ly_create_alias(NAME ${gem_name}.Tools.API NAMESPACE Gem TARGETS Gem::${gem_name}.Editor.API)
-    ly_create_alias(NAME ${gem_name}.Builders.API NAMESPACE Gem TARGETS Gem::${gem_name}.Editor.API)
-
-    # Add in CMake dependencies for each gem dependency listed in this gem's gem.json file
-    # for the Tools and Builders gem variants
-    o3de_add_variant_dependencies_for_gem_dependencies(GEM_NAME ${gem_name} VARIANTS Tools Builders)
-endif()
-
-################################################################################
-# Tests
-################################################################################
-# See if globally, tests are supported
-if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
-    # We globally support tests, see if we support tests on this platform for ${gem_name}.Tests
-    if(PAL_TRAIT_SIMULATIONINTERFACESROS2_TEST_SUPPORTED)
-        # We support ${gem_name}.Tests on this platform, add dependency on the Private Object target
-        ly_add_target(
-            NAME ${gem_name}.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
-            NAMESPACE Gem
-            FILES_CMAKE
-                simulationinterfacesros2_tests_files.cmake
-            INCLUDE_DIRECTORIES
-                PRIVATE
-                    Tests
-                    Source
-                    Include
-            BUILD_DEPENDENCIES
-                PRIVATE
-                    AZ::AzTest
-                    AZ::AzFramework
-                    Gem::${gem_name}.Private.Object
-        )
-
-        # Add ${gem_name}.Tests to googletest
-        ly_add_googletest(
-            NAME Gem::${gem_name}.Tests
-        )
-    endif()
-
-    # If we are a host platform we want to add tools test like editor tests here
-    if(PAL_TRAIT_BUILD_HOST_TOOLS)
-        # We are a host platform, see if Editor tests are supported on this platform
-        if(PAL_TRAIT_SIMULATIONINTERFACESROS2_EDITOR_TEST_SUPPORTED)
-            # We support ${gem_name}.Editor.Tests on this platform, add ${gem_name}.Editor.Tests target which depends on
-            # private ${gem_name}.Editor.Private.Object target
-            ly_add_target(
-                NAME ${gem_name}.Editor.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
-                NAMESPACE Gem
-                FILES_CMAKE
-                    simulationinterfacesros2_editor_tests_files.cmake
-                INCLUDE_DIRECTORIES
-                    PRIVATE
-                        Tests
-                        Source
-                        Include
-                BUILD_DEPENDENCIES
-                    PRIVATE
-                        AZ::AzTest
-                        AZ::AzTestShared
-                        AZ::AzToolsFramework
-                        Legacy::CryCommon
-                        Legacy::EditorCommon
-                        Legacy::Editor.Headers
-                        AZ::AzManipulatorTestFramework.Static
-                        Gem::${gem_name}.API
-                        Gem::${gem_name}.Editor.Private.Object
-                        Gem::SimulationInterfaces.API
-                        Gem::ROS2.Static
-                        Gem::${gem_name}.Editor.Private.Object
-            )
-
-            # Add ${gem_name}.Editor.Tests to googletest
-            ly_add_googletest(
-                NAME Gem::${gem_name}.Editor.Tests
-            )
-        endif()
-    endif()
-endif()

Gems/SimulationInterfacesROS2/Code/Platform/Android/PAL_android.cmake

@@ -1,4 +0,0 @@
-
-set(PAL_TRAIT_SIMULATIONINTERFACESROS2_SUPPORTED TRUE)
-set(PAL_TRAIT_SIMULATIONINTERFACESROS2_TEST_SUPPORTED FALSE)
-set(PAL_TRAIT_SIMULATIONINTERFACESROS2_EDITOR_TEST_SUPPORTED FALSE)

Gems/SimulationInterfacesROS2/Code/Platform/Android/simulationinterfacesros2_api_files.cmake

@@ -1,3 +0,0 @@
-
-set(FILES
-)

Gems/SimulationInterfacesROS2/Code/Platform/Android/simulationinterfacesros2_private_files.cmake

@@ -1,8 +0,0 @@
-
-# Platform specific files for Android
-# i.e. ../Source/Android/SimulationInterfacesROS2Android.cpp
-#      ../Source/Android/SimulationInterfacesROS2Android.h
-#      ../Include/Android/SimulationInterfacesROS2Android.h
-
-set(FILES
-)

Gems/SimulationInterfacesROS2/Code/Platform/Android/simulationinterfacesros2_shared_files.cmake

@@ -1,8 +0,0 @@
-
-# Platform specific files for Android
-# i.e. ../Source/Android/SimulationInterfacesROS2Android.cpp
-#      ../Source/Android/SimulationInterfacesROS2Android.h
-#      ../Include/Android/SimulationInterfacesROS2Android.h
-
-set(FILES
-)

Gems/SimulationInterfacesROS2/Code/Platform/Linux/PAL_linux.cmake

@@ -1,4 +0,0 @@
-
-set(PAL_TRAIT_SIMULATIONINTERFACESROS2_SUPPORTED TRUE)
-set(PAL_TRAIT_SIMULATIONINTERFACESROS2_TEST_SUPPORTED FALSE)
-set(PAL_TRAIT_SIMULATIONINTERFACESROS2_EDITOR_TEST_SUPPORTED TRUE)

Gems/SimulationInterfacesROS2/Code/Platform/Linux/simulationinterfacesros2_api_files.cmake

@@ -1,3 +0,0 @@
-
-set(FILES
-)

Gems/SimulationInterfacesROS2/Code/Platform/Linux/simulationinterfacesros2_editor_api_files.cmake

@@ -1,3 +0,0 @@
-
-set(FILES
-)

Gems/SimulationInterfacesROS2/Code/Platform/Linux/simulationinterfacesros2_private_files.cmake

@@ -1,8 +0,0 @@
-
-# Platform specific files for Linux
-# i.e. ../Source/Linux/SimulationInterfacesROS2Linux.cpp
-#      ../Source/Linux/SimulationInterfacesROS2Linux.h
-#      ../Include/Linux/SimulationInterfacesROS2Linux.h
-
-set(FILES
-)

Gems/SimulationInterfacesROS2/Code/Platform/Linux/simulationinterfacesros2_shared_files.cmake

@@ -1,8 +0,0 @@
-
-# Platform specific files for Linux
-# i.e. ../Source/Linux/SimulationInterfacesROS2Linux.cpp
-#      ../Source/Linux/SimulationInterfacesROS2Linux.h
-#      ../Include/Linux/SimulationInterfacesROS2Linux.h
-
-set(FILES
-)

Gems/SimulationInterfacesROS2/Code/Platform/Mac/PAL_mac.cmake

@@ -1,4 +0,0 @@
-
-set(PAL_TRAIT_SIMULATIONINTERFACESROS2_SUPPORTED TRUE)
-set(PAL_TRAIT_SIMULATIONINTERFACESROS2_TEST_SUPPORTED FALSE)
-set(PAL_TRAIT_SIMULATIONINTERFACESROS2_EDITOR_TEST_SUPPORTED FALSE)

Gems/SimulationInterfacesROS2/Code/Platform/Mac/simulationinterfacesros2_api_files.cmake

@@ -1,3 +0,0 @@
-
-set(FILES
-)

Gems/SimulationInterfacesROS2/Code/Platform/Mac/simulationinterfacesros2_editor_api_files.cmake

@@ -1,3 +0,0 @@
-
-set(FILES
-)

Gems/SimulationInterfacesROS2/Code/Platform/Mac/simulationinterfacesros2_private_files.cmake

@@ -1,8 +0,0 @@
-
-# Platform specific files for Mac
-# i.e. ../Source/Mac/SimulationInterfacesROS2Mac.cpp
-#      ../Source/Mac/SimulationInterfacesROS2Mac.h
-#      ../Include/Mac/SimulationInterfacesROS2Mac.h
-
-set(FILES
-)

Gems/SimulationInterfacesROS2/Code/Platform/Mac/simulationinterfacesros2_shared_files.cmake

@@ -1,8 +0,0 @@
-
-# Platform specific files for Mac
-# i.e. ../Source/Mac/SimulationInterfacesROS2Mac.cpp
-#      ../Source/Mac/SimulationInterfacesROS2Mac.h
-#      ../Include/Mac/SimulationInterfacesROS2Mac.h
-
-set(FILES
-)

Gems/SimulationInterfacesROS2/Code/Platform/Windows/PAL_windows.cmake

@@ -1,4 +0,0 @@
-
-set(PAL_TRAIT_SIMULATIONINTERFACESROS2_SUPPORTED TRUE)
-set(PAL_TRAIT_SIMULATIONINTERFACESROS2_TEST_SUPPORTED FALSE)
-set(PAL_TRAIT_SIMULATIONINTERFACESROS2_EDITOR_TEST_SUPPORTED FALSE)

Gems/SimulationInterfacesROS2/Code/Platform/Windows/simulationinterfacesros2_api_files.cmake

@@ -1,3 +0,0 @@
-
-set(FILES
-)

Gems/SimulationInterfacesROS2/Code/Platform/Windows/simulationinterfacesros2_editor_api_files.cmake

@@ -1,3 +0,0 @@
-
-set(FILES
-)

Gems/SimulationInterfacesROS2/Code/Platform/Windows/simulationinterfacesros2_private_files.cmake

@@ -1,8 +0,0 @@
-
-# Platform specific files for Windows
-# i.e. ../Source/Windows/SimulationInterfacesROS2Windows.cpp
-#      ../Source/Windows/SimulationInterfacesROS2Windows.h
-#      ../Include/Windows/SimulationInterfacesROS2Windows.h
-
-set(FILES
-)

Gems/SimulationInterfacesROS2/Code/Platform/Windows/simulationinterfacesros2_shared_files.cmake

@@ -1,8 +0,0 @@
-
-# Platform specific files for Windows
-# i.e. ../Source/Windows/SimulationInterfacesROS2Windows.cpp
-#      ../Source/Windows/SimulationInterfacesROS2Windows.h
-#      ../Include/Windows/SimulationInterfacesROS2Windows.h
-
-set(FILES
-)

Gems/SimulationInterfacesROS2/Code/Platform/iOS/PAL_ios.cmake

@@ -1,4 +0,0 @@
-
-set(PAL_TRAIT_SIMULATIONINTERFACESROS2_SUPPORTED TRUE)
-set(PAL_TRAIT_SIMULATIONINTERFACESROS2_TEST_SUPPORTED FALSE)
-set(PAL_TRAIT_SIMULATIONINTERFACESROS2_EDITOR_TEST_SUPPORTED FALSE)

Gems/SimulationInterfacesROS2/Code/Platform/iOS/simulationinterfacesros2_api_files.cmake

@@ -1,3 +0,0 @@
-
-set(FILES
-)

Gems/SimulationInterfacesROS2/Code/Platform/iOS/simulationinterfacesros2_private_files.cmake

@@ -1,8 +0,0 @@
-
-# Platform specific files for iOS
-# i.e. ../Source/iOS/SimulationInterfacesROS2iOS.cpp
-#      ../Source/iOS/SimulationInterfacesROS2iOS.h
-#      ../Include/iOS/SimulationInterfacesROS2iOS.h
-
-set(FILES
-)

Gems/SimulationInterfacesROS2/Code/Platform/iOS/simulationinterfacesros2_shared_files.cmake

@@ -1,8 +0,0 @@
-
-# Platform specific files for iOS
-# i.e. ../Source/iOS/SimulationInterfacesROS2iOS.cpp
-#      ../Source/iOS/SimulationInterfacesROS2iOS.h
-#      ../Include/iOS/SimulationInterfacesROS2iOS.h
-
-set(FILES
-)

Gems/SimulationInterfacesROS2/Code/Source/Clients/SimulationInterfacesROS2Module.cpp

@@ -1,23 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "SimulationInterfacesROS2SystemComponent.h"
-#include <SimulationInterfacesROS2/SimulationInterfacesROS2TypeIds.h>
-#include <SimulationInterfacesROS2ModuleInterface.h>
-
-namespace SimulationInterfacesROS2
-{
-    class SimulationInterfacesROS2Module : public SimulationInterfacesROS2ModuleInterface
-    {
-    public:
-        AZ_RTTI(SimulationInterfacesROS2Module, SimulationInterfacesROS2ModuleTypeId, SimulationInterfacesROS2ModuleInterface);
-        AZ_CLASS_ALLOCATOR(SimulationInterfacesROS2Module, AZ::SystemAllocator);
-    };
-} // namespace SimulationInterfacesROS2
-
-AZ_DECLARE_MODULE_CLASS(Gem_SimulationInterfacesROS2, SimulationInterfacesROS2::SimulationInterfacesROS2Module)

Gems/SimulationInterfacesROS2/Code/Source/SimulationInterfacesROS2ModuleInterface.cpp

@@ -1,38 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "SimulationInterfacesROS2ModuleInterface.h"
-#include <AzCore/Memory/Memory.h>
-
-#include <SimulationInterfacesROS2/SimulationInterfacesROS2TypeIds.h>
-
-#include <Clients/SimulationInterfacesROS2SystemComponent.h>
-
-namespace SimulationInterfacesROS2
-{
-    AZ_TYPE_INFO_WITH_NAME_IMPL(
-        SimulationInterfacesROS2ModuleInterface, "SimulationInterfacesROS2ModuleInterface", SimulationInterfacesROS2ModuleInterfaceTypeId);
-    AZ_RTTI_NO_TYPE_INFO_IMPL(SimulationInterfacesROS2ModuleInterface, AZ::Module);
-    AZ_CLASS_ALLOCATOR_IMPL(SimulationInterfacesROS2ModuleInterface, AZ::SystemAllocator);
-
-    SimulationInterfacesROS2ModuleInterface::SimulationInterfacesROS2ModuleInterface()
-    {
-        m_descriptors.insert(
-            m_descriptors.end(),
-            {
-                SimulationInterfacesROS2SystemComponent::CreateDescriptor(),
-            });
-    }
-
-    AZ::ComponentTypeList SimulationInterfacesROS2ModuleInterface::GetRequiredSystemComponents() const
-    {
-        return AZ::ComponentTypeList{
-            azrtti_typeid<SimulationInterfacesROS2SystemComponent>(),
-        };
-    }
-} // namespace SimulationInterfacesROS2

Gems/SimulationInterfacesROS2/Code/Source/SimulationInterfacesROS2ModuleInterface.h

@@ -1,27 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <AzCore/Memory/Memory_fwd.h>
-#include <AzCore/Module/Module.h>
-#include <AzCore/RTTI/RTTIMacros.h>
-#include <AzCore/RTTI/TypeInfoSimple.h>
-
-namespace SimulationInterfacesROS2
-{
-    class SimulationInterfacesROS2ModuleInterface : public AZ::Module
-    {
-    public:
-        AZ_TYPE_INFO_WITH_NAME_DECL(SimulationInterfacesROS2ModuleInterface)
-        AZ_RTTI_NO_TYPE_INFO_DECL()
-        AZ_CLASS_ALLOCATOR_DECL
-
-        SimulationInterfacesROS2ModuleInterface();
-
-        AZ::ComponentTypeList GetRequiredSystemComponents() const override;
-    };
-} // namespace SimulationInterfacesROS2

Gems/SimulationInterfacesROS2/Code/Source/Tools/SimulationInterfacesROS2EditorModule.cpp

@@ -1,39 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "SimulationInterfacesROS2EditorSystemComponent.h"
-#include <SimulationInterfacesROS2/SimulationInterfacesROS2TypeIds.h>
-#include <SimulationInterfacesROS2ModuleInterface.h>
-
-namespace SimulationInterfacesROS2
-{
-    class SimulationInterfacesROS2EditorModule : public SimulationInterfacesROS2ModuleInterface
-    {
-    public:
-        AZ_RTTI(SimulationInterfacesROS2EditorModule, SimulationInterfacesROS2EditorModuleTypeId, SimulationInterfacesROS2ModuleInterface);
-        AZ_CLASS_ALLOCATOR(SimulationInterfacesROS2EditorModule, AZ::SystemAllocator);
-
-        SimulationInterfacesROS2EditorModule()
-        {
-            m_descriptors.insert(
-                m_descriptors.end(),
-                {
-                    SimulationInterfacesROS2EditorSystemComponent::CreateDescriptor(),
-                });
-        }
-
-        AZ::ComponentTypeList GetRequiredSystemComponents() const override
-        {
-            return AZ::ComponentTypeList{
-                azrtti_typeid<SimulationInterfacesROS2EditorSystemComponent>(),
-            };
-        }
-    };
-} // namespace SimulationInterfacesROS2
-
-AZ_DECLARE_MODULE_CLASS(Gem_SimulationInterfacesROS2_Editor, SimulationInterfacesROS2::SimulationInterfacesROS2EditorModule)

Gems/SimulationInterfacesROS2/Code/Tests/Clients/SimulationInterfacesROS2Test.cpp

@@ -1,4 +0,0 @@
-
-#include <AzTest/AzTest.h>
-
-AZ_UNIT_TEST_HOOK(DEFAULT_UNIT_TEST_ENV);

Gems/SimulationInterfacesROS2/Code/simulationinterfacesros2_api_files.cmake

@@ -1,4 +0,0 @@
-
-set(FILES
-    Include/SimulationInterfacesROS2/SimulationInterfacesROS2TypeIds.h
-)

Gems/SimulationInterfacesROS2/Code/simulationinterfacesros2_editor_api_files.cmake

@@ -1,4 +0,0 @@
-
-
-set(FILES
-)

Gems/SimulationInterfacesROS2/Code/simulationinterfacesros2_editor_private_files.cmake

@@ -1,5 +0,0 @@
-
-set(FILES
-    Source/Tools/SimulationInterfacesROS2EditorSystemComponent.cpp
-    Source/Tools/SimulationInterfacesROS2EditorSystemComponent.h
-)

Gems/SimulationInterfacesROS2/Code/simulationinterfacesros2_editor_shared_files.cmake

@@ -1,4 +0,0 @@
-
-set(FILES
-    Source/Tools/SimulationInterfacesROS2EditorModule.cpp
-)

Gems/SimulationInterfacesROS2/Code/simulationinterfacesros2_private_files.cmake

@@ -1,43 +0,0 @@
-
-set(FILES
-    Source/SimulationInterfacesROS2ModuleInterface.cpp
-    Source/SimulationInterfacesROS2ModuleInterface.h
-    Source/Clients/SimulationInterfacesROS2SystemComponent.cpp
-    Source/Clients/SimulationInterfacesROS2SystemComponent.h
-    Source/Interfaces/IROS2HandlerBase.h
-    Source/Actions/SimulateStepsActionServerHandler.cpp
-    Source/Actions/SimulateStepsActionServerHandler.h
-    Source/Actions/ROS2ActionBase.h
-    Source/Services/ROS2ServiceBase.h
-    Source/Services/GetEntitiesServiceHandler.cpp
-    Source/Services/GetEntitiesServiceHandler.h
-    Source/Services/DeleteEntityServiceHandler.cpp
-    Source/Services/DeleteEntityServiceHandler.h
-    Source/Services/GetEntitiesServiceHandler.cpp
-    Source/Services/GetEntitiesServiceHandler.h
-    Source/Services/GetEntitiesStatesServiceHandler.cpp
-    Source/Services/GetEntitiesStatesServiceHandler.h
-    Source/Services/GetEntityStateServiceHandler.cpp
-    Source/Services/GetEntityStateServiceHandler.h
-    Source/Services/DeleteEntityServiceHandler.cpp
-    Source/Services/DeleteEntityServiceHandler.h
-    Source/Services/SetEntityStateServiceHandler.cpp
-    Source/Services/SetEntityStateServiceHandler.h
-    Source/Services/StepSimulationServiceHandler.cpp
-    Source/Services/StepSimulationServiceHandler.h
-    Source/Services/GetSpawnablesServiceHandler.cpp
-    Source/Services/GetSpawnablesServiceHandler.h
-    Source/Services/SpawnEntityServiceHandler.cpp
-    Source/Services/SpawnEntityServiceHandler.h
-    Source/Services/ResetSimulationServiceHandler.cpp
-    Source/Services/ResetSimulationServiceHandler.h
-    Source/Services/GetSimulationFeaturesServiceHandler.cpp
-    Source/Services/GetSimulationFeaturesServiceHandler.h
-    Source/Services/SetSimulationStateServiceHandler.cpp
-    Source/Services/SetSimulationStateServiceHandler.h
-    Source/Services/GetSimulationStateServiceHandler.cpp
-    Source/Services/GetSimulationStateServiceHandler.h
-    Source/Utils/RegistryUtils.cpp
-    Source/Utils/RegistryUtils.h
-    Source/Utils/Utils.h
-)

Gems/SimulationInterfacesROS2/Code/simulationinterfacesros2_shared_files.cmake

@@ -1,4 +0,0 @@
-
-set(FILES
-    Source/Clients/SimulationInterfacesROS2Module.cpp
-)

Gems/SimulationInterfacesROS2/Code/simulationinterfacesros2_tests_files.cmake

@@ -1,4 +0,0 @@
-
-set(FILES
-    Tests/Clients/SimulationInterfacesROS2Test.cpp
-)

Gems/SimulationInterfacesROS2/Registry/assetprocessor_settings.setreg

@@ -1,18 +0,0 @@
-{
-    "Amazon": {
-        "AssetProcessor": {
-            "Settings": {
-                "ScanFolder SimulationInterfacesROS2/Assets": {
-                    "watch": "@GEMROOT:SimulationInterfacesROS2@/Assets",
-                    "recursive": 1,
-                    "order": 101
-                },
-                "ScanFolder SimulationInterfacesROS2/Registry": {
-                    "watch": "@GEMROOT:SimulationInterfacesROS2@/Registry",
-                    "recursive": 1,
-                    "order": 102
-                }
-            }
-        }
-    }
-}

Gems/SimulationInterfacesROS2/gem.json

@@ -1,34 +0,0 @@
-{
-  "gem_name": "SimulationInterfacesROS2",
-  "version": "1.0.0",
-  "display_name": "SimulationInterfacesROS2",
-  "license": "Apache-2.0",
-  "license_url": "https://opensource.org/licenses/Apache-2.0",
-  "origin": "RobotecAI",
-  "origin_url": "https://robotec.ai",
-  "type": "Code",
-  "summary": "This gem provides ROS 2 interface for SimulationInterfaces gem.",
-  "canonical_tags": [
-    "Gem"
-  ],
-  "user_tags": [
-    "SimulationInterfacesROS2",
-    "SimulationInterfaces",
-    "ROS2",
-    "ROS 2"
-  ],
-  "platforms": [
-    ""
-  ],
-  "icon_path": "preview.png",
-  "requirements": "ROS2, SimulationInterfaces",
-  "documentation_url": "",
-  "dependencies": [
-    "SimulationInterfaces>=1.0.0",
-    "ROS2>=3.3.0"
-  ],
-  "repo_uri": "",
-  "compatible_engines": [],
-  "engine_api_dependencies": [],
-  "restricted": "SimulationInterfacesROS2"
-}

Gems/SimulationInterfacesROS2/preview.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:248e3ffe1fc9ffc02afb2ba8914e222a5a5d13ac45a48b98c95ee062e959a94c
-size 4475