Adjusted RobotecSplineTools To Support 2505 (#123)

* Adjusted RobotecSplineToolsTo2505

Signed-off-by: Michał Pełka <[email protected]>

* Version bump and compatibility marked

Signed-off-by: Norbert Prokopiuk <[email protected]>

---------

Signed-off-by: Michał Pełka <[email protected]>
Signed-off-by: Norbert Prokopiuk <[email protected]>
Co-authored-by: Norbert Prokopiuk <[email protected]>

Author: michalpelka

Gems/RobotecSplineTools/Code/CMakeLists.txt

@@ -54,6 +54,7 @@ ly_add_target(
             Gem::Atom_RPI.Public
             Gem::AtomLyIntegration_CommonFeatures.Static
             Gem::ROS2.Static
+            Gem::LevelGeoreferencing.API
 )
 
 # Here add ${gem_name} target, it depends on the Private Object library and Public API interface

Gems/RobotecSplineTools/Code/Source/Clients/SplineSubscriber.cpp

@@ -3,9 +3,9 @@
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/Serialization/SerializeContext.h>
+#include <Georeferencing/GeoreferenceBus.h>
 #include <LmbrCentral/Scripting/TagComponentBus.h>
 #include <LmbrCentral/Shape/SplineComponentBus.h>
-#include <ROS2/Georeference/GeoreferenceBus.h>
 
 namespace SplineTools
 {
@@ -115,13 +115,14 @@ namespace SplineTools
             }
             else if (frame == "WGS84" && m_config.m_allowWGS84)
             {
-                ROS2::WGS::WGS84Coordinate currentPositionWGS84;
+                using namespace Georeferencing;
+                WGS::WGS84Coordinate currentPositionWGS84;
                 currentPositionWGS84.m_latitude = pose.position.x;
                 currentPositionWGS84.m_longitude = pose.position.y;
                 currentPositionWGS84.m_altitude = pose.position.z;
                 AZ::Vector3 levelPosition{ 0 };
-                ROS2::GeoreferenceRequestsBus::BroadcastResult(
-                    levelPosition, &ROS2::GeoreferenceRequests::ConvertFromWGS84ToLevel, currentPositionWGS84);
+                GeoreferenceRequestsBus::BroadcastResult(
+                    levelPosition, &GeoreferenceRequests::ConvertFromWGS84ToLevel, currentPositionWGS84);
                 points[i] = worldTm.TransformPoint(levelPosition);
             }
             else

Gems/RobotecSplineTools/Code/Source/Tools/SplineToolsEditorComponent.cpp

@@ -3,11 +3,11 @@
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzToolsFramework/UI/UICore/WidgetHelpers.h>
+#include <Georeferencing/GeoreferenceBus.h>
+#include <Georeferencing/GeoreferenceStructures.h>
 #include <LmbrCentral/Shape/SplineComponentBus.h>
 #include <QFileDialog>
 #include <QMessageBox>
-#include <ROS2/Georeference/GeoreferenceBus.h>
-#include <ROS2/Georeference/GeoreferenceStructures.h>
 #include <csv/csv.hpp>
 
 namespace SplineTools
@@ -240,13 +240,13 @@ namespace SplineTools
             {
                 for (csv::CSVRow& row : reader)
                 {
-                    ROS2::WGS::WGS84Coordinate coordinate;
+                    using namespace Georeferencing;
+                    WGS::WGS84Coordinate coordinate;
                     coordinate.m_latitude = row[*indexLat].get<double>();
                     coordinate.m_longitude = row[*indexLon].get<double>();
                     coordinate.m_altitude = row[*indexAlt].get<float>();
                     auto coordinateInLevel = AZ::Vector3(-1);
-                    ROS2::GeoreferenceRequestsBus::BroadcastResult(
-                        coordinateInLevel, &ROS2::GeoreferenceRequests::ConvertFromWGS84ToLevel, coordinate);
+                    GeoreferenceRequestsBus::BroadcastResult(coordinateInLevel, &GeoreferenceRequests::ConvertFromWGS84ToLevel, coordinate);
 
                     ret.emplace_back(AZStd::move(coordinateInLevel));
                 }

Gems/RobotecSplineTools/gem.json

@@ -1,6 +1,6 @@
 {
     "gem_name": "SplineTools",
-    "version": "1.0.0",
+    "version": "2.0.0",
     "display_name": "SplineTools",
     "license": "Apache-2.0",
     "license_url": "https://opensource.org/licenses/Apache-2.0",
@@ -20,9 +20,9 @@
     "icon_path": "preview.png",
     "requirements": "No requirements",
     "documentation_url": "",
-    "dependencies": ["ROS2"],
+    "dependencies": ["ROS2", "LevelGeoreferencing"],
     "repo_uri": "",
-    "compatible_engines": [],
+    "compatible_engines": ["o3de>=2.4.0"],
     "engine_api_dependencies": [],
     "restricted": "SplineTools"
 }

readme.md

@@ -20,7 +20,7 @@ Note that this is not a "Canonical" part of O3DE - those gems are third-party co
 | **RandomizeUtils**         | not verified    |
 | **RobotecRecordingTools**  | not verified    |
 | **RobotecSpectatorCamera** | not verified    |
-| **RobotecSplineTools**     | incompatible    |
+| **RobotecSplineTools**     | compatible      |
 | **RobotecWatchdogTools**   | not verified    |
 | **ROS2PoseControl**        | incompatible    |
 | **ROS2ScriptIntegration**  | not verified    |