merged main into humble

uos · Feb 11, 2024 · 11de6cb · 11de6cb
2 parents be2a3be + d53d587
commit 11de6cb
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 3.18)
 project(rmcl
-	VERSION 2.0.0
-	)
+	VERSION 2.0.0)
 
 option(BUILD_EXAMPLES "Build Examples" OFF)
 option(BUILD_EXPERIMENTAL "Build Experimental Code" OFF)
@@ -739,5 +738,4 @@ endif(BUILD_MICP_EXPERIMENTS)
 # #     rmcl_optix
 # # )
 
-
 ament_package()
diff --git a/include/rmcl/correction/PinholeCorrectorOptixROS.hpp b/include/rmcl/correction/PinholeCorrectorOptixROS.hpp
@@ -51,7 +51,7 @@
 #include <geometry_msgs/msg/pose_stamped.hpp>
 
 // Rmagine deps
-#include <rmagine/map/EmbreeMap.hpp>
+#include <rmagine/map/OptixMap.hpp>
 
 // Internal deps
 #include "PinholeCorrectorOptix.hpp"

diff --git a/include/rmcl/correction/SphereCorrectorOptixROS.hpp b/include/rmcl/correction/SphereCorrectorOptixROS.hpp
@@ -51,7 +51,7 @@
 #include <geometry_msgs/msg/pose_stamped.hpp>
 
 // Rmagine deps
-#include <rmagine/map/EmbreeMap.hpp>
+#include <rmagine/map/OptixMap.hpp>
 
 // Internal deps
 #include "SphereCorrectorOptix.hpp"

diff --git a/package.xml b/package.xml
@@ -3,7 +3,7 @@
 <package format="3">
     <name>rmcl</name>
     <version>2.0.0</version>
-    <description>The rmcl package</description>
+    <description>The RMCL package. Software Tools for Mobile Robot Localization in 3D Meshes.</description>
 
     <maintainer email="amock@uos.de">Alexander Mock</maintainer>
 
@@ -24,5 +24,4 @@
     <export>
         <build_type>ament_cmake</build_type>
     </export>
-
-</package>
+</package>