Imported upstream version '0.7.6' of 'upstream'

ros-gbp · May 7, 2024 · fd9926a · fd9926a
1 parent 0310155
commit fd9926a
Show file tree

Hide file tree

Showing 22 changed files with 284 additions and 315 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -8,20 +8,21 @@ on:
   pull_request:
   push:
     branches:
+      - noetic-devel
       - melodic-devel
 
 jobs:
   default:
     strategy:
       matrix:
         env:
-          - ROS_DISTRO: kinetic
-            ROS_REPO: main
           - ROS_DISTRO: melodic
             ROS_REPO: main
+          - ROS_DISTRO: noetic
+            ROS_REPO: main
             CLANG_TIDY: pedantic
             CATKIN_LINT: pedantic
-          - ROS_DISTRO: melodic
+          - ROS_DISTRO: noetic
             ROS_REPO: testing
     env:
       CCACHE_DIR: ${{ github.workspace }}/.ccache

diff --git a/.github/workflows/prerelease.yaml b/.github/workflows/prerelease.yaml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        distro: [melodic]
+        distro: [noetic]
 
     env:
       ROS_DISTRO: ${{ matrix.distro }}

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -34,7 +34,7 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/psf/black
-    rev: 20.8b1
+    rev: 22.3.0
     hooks:
       - id: black
 

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,27 +2,56 @@
 Changelog for package geometric_shapes
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-0.6.6 (2023-04-12)
+0.7.6 (2024-05-07)
 ------------------
-* Limit indefinite growth of OBBs during merging (`#233 <https://github.com/ros-planning/geometric_shapes/issues/233>`_)
+* Improve padding of meshes using weighted vertex normals (`#238 <https://github.com/ros-planning/geometric_shapes/issues/238>`_)
+* Drop obsolete C++ standard definition (`#235 <https://github.com/ros-planning/geometric_shapes/issues/235>`_)
+* Contributors: Kenji Brameld (TRACLabs), Michael Görner
+
+0.7.5 (2023-04-12)
+------------------
+* Limit indefinite growth of OBBs during merging (`#232 <https://github.com/ros-planning/geometric_shapes/issues/232>`_)
 * Correctly initialize OBB with default constructor
 * Contributors: Martin Pecka
 
-0.6.5 (2023-03-31)
+0.7.4 (2023-03-31)
 ------------------
-* Add bodies::Body::computeBoundingBox (oriented box version) (`#210 <https://github.com/ros-planning/geometric_shapes/issues/210>`_)
+* Body::getScaledDimensions(): avoid vtable lookup (`#225 <https://github.com/ros-planning/geometric_shapes/issues/225>`_)
+* Add Body::computeBoundingBox (oriented box version) (`#210 <https://github.com/ros-planning/geometric_shapes/issues/210>`_)
 
   This adds the dependency on FCL, provide support for FCL 0.6 if available
-* Add body operations constructShapeFromBody() and constructMarkerFromBody() (`#209 <https://github.com/ros-planning/geometric_shapes/issues/209>`_)
-* Eigen < 3.3.0 needs explicit cast (`#224 <https://github.com/ros-planning/geometric_shapes/issues/224>`_)
-* Contributors: Kei Okada, Martin Pecka, Robert Haschke
+* Contributors: Martin Pecka, Robert Haschke
 
-0.6.4 (2021-05-19)
+0.7.3 (2021-05-19)
 ------------------
 * [fix]   Fix memory leak (`#168 <https://github.com/ros-planning/geometric_shapes/issues/168>`_)
 * [fix]   Use proper Eigen alignment for make_shared calls (`#187 <https://github.com/ros-planning/geometric_shapes/issues/187>`_)
-* [maint] Migrate from Travis to GitHub actions (`#172 <https://github.com/ros-planning/geometric_shapes/issues/172>`_)
-* Contributors: Dave Coleman, Martin Pecka, Robert Haschke, Tyler Weaver
+* [maint] Migrate from Travis to GitHub Actions (`#171 <https://github.com/ros-planning/geometric_shapes/issues/171>`_)
+* Contributors: Robert Haschke, Tyler Weaver
+
+0.7.2 (2020-09-25)
+------------------
+* [maint] Renamed SolidPrimitiveDimCount<shape>::value -> solidPrimitiveDimCount<shape>() (`#121 <https://github.com/ros-planning/geometric_shapes/issues/121>`_)
+* [maint] cmake: Consistently use uppercase letters for QHULL dependency
+* [maint] cmake: Fix assimp warning
+* [maint] Update build badges for Noetic
+* Contributors: Robert Haschke
+
+0.7.1 (2020-08-31)
+------------------
+* [maint] Declare external includes as SYSTEM includes
+* [maint] Migration to reentrant qhull (`#149 <https://github.com/ros-planning/geometric_shapes/issues/149>`_)
+* [maint] Use soname version for library (`#157 <https://github.com/ros-planning/geometric_shapes/issues/157>`_)
+* Contributors: Jochen Sprickerhof, Robert Haschke, Tyler Weaver
+
+0.7.0 (2020-05-25)
+------------------
+* [feature] Added constructShapeFromBody() and constructMarkerFromBody() (`#138 <https://github.com/ros-planning/geometric_shapes/issues/138>`_)
+* [maint]   API cleanup
+  * Improve inlining
+  * ConvexMesh::MeshData as pimpl
+  * Reverted ABI compatibility fixups for Melodic: ed4cf1339cf3765ae9ffa6e6fd111a4e342c5fa2, d582479084a10cac53a7f17e29818b3d8be6161e
+* Contributors: Martin Pecka, Robert Haschke
 
 0.6.3 (2020-05-25)
 ------------------

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,8 +1,6 @@
 cmake_minimum_required(VERSION 3.0.2)
 project(geometric_shapes)
 
