Skip to content

Commit 918d155

Browse files
arturkamienieckiarturkamieniecki
committed
Fix atom dependency
Signed-off-by: Artur Kamieniecki <[email protected]>
1 parent 157a515 commit 918d155

File tree

7 files changed

+46
-38
lines changed

7 files changed

+46
-38
lines changed

‎Gems/ROS2/Code/Source/SystemComponents/ROS2SystemComponent.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ namespace ROS2
7676
void ROS2SystemComponent::GetRequiredServices([[maybe_unused]] AZ::ComponentDescriptor::DependencyArrayType& required)
7777
{
7878
required.push_back(AZ_CRC("AssetDatabaseService", 0x3abf5601));
79-
required.push_back(AZ_CRC("RPISystem", 0xf2add773));
8079
}
8180

8281
void ROS2SystemComponent::GetDependentServices([[maybe_unused]] AZ::ComponentDescriptor::DependencyArrayType& dependent)

‎Gems/ROS2Sensors/Code/Include/ROS2Sensors/Sensor/ROS2SensorComponentBase.h

+14-15
Original file line numberDiff line numberDiff line change
@@ -46,21 +46,20 @@ namespace ROS2
4646
{
4747
if (auto* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
4848
{
49-
serializeContext->Class<ROS2SensorComponentBase<EventSourceT, ComponentConfigurationT>, AZ::Component>()->Version(1);
50-
// ->Field(
51-
// "SensorConfiguration", &ROS2SensorComponentBase<EventSourceT, ComponentConfigurationT>::m_sensorConfiguration);
52-
53-
// if (auto* editContext = serializeContext->GetEditContext())
54-
// {
55-
// editContext
56-
// ->Class<ROS2SensorComponentBase<EventSourceT, ComponentConfigurationT>>(
57-
// "ROS2 Sensor Component Base", "Base component for sensors")
58-
// ->DataElement(
59-
// AZ::Edit::UIHandlers::Default,
60-
// &ROS2SensorComponentBase<EventSourceT, ComponentConfigurationT>::m_sensorConfiguration,
61-
// "Sensor configuration",
62-
// "Sensor configuration");
63-
// }
49+
serializeContext->Class<ROS2SensorComponentBase<EventSourceT, ComponentConfigurationT>, AZ::Component>()->Version(1)->Field(
50+
"SensorConfiguration", &ROS2SensorComponentBase<EventSourceT, ComponentConfigurationT>::m_sensorConfiguration);
51+
52+
if (auto* editContext = serializeContext->GetEditContext())
53+
{
54+
editContext
55+
->Class<ROS2SensorComponentBase<EventSourceT, ComponentConfigurationT>>(
56+
"ROS2 Sensor Component Base", "Base component for sensors")
57+
->DataElement(
58+
AZ::Edit::UIHandlers::Default,
59+
&ROS2SensorComponentBase<EventSourceT, ComponentConfigurationT>::m_sensorConfiguration,
60+
"Sensor configuration",
61+
"Sensor configuration");
62+
}
6463
}
6564
}
6665

‎Gems/ROS2Sensors/Code/Source/Camera/ROS2CameraSystemComponent.cpp

+5-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,11 @@ namespace ROS2
4141
void ROS2SystemCameraComponent::GetRequiredServices([[maybe_unused]] AZ::ComponentDescriptor::DependencyArrayType& required)
4242
{
4343
required.push_back(AZ_CRC_CE("ROS2Service"));
44-
required.push_back(AZ_CRC_CE("RPISystem"));
44+
}
45+
46+
void ROS2SystemCameraComponent::GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent)
47+
{
48+
dependent.push_back(AZ_CRC_CE("RPISystem"));
4549
}
4650

4751
void ROS2SystemCameraComponent::InitPassTemplateMappingsHandler()

‎Gems/ROS2Sensors/Code/Source/Camera/ROS2CameraSystemComponent.h

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ namespace ROS2
2424
static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
2525
static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
2626
static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
27+
static void GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent);
2728

