From 47514fc522e686812b77f219507f11378b1c65d9 Mon Sep 17 00:00:00 2001 From: Alexander Mock Date: Fri, 23 Jan 2026 12:37:11 +0100 Subject: [PATCH] used new lvr2 cmake targets. updated maintainers. increased patch version --- README.md | 1 - cvp_mesh_planner/CHANGELOG.rst | 5 +++++ cvp_mesh_planner/CMakeLists.txt | 7 +++---- cvp_mesh_planner/package.xml | 10 ++++++---- dijkstra_mesh_planner/CHANGELOG.rst | 5 +++++ dijkstra_mesh_planner/CMakeLists.txt | 6 +++--- dijkstra_mesh_planner/package.xml | 10 ++++++---- mbf_mesh_core/CHANGELOG.rst | 5 +++++ mbf_mesh_core/package.xml | 10 ++++++---- mbf_mesh_nav/CHANGELOG.rst | 5 +++++ mbf_mesh_nav/CMakeLists.txt | 10 +++++----- mbf_mesh_nav/package.xml | 9 +++++---- mesh_controller/CHANGELOG.rst | 5 +++++ mesh_controller/CMakeLists.txt | 6 +++--- mesh_controller/package.xml | 11 +++++++---- mesh_layers/CHANGELOG.rst | 5 +++++ mesh_layers/CMakeLists.txt | 8 +++----- mesh_layers/package.xml | 10 ++++++---- mesh_map/CHANGELOG.rst | 5 +++++ mesh_map/CMakeLists.txt | 13 ++++++------- mesh_map/include/mesh_map/util.h | 4 ++-- mesh_map/package.xml | 8 +++++--- mesh_map/src/mesh_map.cpp | 1 + mesh_navigation/CHANGELOG.rst | 4 ++++ mesh_navigation/package.xml | 10 ++++++---- source_dependencies.yaml | 2 +- 26 files changed, 113 insertions(+), 62 deletions(-) diff --git a/README.md b/README.md index 334d078..5d23558 100644 --- a/README.md +++ b/README.md @@ -155,7 +155,6 @@ For the necessary localization of the robot relative to the mesh, we recommend u We are happy to receive improvements to the mesh navigation stack. Just open an issue. PRs are welcome! Maintainers: -* [Matthias Holoch](mailto:matthias.holoch@naturerobots.com) (Nature Robots) * [Alexander Mock](https://github.com/amock) (Nature Robots) * [Justus Braun](https://github.com/justusbraun) (Osnabrück University) diff --git a/cvp_mesh_planner/CHANGELOG.rst b/cvp_mesh_planner/CHANGELOG.rst index fc0b362..0507c3f 100644 --- a/cvp_mesh_planner/CHANGELOG.rst +++ b/cvp_mesh_planner/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog for package cvp_mesh_planner ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +3.0.1 (2026-08-15) +------------------ +* Update maintainer information +* Use lvr2 cmake targets + 3.0.0 (2025-09-10) ------------------ * Cost-aware planning diff --git a/cvp_mesh_planner/CMakeLists.txt b/cvp_mesh_planner/CMakeLists.txt index 876769e..d109576 100644 --- a/cvp_mesh_planner/CMakeLists.txt +++ b/cvp_mesh_planner/CMakeLists.txt @@ -14,19 +14,18 @@ find_package(mbf_msgs REQUIRED) find_package(mbf_utility REQUIRED) find_package(mesh_map REQUIRED) find_package(rclcpp REQUIRED) -find_package(LVR2 REQUIRED) +find_package(lvr2 REQUIRED) pluginlib_export_plugin_description_file(mbf_mesh_core cvp_mesh_planner.xml) add_library(${PROJECT_NAME} src/cvp_mesh_planner.cpp) target_include_directories(${PROJECT_NAME} PUBLIC $ - $ - ${LVR2_INCLUDE_DIRS}) + $) target_compile_definitions(${PROJECT_NAME} PRIVATE "CVP_MESH_PLANNER_BUILDING_LIBRARY") ament_target_dependencies(${PROJECT_NAME} mbf_mesh_core mbf_msgs mbf_utility mesh_map rclcpp) target_link_libraries(${PROJECT_NAME} - ${LVR2_LIBRARIES} + lvr2::lvr2 ${MPI_CXX_LIBRARIES} ) diff --git a/cvp_mesh_planner/package.xml b/cvp_mesh_planner/package.xml index 205ce0d..19c8a22 100644 --- a/cvp_mesh_planner/package.xml +++ b/cvp_mesh_planner/package.xml @@ -1,12 +1,14 @@ cvp_mesh_planner - 3.0.0 + 3.0.1 The Continuous Vector Field Planner (CVP) mesh planner package - Matthias Holoch - Sebastian Pütz - BSD 3-Clause + Alexander Mock + Justus Braun + BSD-3-Clause Sebastian Pütz + Alexander Mock + Justus Braun rclcpp mbf_mesh_core diff --git a/dijkstra_mesh_planner/CHANGELOG.rst b/dijkstra_mesh_planner/CHANGELOG.rst index 7d6dfd9..3952819 100644 --- a/dijkstra_mesh_planner/CHANGELOG.rst +++ b/dijkstra_mesh_planner/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog for package dijkstra_mesh_planner ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +3.0.1 (2026-08-15) +------------------ +* Update maintainer information +* Use lvr2 cmake targets + 3.0.0 (2025-09-10) ------------------ * Cost-aware planning diff --git a/dijkstra_mesh_planner/CMakeLists.txt b/dijkstra_mesh_planner/CMakeLists.txt index cfd2399..3be3e68 100644 --- a/dijkstra_mesh_planner/CMakeLists.txt +++ b/dijkstra_mesh_planner/CMakeLists.txt @@ -14,7 +14,7 @@ find_package(mbf_msgs REQUIRED) find_package(mbf_utility REQUIRED) find_package(mesh_map REQUIRED) find_package(rclcpp REQUIRED) -find_package(LVR2 REQUIRED) +find_package(lvr2 REQUIRED) pluginlib_export_plugin_description_file(mbf_mesh_core dijkstra_mesh_planner.xml) @@ -24,11 +24,11 @@ add_library(${PROJECT_NAME} target_include_directories(${PROJECT_NAME} PUBLIC $ $ - ${LVR2_INCLUDE_DIRS}) +) target_compile_definitions(${PROJECT_NAME} PRIVATE "DIJKSTRA_MESH_PLANNER_BUILDING_LIBRARY") ament_target_dependencies(${PROJECT_NAME} mbf_mesh_core mbf_msgs mbf_utility mesh_map rclcpp) target_link_libraries(${PROJECT_NAME} - ${LVR2_LIBRARIES} + lvr2::lvr2 ${MPI_CXX_LIBRARIES} ) diff --git a/dijkstra_mesh_planner/package.xml b/dijkstra_mesh_planner/package.xml index b2b3b7f..91eb3d5 100644 --- a/dijkstra_mesh_planner/package.xml +++ b/dijkstra_mesh_planner/package.xml @@ -1,12 +1,14 @@ dijkstra_mesh_planner - 3.0.0 + 3.0.1 The dijkstra_mesh_planner package - Matthias Holoch - Sebastian Pütz - BSD-3 + Alexander Mock + Justus Braun + BSD-3-Clause Sebastian Pütz + Alexander Mock + Justus Braun rclcpp mbf_mesh_core diff --git a/mbf_mesh_core/CHANGELOG.rst b/mbf_mesh_core/CHANGELOG.rst index 3fbc298..e7c3822 100644 --- a/mbf_mesh_core/CHANGELOG.rst +++ b/mbf_mesh_core/CHANGELOG.rst @@ -1,6 +1,11 @@ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Changelog for package mbf_mesh_core ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +3.0.1 (2026-08-15) +------------------ +* Update maintainer information + 3.0.0 (2025-09-10) ------------------ diff --git a/mbf_mesh_core/package.xml b/mbf_mesh_core/package.xml index b251bc5..390f46d 100644 --- a/mbf_mesh_core/package.xml +++ b/mbf_mesh_core/package.xml @@ -1,14 +1,16 @@ mbf_mesh_core - 3.0.0 + 3.0.1 The mbf_mesh_core package - Matthias Holoch - Sebastian Pütz + Alexander Mock + Justus Braun - BSD-3 + BSD-3-Clause Sebastian Pütz + Alexander Mock + Justus Braun mbf_abstract_core mesh_map diff --git a/mbf_mesh_nav/CHANGELOG.rst b/mbf_mesh_nav/CHANGELOG.rst index f4f96ad..94b5d78 100644 --- a/mbf_mesh_nav/CHANGELOG.rst +++ b/mbf_mesh_nav/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog for package mbf_mesh_nav ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +3.0.1 (2026-08-15) +------------------ +* Update maintainer information +* Use lvr2 cmake targets + 3.0.0 (2025-09-10) ------------------ * Multi-threaded executor diff --git a/mbf_mesh_nav/CMakeLists.txt b/mbf_mesh_nav/CMakeLists.txt index 1e499df..030adb6 100644 --- a/mbf_mesh_nav/CMakeLists.txt +++ b/mbf_mesh_nav/CMakeLists.txt @@ -34,7 +34,7 @@ include_directories( include ) -find_package(LVR2 REQUIRED) +find_package(lvr2 REQUIRED) find_package(MPI) find_package(PkgConfig REQUIRED) pkg_check_modules(JSONCPP jsoncpp) @@ -52,11 +52,11 @@ add_library(mbf_mesh_server target_include_directories(mbf_mesh_server PUBLIC $ $ - ${LVR2_INCLUDE_DIRS}) +) ament_target_dependencies(mbf_mesh_server ${dependencies}) target_link_libraries(mbf_mesh_server ${JSONCPP_LIBRARIES} - ${LVR2_LIBRARIES} + lvr2::lvr2 ${MPI_CXX_LIBRARIES} ) @@ -65,9 +65,9 @@ ament_target_dependencies(${PROJECT_NAME} ${dependencies} ${${PROJECT_NAME}_EXPO target_include_directories(${PROJECT_NAME} PUBLIC $ $ - ${LVR2_INCLUDE_DIRS}) +) target_link_libraries(${PROJECT_NAME} - ${LVR2_LIBRARIES} + lvr2::lvr2 ${MPI_CXX_LIBRARIES} ${JSONCPP_LIBRARIES} mbf_mesh_server diff --git a/mbf_mesh_nav/package.xml b/mbf_mesh_nav/package.xml index 1348b49..aff603b 100644 --- a/mbf_mesh_nav/package.xml +++ b/mbf_mesh_nav/package.xml @@ -1,14 +1,15 @@ mbf_mesh_nav - 3.0.0 + 3.0.1 The mbf_mesh_nav package - Matthias Holoch - Sebastian Pütz + Alexander Mock + Justus Braun - BSD-3 + BSD-3-Clause Sebastian Pütz + Alexander Mock geometry_msgs mbf_abstract_nav diff --git a/mesh_controller/CHANGELOG.rst b/mesh_controller/CHANGELOG.rst index 3047672..faa5e4d 100644 --- a/mesh_controller/CHANGELOG.rst +++ b/mesh_controller/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog for package mesh_controller ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +3.0.1 (2026-08-15) +------------------ +* Update maintainer information +* Use lvr2 cmake targets + 3.0.0 (2025-09-10) ------------------ diff --git a/mesh_controller/CMakeLists.txt b/mesh_controller/CMakeLists.txt index 529bcaa..076f402 100644 --- a/mesh_controller/CMakeLists.txt +++ b/mesh_controller/CMakeLists.txt @@ -16,7 +16,7 @@ find_package(mbf_utility REQUIRED) find_package(mesh_map REQUIRED) find_package(rclcpp REQUIRED) find_package(tf2_geometry_msgs REQUIRED) -find_package(LVR2 REQUIRED) +find_package(lvr2 REQUIRED) find_package(MPI) pluginlib_export_plugin_description_file(mbf_mesh_core mesh_controller.xml) @@ -25,11 +25,11 @@ add_library(${PROJECT_NAME} src/mesh_controller.cpp) target_include_directories(${PROJECT_NAME} PUBLIC $ $ - ${LVR2_INCLUDE_DIRS}) +) target_compile_definitions(${PROJECT_NAME} PRIVATE "MESH_CONTROLLER_BUILDING_LIBRARY") ament_target_dependencies(${PROJECT_NAME} example_interfaces mbf_mesh_core mbf_msgs mbf_utility mesh_map rclcpp tf2_geometry_msgs) target_link_libraries(${PROJECT_NAME} - ${LVR2_LIBRARIES} + lvr2::lvr2 ${MPI_CXX_LIBRARIES} ) diff --git a/mesh_controller/package.xml b/mesh_controller/package.xml index 8c5271e..f9a4370 100644 --- a/mesh_controller/package.xml +++ b/mesh_controller/package.xml @@ -1,14 +1,17 @@ mesh_controller - 3.0.0 + 3.0.1 The mesh_controller package - Matthias Holoch - Sebastian Pütz - BSD-3 + Alexander Mock + Justus Braun + + BSD-3-Clause Sebastian Pütz Sabrina Frohn + Alexander Mock + Justus Braun mbf_mesh_core mbf_msgs diff --git a/mesh_layers/CHANGELOG.rst b/mesh_layers/CHANGELOG.rst index 5594214..1314a20 100644 --- a/mesh_layers/CHANGELOG.rst +++ b/mesh_layers/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog for package mesh_layers ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +3.0.1 (2026-08-15) +------------------ +* Update maintainer information +* Use lvr2 cmake targets + 3.0.0 (2025-09-10) ------------------ * Graph Layer System diff --git a/mesh_layers/CMakeLists.txt b/mesh_layers/CMakeLists.txt index 4f15d31..1c6fcd6 100644 --- a/mesh_layers/CMakeLists.txt +++ b/mesh_layers/CMakeLists.txt @@ -10,9 +10,8 @@ endif() find_package(ament_cmake_ros REQUIRED) find_package(mesh_map REQUIRED) -find_package(LVR2 REQUIRED) +find_package(lvr2 REQUIRED) find_package(OpenMP) -add_definitions(${LVR2_DEFINITIONS}) pluginlib_export_plugin_description_file(mesh_map mesh_layers.xml) @@ -29,7 +28,6 @@ add_library(${PROJECT_NAME} ) include_directories( include - ${LVR2_INCLUDE_DIRS} ) target_compile_features(${PROJECT_NAME} PUBLIC c_std_99 cxx_std_17) # Require C99 and C++17 @@ -37,10 +35,10 @@ target_include_directories(${PROJECT_NAME} PUBLIC $ $) -ament_target_dependencies(${PROJECT_NAME} mesh_map LVR2) +ament_target_dependencies(${PROJECT_NAME} mesh_map lvr2) target_compile_definitions(${PROJECT_NAME} PRIVATE "MESH_LAYERS_BUILDING_LIBRARY") target_link_libraries(${PROJECT_NAME} - ${LVR2_LIBRARIES} + lvr2::lvr2 OpenMP::OpenMP_CXX ) diff --git a/mesh_layers/package.xml b/mesh_layers/package.xml index 47e82da..4d1cd6e 100644 --- a/mesh_layers/package.xml +++ b/mesh_layers/package.xml @@ -1,14 +1,16 @@ mesh_layers - 3.0.0 + 3.0.1 The mesh_layers package - Matthias Holoch - Sebastian Pütz - + Alexander Mock + Justus Braun + BSD-3 Sebastian Pütz + Alexander Mock + Justus Braun mesh_map lvr2 diff --git a/mesh_map/CHANGELOG.rst b/mesh_map/CHANGELOG.rst index 1f0e6d0..236264c 100644 --- a/mesh_map/CHANGELOG.rst +++ b/mesh_map/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog for package mesh_map ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +3.0.1 (2026-08-15) +------------------ +* Update maintainer information +* Use lvr2 cmake targets + 3.0.0 (2025-09-10) ------------------ * Graph Layer System diff --git a/mesh_map/CMakeLists.txt b/mesh_map/CMakeLists.txt index 8299f7a..4184e88 100644 --- a/mesh_map/CMakeLists.txt +++ b/mesh_map/CMakeLists.txt @@ -25,7 +25,7 @@ foreach(dep IN LISTS dependencies) find_package(${dep} REQUIRED) endforeach() -find_package(LVR2 REQUIRED) +find_package(lvr2 REQUIRED) find_package(assimp REQUIRED) find_package(MPI) find_package(PkgConfig REQUIRED) @@ -33,7 +33,6 @@ pkg_check_modules(JSONCPP jsoncpp) include_directories( include - ${LVR2_INCLUDE_DIRS} ) add_library(${PROJECT_NAME} @@ -49,13 +48,13 @@ target_include_directories(${PROJECT_NAME} PUBLIC ${ASSIMP_INCLUDE_DIRS}) ament_target_dependencies(${PROJECT_NAME} ${dependencies}) target_link_libraries(${PROJECT_NAME} - ${LVR2_LIBRARIES} + lvr2::lvr2 ${ASSIMP_LIBRARIES} ) -target_compile_definitions(${PROJECT_NAME} - PUBLIC - ${LVR2_DEFINITIONS} -) +# target_compile_definitions(${PROJECT_NAME} +# PUBLIC +# ${LVR2_DEFINITIONS} +# ) install(DIRECTORY include/ DESTINATION include diff --git a/mesh_map/include/mesh_map/util.h b/mesh_map/include/mesh_map/util.h index dad8c2b..ea0ccaa 100644 --- a/mesh_map/include/mesh_map/util.h +++ b/mesh_map/include/mesh_map/util.h @@ -170,7 +170,7 @@ bool barycentricCoords(const Vector& p, const Vector& v0, const Vector& v1, cons /** * @brief Computes a linear combination of vertex properties and the barycentric coordinates - * @tparam T The value to combine with barycentric coordinates, it must support the star/*-operator + * @tparam T The value to combine with barycentric coordinates, it must support the star\*-operator * @param vertex_properties The vertex properties of a triangle * @param barycentric_coords The barycentric coordinates * @return The linear combined value, e.g. a vector, or cost value @@ -185,7 +185,7 @@ T linearCombineBarycentricCoords(const std::array& vertex_properties, /** * @brief Computes a linear combination of vertex properties and the barycentric coordinates - * @tparam T The value to combine with barycentric coordinates, it must support the star/*-operator + * @tparam T The value to combine with barycentric coordinates, it must support the star\*-operator * @param vertices The three vertex handles of a triangle * @param attribute_map An attribute map to access with the given vertex handles * @param barycentric_coords The barycentric coordinates diff --git a/mesh_map/package.xml b/mesh_map/package.xml index 2bd4e87..7dff996 100644 --- a/mesh_map/package.xml +++ b/mesh_map/package.xml @@ -1,12 +1,14 @@ mesh_map - 3.0.0 + 3.0.1 The mesh_map package - Matthias Holoch - Sebastian Pütz + Alexander Mock + Justus Braun BSD 3-Clause Sebastian Pütz + Alexander Mock + Justus Braun geometry_msgs mesh_msgs_conversions diff --git a/mesh_map/src/mesh_map.cpp b/mesh_map/src/mesh_map.cpp index 74b50b9..44e7be9 100644 --- a/mesh_map/src/mesh_map.cpp +++ b/mesh_map/src/mesh_map.cpp @@ -59,6 +59,7 @@ #ifdef LVR2_USE_EMBREE #include #else + #pragma message("[WARNING] MeshMap: No Embree found. Using fallback raycaster. (SLOWER!)") #include #endif diff --git a/mesh_navigation/CHANGELOG.rst b/mesh_navigation/CHANGELOG.rst index daa22f1..eb431e4 100644 --- a/mesh_navigation/CHANGELOG.rst +++ b/mesh_navigation/CHANGELOG.rst @@ -2,6 +2,10 @@ Changelog for package mesh_navigation ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +3.0.1 (2026-08-15) +------------------ +* Update maintainer information + 3.0.0 (2025-09-10) ------------------ diff --git a/mesh_navigation/package.xml b/mesh_navigation/package.xml index 86b40e9..32784b3 100644 --- a/mesh_navigation/package.xml +++ b/mesh_navigation/package.xml @@ -1,12 +1,14 @@ mesh_navigation - 3.0.0 + 3.0.1 The mesh_navigation package provides a layered mesh_map implementation, a Move Base Flex mesh navigation server, as well as mesh navigation plugins for path planning and navigation control. - Matthias Holoch - Sebastian Pütz - BSD-3 + Alexander Mock + Justus Braun + BSD-3-Clause Sebastian Pütz + Alexander Mock + Justus Braun mbf_mesh_core mbf_mesh_nav diff --git a/source_dependencies.yaml b/source_dependencies.yaml index 332f1b9..f0c3063 100644 --- a/source_dependencies.yaml +++ b/source_dependencies.yaml @@ -12,4 +12,4 @@ repositories: move_base_flex: type: git url: https://github.com/naturerobots/move_base_flex.git - version: humble + version: ros2