selected headers moved to public include folder (#255)

Signed-off-by: Adam Dąbrowski <[email protected]>

Gems/ROS2/Code/Source/Frame/ROS2FrameComponent.h → Gems/ROS2/Code/Include/ROS2/Frame/ROS2FrameComponent.h

@@ -7,9 +7,9 @@
  */
 #pragma once
 
-#include "Frame/NamespaceConfiguration.h"
-#include "Frame/ROS2Transform.h"
-#include "ROS2GemUtilities.h"
+#include "ROS2/Frame/NamespaceConfiguration.h"
+#include "ROS2/Frame/ROS2Transform.h"
+#include "ROS2/ROS2GemUtilities.h"
 #include <AzCore/Component/Component.h>
 #include <AzCore/std/smart_ptr/unique_ptr.h>
 #include <AzFramework/Components/TransformComponent.h>

Gems/ROS2/Code/Source/Camera/CameraSensor.cpp

@@ -10,15 +10,13 @@
 #include <AzCore/Math/MatrixUtils.h>
 
 #include <Atom/RPI.Public/Base.h>
+#include <Atom/RPI.Public/Pass/Specific/RenderToTexturePass.h>
 #include <Atom/RPI.Public/RPISystemInterface.h>
 #include <Atom/RPI.Public/RenderPipeline.h>
 #include <Atom/RPI.Public/Scene.h>
-
 #include <AzFramework/Components/TransformComponent.h>
 #include <AzFramework/Scene/SceneSystemInterface.h>
 
-#include <Atom/RPI.Public/Pass/Specific/RenderToTexturePass.h>
-
 #include <PostProcess/PostProcessFeatureProcessor.h>
 
 namespace ROS2

Gems/ROS2/Code/Source/Camera/CameraSensor.h

@@ -7,7 +7,7 @@
  */
 #pragma once
 
-#include "ROS2GemUtilities.h"
+#include "ROS2/ROS2GemUtilities.h"
 #include <Atom/Feature/Utils/FrameCaptureBus.h>
 #include <chrono>
 

Gems/ROS2/Code/Source/Camera/ROS2CameraSensorComponent.cpp

@@ -7,15 +7,15 @@
  */
 
 #include "Camera/ROS2CameraSensorComponent.h"
-#include "Frame/ROS2FrameComponent.h"
+#include "ROS2/Frame/ROS2FrameComponent.h"
 #include "ROS2/ROS2Bus.h"
+#include "ROS2/Utilities/ROS2Names.h"
 
 #include <AzCore/Component/Entity.h>
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/Serialization/SerializeContext.h>
 
-#include <Utilities/ROS2Names.h>
 #include <sensor_msgs/distortion_models.hpp>
 #include <sensor_msgs/image_encodings.hpp>
 

Gems/ROS2/Code/Source/Frame/NamespaceConfiguration.cpp

@@ -6,8 +6,8 @@
  *
  */
 
-#include "Frame/NamespaceConfiguration.h"
-#include "Utilities/ROS2Names.h"
+#include "ROS2/Frame/NamespaceConfiguration.h"
+#include "ROS2/Utilities/ROS2Names.h"
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/Serialization/EditContextConstants.inl>
 

Gems/ROS2/Code/Source/Frame/ROS2FrameComponent.cpp

@@ -6,9 +6,9 @@
  *
  */
 
-#include "Frame/ROS2FrameComponent.h"
+#include "ROS2/Frame/ROS2FrameComponent.h"
 #include "ROS2/ROS2Bus.h"
-#include "Utilities/ROS2Names.h"
+#include "ROS2/Utilities/ROS2Names.h"
 #include <AzCore/Component/Entity.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/Serialization/EditContextConstants.inl>

Gems/ROS2/Code/Source/Frame/ROS2Transform.cpp

@@ -6,7 +6,7 @@
  *
  */
 
-#include "Frame/ROS2Transform.h"
+#include "ROS2/Frame/ROS2Transform.h"
 #include "ROS2/ROS2Bus.h"
 #include "Utilities/ROS2Conversions.h"
 #include <tf2_ros/qos.hpp>

Gems/ROS2/Code/Source/GNSS/ROS2GNSSSensorComponent.cpp

@@ -7,13 +7,13 @@
  */
 
 #include "GNSS/ROS2GNSSSensorComponent.h"
-#include "AzCore/Math/Matrix4x4.h"
-#include "Frame/ROS2FrameComponent.h"
+#include "ROS2/Frame/ROS2FrameComponent.h"
 #include "ROS2/ROS2Bus.h"
-#include "ROS2GemUtilities.h"
+#include "ROS2/Utilities/ROS2Names.h"
+#include "ROS2/ROS2GemUtilities.h"
 #include "Utilities/ROS2Conversions.h"
-#include "Utilities/ROS2Names.h"
 
+#include <AzCore/Math/Matrix4x4.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/Serialization/EditContextConstants.inl>
 

Gems/ROS2/Code/Source/Imu/ROS2ImuSensorComponent.cpp

@@ -7,10 +7,10 @@
  */
 
 #include "Imu/ROS2ImuSensorComponent.h"
-#include "Frame/ROS2FrameComponent.h"
+#include "ROS2/Frame/ROS2FrameComponent.h"
 #include "ROS2/ROS2Bus.h"
 #include "Utilities/ROS2Conversions.h"
-#include "Utilities/ROS2Names.h"
+#include "ROS2/Utilities/ROS2Names.h"
 
 #include <AzCore/Component/Entity.h>
 #include <AzCore/Script/ScriptTimePoint.h>

Gems/ROS2/Code/Source/Lidar/ROS2LidarSensorComponent.cpp

@@ -7,10 +7,10 @@
  */
 
 #include "Lidar/ROS2LidarSensorComponent.h"
-#include "Frame/ROS2FrameComponent.h"
+#include "ROS2/Frame/ROS2FrameComponent.h"
 #include "Lidar/LidarTemplateUtils.h"
 #include "ROS2/ROS2Bus.h"
-#include "Utilities/ROS2Names.h"
+#include "ROS2/Utilities/ROS2Names.h"
 #include <Atom/RPI.Public/AuxGeom/AuxGeomFeatureProcessorInterface.h>
 #include <Atom/RPI.Public/RPISystemInterface.h>
 #include <Atom/RPI.Public/Scene.h>

Gems/ROS2/Code/Source/ROS2GemUtilities.cpp

@@ -6,7 +6,7 @@
  *
  */
 
-#include "ROS2GemUtilities.h"
+#include "../Include/ROS2/ROS2GemUtilities.h"
 #include <AzCore/std/string/regex.h>
 #include <AzToolsFramework/API/EntityCompositionRequestBus.h>
 

Gems/ROS2/Code/Source/ROS2ModuleInterface.h

@@ -7,8 +7,8 @@
  */
 #pragma once
 
+#include "../Include/ROS2/Frame/ROS2FrameComponent.h"
 #include "Camera/ROS2CameraSensorComponent.h"
-#include "Frame/ROS2FrameComponent.h"
 #include "GNSS/ROS2GNSSSensorComponent.h"
 #include "Imu/ROS2ImuSensorComponent.h"
 #include "Lidar/ROS2LidarSensorComponent.h"

Gems/ROS2/Code/Source/RobotControl/ControlConfiguration.cpp

@@ -7,7 +7,7 @@
  */
 
 #include "RobotControl/ControlConfiguration.h"
-#include "Utilities/ROS2Names.h"
+#include "ROS2/Utilities/ROS2Names.h"
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/Serialization/EditContextConstants.inl>
 

Gems/ROS2/Code/Source/RobotControl/ControlSubscriptionHandler.h

@@ -7,10 +7,10 @@
  */
 #pragma once
 
-#include "Frame/ROS2FrameComponent.h"
+#include "ROS2/Frame/ROS2FrameComponent.h"
 #include "ROS2/ROS2Bus.h"
 #include "RobotControl/ControlConfiguration.h"
-#include "Utilities/ROS2Names.h"
+#include "ROS2/Utilities/ROS2Names.h"
 #include <rclcpp/rclcpp.hpp>
 
 namespace ROS2

Gems/ROS2/Code/Source/RobotImporter/URDF/URDFPrefabMaker.cpp

@@ -7,8 +7,8 @@
  */
 
 #include "RobotImporter/URDF/URDFPrefabMaker.h"
-#include "Frame/ROS2FrameComponent.h"
-#include "ROS2GemUtilities.h"
+#include "ROS2/Frame/ROS2FrameComponent.h"
+#include "ROS2/ROS2GemUtilities.h"
 #include "RobotControl/ROS2RobotControlComponent.h"
 #include "RobotImporter/URDF/CollidersMaker.h"
 #include "RobotImporter/URDF/PrefabMakerUtils.h"

Gems/ROS2/Code/Source/Sensor/PublisherConfiguration.cpp

@@ -7,7 +7,7 @@
  */
 
 #include "PublisherConfiguration.h"
-#include "Utilities/ROS2Names.h"
+#include "ROS2/Utilities/ROS2Names.h"
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/Serialization/SerializeContext.h>
 

Gems/ROS2/Code/Source/Sensor/ROS2SensorComponent.cpp

@@ -7,10 +7,10 @@
  */
 
 #include "Sensor/ROS2SensorComponent.h"
-#include "Frame/ROS2FrameComponent.h"
+#include "ROS2/Frame/ROS2FrameComponent.h"
 #include "ROS2/ROS2Bus.h"
-#include "ROS2GemUtilities.h"
-#include "Utilities/ROS2Names.h"
+#include "ROS2/Utilities/ROS2Names.h"
+#include "ROS2/ROS2GemUtilities.h"
 #include <AzCore/Component/Entity.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/Serialization/EditContextConstants.inl>

Gems/ROS2/Code/Source/Sensor/ROS2SensorComponent.h

@@ -7,7 +7,7 @@
  */
 #pragma once
 
-#include "ROS2GemUtilities.h"
+#include "ROS2/ROS2GemUtilities.h"
 #include "SensorConfiguration.h"
 #include <AzCore/Component/Component.h>
 #include <AzCore/Component/TickBus.h>

Gems/ROS2/Code/Source/Utilities/ROS2Names.cpp

@@ -6,7 +6,7 @@
  *
  */
 
-#include "ROS2Names.h"
+#include "ROS2/Utilities/ROS2Names.h"
 #include <AzCore/RTTI/RTTI.h>
 #include <AzCore/std/string/regex.h>
 #include <rcl/validate_topic_name.h>

Gems/ROS2/Code/ros2_files.cmake

@@ -21,7 +21,6 @@ set(FILES
         Source/QoS/QoS.cpp
         Source/QoS/QoS.h
         Source/ROS2GemUtilities.cpp
-        Source/ROS2GemUtilities.h
         Source/RobotControl/ControlConfiguration.cpp
         Source/RobotControl/ControlConfiguration.h
         Source/RobotControl/ControlSubscriptionHandler.h
@@ -48,15 +47,11 @@ set(FILES
         Source/Sensor/SensorConfiguration.cpp
         Source/Sensor/SensorConfiguration.h
         Source/Frame/NamespaceConfiguration.cpp
-        Source/Frame/NamespaceConfiguration.h
         Source/Frame/ROS2FrameComponent.cpp
-        Source/Frame/ROS2FrameComponent.h
         Source/Frame/ROS2Transform.cpp
-        Source/Frame/ROS2Transform.h
         Source/Utilities/ROS2Conversions.cpp
         Source/Utilities/ROS2Conversions.h
         Source/Utilities/ROS2Names.cpp
-        Source/Utilities/ROS2Names.h
         Source/GNSS/ROS2GNSSSensorComponent.cpp
         Source/GNSS/ROS2GNSSSensorComponent.h
         Source/GNSS/GNSSFormatConversions.cpp

Gems/ROS2/Code/ros2_header_files.cmake

@@ -4,5 +4,10 @@
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 
 set(FILES
-    Include/ROS2/ROS2Bus.h
-)
+        Include/ROS2/Frame/NamespaceConfiguration.h
+        Include/ROS2/Frame/ROS2FrameComponent.h
+        Include/ROS2/Frame/ROS2Transform.h
+        Include/ROS2/ROS2Bus.h
+        Include/ROS2/ROS2GemUtilities.h
+        Include/ROS2/Utilities/ROS2Names.h
+        )