Skip to content

Commit 01455c6

Browse files
authored
Remove calling system component from a contructor of helper configuration (o3de#520)
Signed-off-by: Michał <[email protected]>
1 parent eeab875 commit 01455c6

File tree

6 files changed

+15
-3
lines changed

6 files changed

+15
-3
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,9 @@ namespace ROS2
114114

115115
AZStd::string Details::GetDefaultLidarSystem()
116116
{
117-
const auto& lidarSystemList = LidarRegistrarInterface::Get()->GetRegisteredLidarSystems();
117+
const auto& lidarInterface = LidarRegistrarInterface::Get();
118+
AZ_Assert(lidarInterface, "LidarRegistrarInterface is not registered.");
119+
const auto& lidarSystemList = lidarInterface->GetRegisteredLidarSystems();
118120
if (lidarSystemList.empty())
119121
{
120122
AZ_Warning("ROS2LidarSensorComponent", false, "No LIDAR system for the sensor to use.");

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@ namespace ROS2
7979
m_lidarModel = m_availableModels.front();
8080
m_lidarParameters = LidarTemplateUtils::GetTemplate(m_lidarModel);
8181
m_lidarModelName = m_lidarParameters.m_name;
82-
83-
FetchLidarImplementationFeatures();
8482
}
8583

8684
void LidarSensorConfiguration::FetchLidarImplementationFeatures()

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,11 @@ namespace ROS2
9999
m_lidarCore.Deinit();
100100
}
101101

102+
void ROS2Lidar2DSensorComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
103+
{
104+
required.push_back(AZ_CRC_CE("ROS2Frame"));
105+
}
106+
102107
void ROS2Lidar2DSensorComponent::FrequencyTick()
103108
{
104109
RaycastResult lastScanResults = m_lidarCore.PerformRaycast();

Gems/ROS2/Code/Source/Lidar/ROS2Lidar2DSensorComponent.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ namespace ROS2
3232
ROS2Lidar2DSensorComponent();
3333
ROS2Lidar2DSensorComponent(const SensorConfiguration& sensorConfiguration, const LidarSensorConfiguration& lidarConfiguration);
3434
~ROS2Lidar2DSensorComponent() = default;
35+
static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
3536
static void Reflect(AZ::ReflectContext* context);
3637
//////////////////////////////////////////////////////////////////////////
3738
// Component overrides

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,11 @@ namespace ROS2
4343
}
4444
}
4545

46+
void ROS2LidarSensorComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
47+
{
48+
required.push_back(AZ_CRC_CE("ROS2Frame"));
49+
}
50+
4651
ROS2LidarSensorComponent::ROS2LidarSensorComponent()
4752
: m_lidarCore(LidarTemplateUtils::Get3DModels())
4853
{

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ namespace ROS2
3434
ROS2LidarSensorComponent(const SensorConfiguration& sensorConfiguration, const LidarSensorConfiguration& lidarConfiguration);
3535
~ROS2LidarSensorComponent() = default;
3636
static void Reflect(AZ::ReflectContext* context);
37+
static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
3738
//////////////////////////////////////////////////////////////////////////
3839
// Component overrides
3940
void Activate() override;

0 commit comments

Comments
 (0)