From f8b9207d05f5c9fddfb481c13d728c9feeb76875 Mon Sep 17 00:00:00 2001 From: akam-rai <108540351+alek-kam-robotec-ai@users.noreply.github.com> Date: Tue, 23 Jul 2024 11:12:57 +0200 Subject: [PATCH] v17 O3DE integration hotfix (#318) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Move deprecation attribute * Add radar messages package dependency instruction. * Remove deprecated rgl_node_points_compact Signed-off-by: Aleksander Kamiński --------- Signed-off-by: Aleksander Kamiński --- docs/Ros2Extension.md | 1 + include/rgl/api/core.h | 10 ---------- src/api/apiCore.cpp | 20 -------------------- src/tape/TapeCore.hpp | 2 -- 4 files changed, 1 insertion(+), 32 deletions(-) diff --git a/docs/Ros2Extension.md b/docs/Ros2Extension.md index 20c43a9dd..64b38729f 100644 --- a/docs/Ros2Extension.md +++ b/docs/Ros2Extension.md @@ -31,6 +31,7 @@ For some, the process has been automated - run `setup.py --install-ros2-deps` to ```bash apt install -y ros-${ROS_DISTRO}-cyclonedds ros-${ROS_DISTRO}-rmw-cyclonedds-cpp apt install -y ros-${ROS_DISTRO}-fastrtps ros-${ROS_DISTRO}-rmw-fastrtps-cpp + apt install -y ros-${ROS_DISTRO}-radar-msgs apt install patchelf ``` diff --git a/include/rgl/api/core.h b/include/rgl/api/core.h index 3e9dfc2e8..a9d491b0e 100644 --- a/include/rgl/api/core.h +++ b/include/rgl/api/core.h @@ -808,16 +808,6 @@ RGL_API rgl_status_t rgl_node_points_format(rgl_node_t* node, const rgl_field_t* */ RGL_API rgl_status_t rgl_node_points_yield(rgl_node_t* node, const rgl_field_t* fields, int32_t field_count); -/** - * Creates or modifies CompactPointsNode. - * The Node removes non-hit points. In other words, it converts a point cloud into a dense one. - * Graph input: point cloud - * Graph output: point cloud (compacted) - * @param node If (*node) == nullptr, a new Node will be created. Otherwise, (*node) will be modified. - */ -RGL_API [[deprecated("Use rgl_node_points_compact_by_field(rgl_node_t* node, rgl_field_t field) instead.")]] rgl_status_t -rgl_node_points_compact(rgl_node_t* node); - /** * Creates or modifies CompactPointsByFieldNode. * The Node removes points if the given field is set to a non-zero value. diff --git a/src/api/apiCore.cpp b/src/api/apiCore.cpp index a8447dc0d..767a583df 100644 --- a/src/api/apiCore.cpp +++ b/src/api/apiCore.cpp @@ -1046,26 +1046,6 @@ void TapeCore::tape_node_points_yield(const YAML::Node& yamlNode, PlaybackState& state.nodes.insert({nodeId, node}); } -RGL_API rgl_status_t rgl_node_points_compact(rgl_node_t* node) -{ - auto status = rglSafeCall([&]() { - RGL_API_LOG("rgl_node_points_compact(node={})", repr(node)); - CHECK_ARG(node != nullptr); - - createOrUpdateNode(node, RGL_FIELD_IS_HIT_I32); - }); - TAPE_HOOK(node); - return status; -} - -void TapeCore::tape_node_points_compact(const YAML::Node& yamlNode, PlaybackState& state) -{ - auto nodeId = yamlNode[0].as(); - rgl_node_t node = state.nodes.contains(nodeId) ? state.nodes.at(nodeId) : nullptr; - rgl_node_points_compact(&node); - state.nodes.insert({nodeId, node}); -} - RGL_API rgl_status_t rgl_node_points_compact_by_field(rgl_node_t* node, rgl_field_t field) { auto status = rglSafeCall([&]() { diff --git a/src/tape/TapeCore.hpp b/src/tape/TapeCore.hpp index 275900720..6804cdbb8 100644 --- a/src/tape/TapeCore.hpp +++ b/src/tape/TapeCore.hpp @@ -59,7 +59,6 @@ class TapeCore static void tape_node_raytrace_configure_default_intensity(const YAML::Node& yamlNode, PlaybackState& state); static void tape_node_points_format(const YAML::Node& yamlNode, PlaybackState& state); static void tape_node_points_yield(const YAML::Node& yamlNode, PlaybackState& state); - static void tape_node_points_compact(const YAML::Node& yamlNode, PlaybackState& state); static void tape_node_points_compact_by_field(const YAML::Node& yamlNode, PlaybackState& state); static void tape_node_points_spatial_merge(const YAML::Node& yamlNode, PlaybackState& state); static void tape_node_points_temporal_merge(const YAML::Node& yamlNode, PlaybackState& state); @@ -119,7 +118,6 @@ class TapeCore TapeCore::tape_node_raytrace_configure_default_intensity), TAPE_CALL_MAPPING("rgl_node_points_format", TapeCore::tape_node_points_format), TAPE_CALL_MAPPING("rgl_node_points_yield", TapeCore::tape_node_points_yield), - TAPE_CALL_MAPPING("rgl_node_points_compact", TapeCore::tape_node_points_compact), TAPE_CALL_MAPPING("rgl_node_points_compact_by_field", TapeCore::tape_node_points_compact_by_field), TAPE_CALL_MAPPING("rgl_node_points_spatial_merge", TapeCore::tape_node_points_spatial_merge), TAPE_CALL_MAPPING("rgl_node_points_temporal_merge", TapeCore::tape_node_points_temporal_merge),