Skip to content

Commit b601c8e

Browse files
Change Ros2FrameComponent to Ros2FrameEditorComponent in urdf/sdf hooks (o3de#659)
* Change ros2framecomponent to ros2FrameEditorComponent --------- Signed-off-by: Artur Kamieniecki <[email protected]> Signed-off-by: Jan Hanca <[email protected]> Co-authored-by: Jan Hanca <[email protected]>
1 parent 56438f4 commit b601c8e

File tree

6 files changed

+12
-15
lines changed

6 files changed

+12
-15
lines changed

Gems/ROS2/Code/Source/RobotImporter/SDFormat/Hooks/ROS2AckermannModelHook.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <AzToolsFramework/Entity/EditorEntityHelpers.h>
1111
#include <AzToolsFramework/ToolsComponents/TransformComponent.h>
1212
#include <PhysX/EditorColliderComponentRequestBus.h>
13-
#include <ROS2/Frame/ROS2FrameComponent.h>
13+
#include <ROS2/Frame/ROS2FrameEditorComponent.h>
1414
#include <ROS2/RobotControl/ControlConfiguration.h>
1515
#include <RobotControl/Controllers/AckermannController/AckermannControlComponent.h>
1616
#include <RobotControl/ROS2RobotControlComponent.h>
@@ -298,7 +298,7 @@ namespace ROS2::SDFormat
298298
controlConfiguration.m_steering = ControlConfiguration::Steering::Ackermann;
299299

300300
// Create required components
301-
HooksUtils::CreateComponent<ROS2FrameComponent>(entity);
301+
HooksUtils::CreateComponent<ROS2FrameEditorComponent>(entity);
302302
HooksUtils::CreateComponent<ROS2RobotControlComponent>(entity, controlConfiguration);
303303
HooksUtils::CreateComponent<VehicleDynamics::AckermannVehicleModelComponent>(
304304
entity, vehicleConfiguration, VehicleDynamics::AckermannDriveModel(modelLimits, steeringPid));

Gems/ROS2/Code/Source/RobotImporter/SDFormat/Hooks/ROS2CameraSensorHook.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
*
77
*/
88

9-
#include "ROS2/Frame/ROS2FrameEditorComponent.h"
109
#include <Camera/CameraConstants.h>
1110
#include <Camera/ROS2CameraSensorEditorComponent.h>
12-
#include <ROS2/Frame/ROS2FrameComponent.h>
11+
#include <ROS2/Frame/ROS2FrameEditorComponent.h>
1312
#include <RobotImporter/SDFormat/ROS2SDFormatHooksUtils.h>
1413
#include <RobotImporter/SDFormat/ROS2SensorHooks.h>
1514

@@ -79,7 +78,7 @@ namespace ROS2::SDFormat
7978
}
8079

8180
// Create required components
82-
HooksUtils::CreateComponent<ROS2FrameComponent>(entity);
81+
HooksUtils::CreateComponent<ROS2FrameEditorComponent>(entity);
8382

8483
// Create Camera component
8584
if (HooksUtils::CreateComponent<ROS2CameraSensorEditorComponent>(entity, sensorConfiguration, cameraConfiguration))

Gems/ROS2/Code/Source/RobotImporter/SDFormat/Hooks/ROS2ImuSensorHook.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
#include <Imu/ROS2ImuSensorComponent.h>
10-
#include <ROS2/Frame/ROS2FrameComponent.h>
10+
#include <ROS2/Frame/ROS2FrameEditorComponent.h>
1111
#include <RobotImporter/SDFormat/ROS2SDFormatHooksUtils.h>
1212
#include <RobotImporter/SDFormat/ROS2SensorHooks.h>
1313
#include <Source/EditorStaticRigidBodyComponent.h>
@@ -82,7 +82,7 @@ namespace ROS2::SDFormat
8282
HooksUtils::AddTopicConfiguration(sensorConfiguration, "imu", messageType, messageType);
8383

8484
// Create required components
85-
HooksUtils::CreateComponent<ROS2FrameComponent>(entity);
85+
HooksUtils::CreateComponent<ROS2FrameEditorComponent>(entity);
8686
HooksUtils::CreateComponent<PhysX::EditorStaticRigidBodyComponent>(entity);
8787