-add_compile_options(-std=c++11)
-
 # Set compile options
 set(PROJECT_COMPILE_OPTIONS
   -Wall
@@ -16,7 +14,7 @@ set(PROJECT_COMPILE_OPTIONS
 
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/")
 
-if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
+if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
   message("${PROJECT_NAME}: You did not request a specific build type: Choosing 'Release' for maximum performance")
   set(CMAKE_BUILD_TYPE Release)
 endif()
@@ -80,10 +78,7 @@ catkin_package(
     console_bridge
   )
 
-find_package(Qhull REQUIRED)
-if (HAVE_QHULL_2011)
-  add_definitions(-DGEOMETRIC_SHAPES_HAVE_QHULL_2011)
-endif()
+find_package(QHULL REQUIRED)
 
 include_directories(include)
 include_directories(SYSTEM
@@ -102,6 +97,7 @@ add_library(${PROJECT_NAME}
   src/shapes.cpp
 )
 target_compile_options(${PROJECT_NAME} PRIVATE ${PROJECT_COMPILE_OPTIONS})
+set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})
 
 target_link_libraries(${PROJECT_NAME} ${ASSIMP_LIBRARIES} ${QHULL_LIBRARIES} ${catkin_LIBRARIES} ${console_bridge_LIBRARIES} ${Boost_LIBRARIES} ${LIBFCL_LIBRARIES})
 

diff --git a/README.md b/README.md
@@ -15,12 +15,16 @@ Note: Bodies for meshes compute the convex hull of those meshes in order to prov
 
 Note: [shape_tools](https://github.com/ros-planning/shape_tools) package was recently merged into this package
 
+Note: `bodies::Box::corner1_` was renamed to `minCorner_` and `bodies::Box::corner2_` to `maxCorner_` in Noetic.
+
+Note: `bodies::ConvexMesh::MeshData` was made implementation-private in Noetic and is no longer accessible from the `.h` file.
+
 ## Build Status
 
 GitHub Actions:
-[![Format](https://github.com/ros-planning/geometric_shapes/actions/workflows/format.yaml/badge.svg?branch=melodic-devel)](https://github.com/ros-planning/geometric_shapes/actions/workflows/format.yaml?query=branch%3Amelodic-devel)
-[![CI](https://github.com/ros-planning/geometric_shapes/actions/workflows/ci.yaml/badge.svg?branch=melodic-devel)](https://github.com/ros-planning/geometric_shapes/actions/workflows/ci.yaml?query=branch%3Amelodic-devel)
+[![Format](https://github.com/ros-planning/geometric_shapes/actions/workflows/format.yaml/badge.svg?branch=noetic-devel)](https://github.com/ros-planning/geometric_shapes/actions/workflows/format.yaml?query=branch%3Anoetic-devel)
+[![CI](https://github.com/ros-planning/geometric_shapes/actions/workflows/ci.yaml/badge.svg?branch=noetic-devel)](https://github.com/ros-planning/geometric_shapes/actions/workflows/ci.yaml?query=branch%3Anoetic-devel)
 
-Devel Job: [![Build Status](http://build.ros.org/buildStatus/icon?job=Msrc_uB__geometric_shapes__ubuntu_bionic__source)](http://build.ros.org/view/Msrc_uB/job/Msrc_uB__geometric_shapes__ubuntu_bionic__source)
+Devel Job: [![Build Status](http://build.ros.org/buildStatus/icon?job=Nsrc_uF__geometric_shapes__ubuntu_focal__source)](http://build.ros.org/view/Nsrc_uF/job/Nsrc_uF__geometric_shapes__ubuntu_focal__source)
 
-Debian Job: [![Build Status](http://build.ros.org/buildStatus/icon?job=Mbin_uB64__geometric_shapes__ubuntu_bionic_amd64__binary)](http://build.ros.org/view/Mbin_uB64/job/Mbin_uB64__geometric_shapes__ubuntu_bionic_amd64__binary)
+Debian Job: [![Build Status](http://build.ros.org/buildStatus/icon?job=Nbin_uF64__geometric_shapes__ubuntu_focal_amd64__binary)](http://build.ros.org/view/Nbin_uF64/job/Nbin_uF64__geometric_shapes__ubuntu_focal_amd64__binary)
diff --git a/cmake/FindQhull.cmake → cmake/FindQHULL.cmake b/cmake/FindQhull.cmake → cmake/FindQHULL.cmake
@@ -5,37 +5,20 @@
 # QHULL_FOUND - True if QHULL was found.
 # QHULL_INCLUDE_DIRS - Directories containing the QHULL include files.
 # QHULL_LIBRARIES - Libraries needed to use QHULL.
-# If QHULL_USE_STATIC is specified then look for static libraries ONLY else
-# look for shared ones
 
-set(QHULL_MAJOR_VERSION 6)
-
-if(QHULL_USE_STATIC)
-  set(QHULL_RELEASE_NAME qhullstatic)
-  set(QHULL_DEBUG_NAME qhullstatic_d)
-else(QHULL_USE_STATIC)
-  set(QHULL_RELEASE_NAME qhull_p qhull${QHULL_MAJOR_VERSION} qhull)
-  set(QHULL_DEBUG_NAME qhull_pd qhull${QHULL_MAJOR_VERSION}_d qhull_d${QHULL_MAJOR_VERSION} qhull_d)
-endif(QHULL_USE_STATIC)
+set(QHULL_RELEASE_NAME qhull_r)
+set(QHULL_DEBUG_NAME qhull_rd)
 
 find_file(QHULL_HEADER
-          NAMES libqhull/libqhull.h qhull.h
+          NAMES libqhull_r.h
           HINTS "${QHULL_ROOT}" "$ENV{QHULL_ROOT}" "${QHULL_INCLUDE_DIR}"
           PATHS "$ENV{PROGRAMFILES}/QHull" "$ENV{PROGRAMW6432}/QHull"
-          PATH_SUFFIXES qhull src/libqhull libqhull include)
+          PATH_SUFFIXES libqhull_r)
 
-set(QHULL_HEADER "${QHULL_HEADER}" CACHE INTERNAL "QHull header" FORCE )
+set(QHULL_HEADER "${QHULL_HEADER}" CACHE INTERNAL "QHull header" FORCE)
 
 if(QHULL_HEADER)
-  get_filename_component(qhull_header ${QHULL_HEADER} NAME_WE)
-  if("${qhull_header}" STREQUAL "qhull")
-    set(HAVE_QHULL_2011 OFF)
-    get_filename_component(QHULL_INCLUDE_DIR ${QHULL_HEADER} PATH)
-  elseif("${qhull_header}" STREQUAL "libqhull")
-    set(HAVE_QHULL_2011 ON)
-    get_filename_component(QHULL_INCLUDE_DIR ${QHULL_HEADER} PATH)
-    get_filename_component(QHULL_INCLUDE_DIR ${QHULL_INCLUDE_DIR} PATH)
-  endif()
+  get_filename_component(QHULL_INCLUDE_DIR ${QHULL_HEADER} PATH)
 else(QHULL_HEADER)
   set(QHULL_INCLUDE_DIR "QHULL_INCLUDE_DIR-NOTFOUND")
 endif(QHULL_HEADER)
@@ -62,17 +45,11 @@ set(QHULL_INCLUDE_DIRS ${QHULL_INCLUDE_DIR})
 set(QHULL_LIBRARIES optimized ${QHULL_LIBRARY} debug ${QHULL_LIBRARY_DEBUG})
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Qhull DEFAULT_MSG QHULL_LIBRARY QHULL_INCLUDE_DIR)
+find_package_handle_standard_args(QHULL DEFAULT_MSG QHULL_LIBRARY QHULL_INCLUDE_DIR)
 
 mark_as_advanced(QHULL_LIBRARY QHULL_LIBRARY_DEBUG QHULL_INCLUDE_DIR)
 
 if(QHULL_FOUND)
   set(HAVE_QHULL ON)
-  if(NOT QHULL_USE_STATIC)
-    add_definitions("-Dqh_QHpointer")
-    if(MSVC)
-      add_definitions("-Dqh_QHpointer_dllimport")
-    endif(MSVC)
-  endif(NOT QHULL_USE_STATIC)
   message(STATUS "QHULL found (include: ${QHULL_INCLUDE_DIRS}, lib: ${QHULL_LIBRARIES})")
 endif(QHULL_FOUND)
diff --git a/codecov.yaml b/codecov.yaml
@@ -0,0 +1,10 @@
+coverage:
+  precision: 2
+  round: up
+  range: "45...70"
+  status:
+    project:
+      default:
+        target: auto
+        threshold: 5%
+    patch: off