Skip to content

Changes from ROS2 Gem to ROS2Sensors Gem #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: development
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Code/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ ly_add_target(
Gem::Atom_RPI.Public
Gem::AtomLyIntegration_CommonFeatures.Static
Gem::ROS2.Static
Gem::ROS2Sensors.API
Gem::ROS2Sensors.Lidar.Static
Gem::EMotionFX.Static
)

Expand Down
2 changes: 1 addition & 1 deletion Code/Source/Entity/EntityManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <Entity/EntityManager.h>
#include <LmbrCentral/Scripting/TagComponentBus.h>
#include <RGL/RGLBus.h>
#include <ROS2/Lidar/SegmentationUtils.h>
#include <ROS2Sensors/Lidar/SegmentationUtils.h>
#include <Utilities/RGLUtils.h>

namespace RGL
Expand Down
5 changes: 2 additions & 3 deletions Code/Source/Entity/EntityManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <AzCore/Component/TransformBus.h>
#include <AzCore/std/containers/vector.h>
#include <AzCore/std/optional.h>
#include <ROS2/Lidar/ClassSegmentationBus.h>
#include <ROS2Sensors/Lidar/ClassSegmentationBus.h>
#include <Wrappers/RglEntity.h>
#include <rgl/api/core.h>

Expand All @@ -31,8 +31,7 @@ namespace RGL
//! the derived classes have to handle bus connection
//! through BusConnect and BusDisconnect function calls.
//! This is to allow for further overrides.
class EntityManager
: public AZ::EntityBus::Handler
class EntityManager : public AZ::EntityBus::Handler
{
public:
explicit EntityManager(AZ::EntityId entityId);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
#include <AzCore/Serialization/SerializeContext.h>
#include <Entity/Terrain/TerrainEntityManagerSystemComponent.h>
#include <RGL/RGLBus.h>
#include <ROS2Sensors/Lidar/ClassSegmentationBus.h>
#include <Utilities/RGLUtils.h>
#include <ROS2/Lidar/ClassSegmentationBus.h>

namespace RGL
{
Expand Down
2 changes: 1 addition & 1 deletion Code/Source/Lidar/LidarRaycaster.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#pragma once

#include <Lidar/PipelineGraph.h>
#include <ROS2/Lidar/LidarRaycasterBus.h>
#include <ROS2Sensors/Lidar/LidarRaycasterBus.h>
#include <Utilities/RGLUtils.h>
#include <rgl/api/core.h>

Expand Down
4 changes: 2 additions & 2 deletions Code/Source/Lidar/LidarSystem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/
#include <Lidar/LidarSystem.h>
#include <ROS2/Lidar/LidarRegistrarBus.h>
#include <ROS2Sensors/Lidar/LidarRegistrarBus.h>

namespace RGL
{
Expand Down Expand Up @@ -61,4 +61,4 @@ namespace RGL
{
m_lidars.erase(lidarId);
}
} // namespace RGL
} // namespace RGL
2 changes: 1 addition & 1 deletion Code/Source/Lidar/LidarSystem.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#pragma once

#include <Lidar/LidarRaycaster.h>
#include <ROS2/Lidar/LidarSystemBus.h>
#include <ROS2Sensors/Lidar/LidarSystemBus.h>

namespace RGL
{
Expand Down
4 changes: 2 additions & 2 deletions Code/Source/Lidar/LidarSystemNotificationBus.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

#include <AzCore/Component/EntityId.h>
#include <AzCore/EBus/EBus.h>
#include <ROS2/Lidar/LidarSystemBus.h>
#include <ROS2/Lidar/LidarRaycasterBus.h>
#include <ROS2Sensors/Lidar/LidarRaycasterBus.h>
#include <ROS2Sensors/Lidar/LidarSystemBus.h>

namespace RGL
{
Expand Down
4 changes: 2 additions & 2 deletions Code/Source/Utilities/RGLUtils.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#pragma once

#include <AzCore/Math/Matrix3x4.h>
#include <ROS2/Lidar/RaycastResults.h>
#include <ROS2Sensors/Lidar/RaycastResults.h>
#include <rgl/api/core.h>

namespace RGL::Utils
Expand Down Expand Up @@ -52,4 +52,4 @@ namespace RGL::Utils
{ 0, 0, 1, 0 },
},
};
} // namespace RGL::Utils
} // namespace RGL::Utils
3 changes: 2 additions & 1 deletion gem.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"gem_name": "RGL",
"version": "1.2.0",
"version": "1.3.0",
"platforms": [
"Linux"
],
Expand All @@ -23,6 +23,7 @@
"documentation_url": "",
"dependencies": [
"ROS2>=3.2.0",
"ROS2Sensors",
"LmbrCentral"
],
"restricted": "RGL"
Expand Down