8888
// Create Imu component

Gems/ROS2/Code/Source/RobotImporter/SDFormat/Hooks/ROS2LidarSensorHook.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
*
77
*/
88

9-
#include "ROS2/Frame/ROS2FrameEditorComponent.h"
109
#include <Lidar/ROS2Lidar2DSensorComponent.h>
1110
#include <Lidar/ROS2LidarSensorComponent.h>
12-
#include <ROS2/Frame/ROS2FrameComponent.h>
11+
#include <ROS2/Frame/ROS2FrameEditorComponent.h>
1312
#include <RobotImporter/SDFormat/ROS2SDFormatHooksUtils.h>
1413
#include <RobotImporter/SDFormat/ROS2SensorHooks.h>
1514

@@ -93,7 +92,7 @@ namespace ROS2::SDFormat
9392
}
9493

9594
// Create required components
96-
HooksUtils::CreateComponent<ROS2FrameComponent>(entity);
95+
HooksUtils::CreateComponent<ROS2FrameEditorComponent>(entity);
9796

9897
// Create Lidar component
9998
const auto lidarComponent = is2DLidar

Gems/ROS2/Code/Source/RobotImporter/SDFormat/Hooks/ROS2SkidSteeringModelHook.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
#include <AzCore/Math/MathUtils.h>
10-
#include <ROS2/Frame/ROS2FrameComponent.h>
10+
#include <ROS2/Frame/ROS2FrameEditorComponent.h>
1111
#include <RobotControl/Controllers/SkidSteeringController/SkidSteeringControlComponent.h>
1212
#include <RobotControl/ROS2RobotControlComponent.h>
1313
#include <RobotImporter/SDFormat/ROS2ModelPluginHooks.h>
@@ -189,7 +189,7 @@ namespace ROS2::SDFormat
189189
VehicleDynamics::SkidSteeringModelLimits modelLimits = SkidSteeringParser::CreateModelLimits(element);
190190

191191
// Create required components
192-
HooksUtils::CreateComponent<ROS2FrameComponent>(entity);
192+
HooksUtils::CreateComponent<ROS2FrameEditorComponent>(entity);
193193
HooksUtils::CreateComponent<ROS2RobotControlComponent>(entity);
194194
HooksUtils::CreateComponent<VehicleDynamics::SkidSteeringModelComponent>(
195195
entity, vehicleConfiguration, VehicleDynamics::SkidSteeringDriveModel(modelLimits));

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include "URDFPrefabMaker.h"
1010
#include "CollidersMaker.h"
1111
#include "PrefabMakerUtils.h"
12-
#include "ROS2/Frame/ROS2FrameEditorComponent.h"
1312
#include <API/EditorAssetSystemAPI.h>
1413
#include <Atom/Feature/Mesh/MeshFeatureProcessor.h>
1514
#include <AzCore/Debug/Trace.h>
@@ -25,7 +24,7 @@
2524
#include <AzToolsFramework/Prefab/Procedural/ProceduralPrefabAsset.h>
2625
#include <AzToolsFramework/ToolsComponents/GenericComponentWrapper.h>
2726
#include <AzToolsFramework/ToolsComponents/TransformComponent.h>
28-
#include <ROS2/Frame/ROS2FrameComponent.h>
27+
#include <ROS2/Frame/ROS2FrameEditorComponent.h>
2928
#include <ROS2/ROS2GemUtilities.h>
3029
#include <RobotImporter/Utils/ErrorUtils.h>
3130
#include <RobotImporter/Utils/RobotImporterUtils.h>
@@ -458,7 +457,7 @@ namespace ROS2
458457
AZ::Entity* childEntityPtr = AzToolsFramework::GetEntityById(childEntity.GetValue());
459458
if (childEntityPtr)
460459
{
461-
auto* component = childEntityPtr->FindComponent<ROS2FrameComponent>();
460+
auto* component = childEntityPtr->FindComponent<ROS2FrameEditorComponent>();
462461
if (component)
463462
{
464463
component->SetJointName(azJointName);

0 commit comments

Comments
 (0)