From 85d1e6d067da03c032b0798690bbec05d0d987a6 Mon Sep 17 00:00:00 2001
From: Alexander Mock <amock@uos.de>
Date: Fri, 19 Jan 2024 01:00:12 +0100
Subject: [PATCH 1/2] after merging the fork. corrected the link to mesh_tools

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6bdbc49..a06265f 100644
--- a/README.md
+++ b/README.md
@@ -76,7 +76,7 @@ Starting the following Launch-File
 runs the MICP localization. After that a pose has to be given, e.g. by the RViz "2D Pose Estimate" Tool that publishes the results on the `/initialpose` topic.
 Doing that, make sure to set the fixed frame to the map coordinate system.
 RMCL itself doesn't provide any tools to visualize the maps (triangle meshes).
-If you want to see the map in RViz, use for example the `rviz_mesh_plugin` of the [mesh_tools](https://github.com/aock/mesh_tools) (loading a standard mesh format is only available in the fork).
+If you want to visualize the map in RViz, use for example the `rviz_mesh_plugin` of the [mesh_tools](https://github.com/naturerobots/mesh_tools).
 
 Once the launch file is started, the output in Terminal should look as follows:
 

From d53d587d4de8e5e9d734ae809235bea8c784f476 Mon Sep 17 00:00:00 2001
From: Alexander Mock <amock@uos.de>
Date: Thu, 1 Feb 2024 23:13:44 +0100
Subject: [PATCH 2/2] fixed compilation for optional embree

---
 CMakeLists.txt                                | 21 +++++++++++--------
 .../correction/PinholeCorrectorOptixROS.hpp   |  2 +-
 .../correction/SphereCorrectorOptixROS.hpp    |  2 +-
 package.xml                                   |  4 ++--
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84cea81..a79980c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.2...10.0)
 project(rmcl
-	VERSION 1.1.4
+	VERSION 1.1.5
 	)
 
 option(BUILD_EXAMPLES "Build Examples" OFF)
@@ -677,15 +677,18 @@ if(RMCL_OPTIX)
 
 endif(RMCL_OPTIX)
 
-
 # BENCHMARKS
-add_executable(rmcl_correction_embree_benchmark
-    src/nodes/benchmarks/lidar_corrector_embree_benchmark.cpp
-)
+if(RMCL_EMBREE)
+    
+    add_executable(rmcl_correction_embree_benchmark
+        src/nodes/benchmarks/lidar_corrector_embree_benchmark.cpp
+    )
 
-target_link_libraries(rmcl_correction_embree_benchmark
-    rmcl_embree
-)
+    target_link_libraries(rmcl_correction_embree_benchmark
+        rmcl_embree
+    )
+
+endif(RMCL_EMBREE)
 
 # add_executable(rmcl_correction_optix_benchmark
 #     src/nodes/lidar_corrector_optix_benchmark.cpp
@@ -693,4 +696,4 @@ target_link_libraries(rmcl_correction_embree_benchmark
 
 # target_link_libraries(rmcl_correction_optix_benchmark
 #     rmcl_optix
-# )
\ No newline at end of file
+# )
diff --git a/include/rmcl/correction/PinholeCorrectorOptixROS.hpp b/include/rmcl/correction/PinholeCorrectorOptixROS.hpp
index b76c985..f2e5950 100644
--- a/include/rmcl/correction/PinholeCorrectorOptixROS.hpp
+++ b/include/rmcl/correction/PinholeCorrectorOptixROS.hpp
@@ -49,7 +49,7 @@
 #include <geometry_msgs/PoseStamped.h>
 
 // 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
index 3aeedfd..849e1be 100644
--- a/include/rmcl/correction/SphereCorrectorOptixROS.hpp
+++ b/include/rmcl/correction/SphereCorrectorOptixROS.hpp
@@ -49,7 +49,7 @@
 #include <geometry_msgs/PoseStamped.h>
 
 // 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
index 6041863..b681cdd 100644
--- a/package.xml
+++ b/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
     <name>rmcl</name>
-    <version>1.0.0</version>
+    <version>1.1.5</version>
     <description>The rmcl package</description>
 
     <maintainer email="amock@uos.de">Alexander Mock</maintainer>
@@ -34,4 +34,4 @@
     <exec_depend>visualization_msgs</exec_depend>
     <depend>rmagine</depend>
     
-</package>
\ No newline at end of file
+</package>