2829
void InitPassTemplateMappingsHandler();
2930

‎Gems/ROS2Sensors/Code/Source/Camera/ROS2EditorCameraSystemComponent.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ namespace ROS2
3636
BaseSystemComponent::GetRequiredServices(required);
3737
}
3838

39+
void ROS2EditorCameraSystemComponent::GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent)
40+
{
41+
BaseSystemComponent::GetDependentServices(dependent);
42+
}
43+
3944
void ROS2EditorCameraSystemComponent::Activate()
4045
{
4146
AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusConnect();

‎Gems/ROS2Sensors/Code/Source/Camera/ROS2EditorCameraSystemComponent.h

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ namespace ROS2
2929
static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
3030
static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
3131
static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
32+
static void GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent);
3233

3334
//////////////////////////////////////////////////////////////////////////
3435
// Component overrides

‎Gems/ROS2Sensors/Code/Source/Odometry/ROS2WheelOdometry.cpp

+20-21
Original file line numberDiff line numberDiff line change
@@ -104,30 +104,29 @@ namespace ROS2
104104
jsonContext->Serializer<JsonROS2WheelOdometryComponentConfigSerializer>()->HandlesType<ROS2WheelOdometryComponent>();
105105
}
106106

107-
// ROS2WheelOdometryConfiguration::Reflect(context);
108-
// ROS2SensorComponentBase<PhysicsBasedSource, ROS2WheelOdometryConfiguration>::Reflect(context);
107+
ROS2WheelOdometryConfiguration::Reflect(context);
108+
ROS2SensorComponentBase<PhysicsBasedSource, ROS2WheelOdometryConfiguration>::Reflect(context);
109109

110110
if (auto* serialize = azrtti_cast<AZ::SerializeContext*>(context))
111111
{
112-
serialize->Class<ROS2WheelOdometryComponent, SensorBaseType>()->Version(2);
113-
// ->Field(
114-
// "Odometry configuration", &ROS2WheelOdometryComponent::m_odometryConfiguration);
115-
116-
// if (auto* editContext = serialize->GetEditContext())
117-
// {
118-
// editContext->Class<ROS2WheelOdometryComponent>("ROS2 Wheel Odometry Sensor", "Odometry sensor component")
119-
// ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
120-
// ->Attribute(AZ::Edit::Attributes::Category, "ROS2")
121-
// ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"))
122-
// ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/ROS2WheelOdometrySensor.svg")
123-
// ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/ROS2WheelOdometrySensor.svg")
124-
// ->DataElement(
125-
// AZ::Edit::UIHandlers::Default,
126-
// &ROS2WheelOdometryComponent::m_odometryConfiguration,
127-
// "Odometry configuration",
128-
// "Odometry sensor configuration")
129-
// ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly);
130-
// }
112+
serialize->Class<ROS2WheelOdometryComponent, SensorBaseType>()->Version(2)->Field(
113+
"Odometry configuration", &ROS2WheelOdometryComponent::m_odometryConfiguration);
114+
115+
if (auto* editContext = serialize->GetEditContext())
116+
{
117+
editContext->Class<ROS2WheelOdometryComponent>("ROS2 Wheel Odometry Sensor", "Odometry sensor component")
118+
->ClassElement(AZ::Edit::ClassElements::EditorData, "")
119+
->Attribute(AZ::Edit::Attributes::Category, "ROS2")
120+
->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"))
121+
->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/ROS2WheelOdometrySensor.svg")
122+
->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/ROS2WheelOdometrySensor.svg")
123+
->DataElement(
124+
AZ::Edit::UIHandlers::Default,
125+
&ROS2WheelOdometryComponent::m_odometryConfiguration,
126+
"Odometry configuration",
127+
"Odometry sensor configuration")
128+
->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly);
129+
}
131130
}
132131
}
133132

0 commit comments

Comments
 (0)