Skip to content

Commit a5efd32

Browse files
nim65sAnthony Mallet
nim65s
authored and
Anthony Mallet
committed
[path/{py-,}[hpp-fcl -> coal]] Rename hpp-fcl to coal and update to v3.0.0
 ## [3.0.0] - 2024-11-20 ### Added - Renaming the library from `hpp-fcl` to `coal`. Created a `COAL_BACKWARD_COMPATIBILITY_WITH_HPP_FCL` CMake option for retro compatibility. This allows to still do `find_package(hpp-fcl)` and `#include <hpp/fcl/...>` in C++ and it allows to still do `import hppfcl` in python (coal-library/coal#596). - Added `Transform3f::Random` and `Transform3f::setRandom` (coal-library/coal#584) - New feature: computation of contact surfaces for any pair of primitive shapes (triangle, sphere, ellipsoid, plane, halfspace, cone, capsule, cylinder, convex) (coal-library/coal#574). - Enhance Broadphase DynamicAABBTree to better handle planes and halfspace (coal-library/coal#570) - (coal-library/coal#558): - [internal] Removed dead code in `narrowphase/details.h` (coal-library/coal#558) - [internal] Removed specializations of methods of `GJKSolver`. Now the specializations are all handled by `ShapeShapeDistance` in `shape_shape_func.h`. - [new feature] Added support for Swept-Sphere primitives (sphere, box, capsule, cone, ellipsoid, triangle, halfspace, plane, convex mesh). - [API change] Renamed default convergence criterion from `VDB` to `Default` (coal-library/coal#556) - Fixed EPA returning nans on cases where it could return an estimate of the normal and penetration depth. (coal-library/coal#556) - Fixed too low tolerance in GJK/EPA asserts (coal-library/coal#554) - Fixed `normal_and_nearest_points` test (no need to have Eigen 3.4) (coal-library/coal#553) - (coal-library/coal#549) - Optimize EPA: ignore useless faces in EPA's polytope; warm-start support computation for `Convex`; fix edge-cases witness points computation. - Add `Serializable` trait to transform, collision data, collision geometries, bounding volumes, bvh models, hfields. Collision problems can now be serialized from C++ and sent to python and vice versa. - CMake: allow use of installed jrl-cmakemodules (coal-library/coal#564) - CMake: Add compatibility with jrl-cmakemodules workspace (coal-library/coal#610) - Python: add id() support for geometries (coal-library/coal#618). Packaging changes: - renamed package, recursive bump of PKGREVISION - removed patch 522, merged upstream - updated patch aa - replaced common Makefile from HPP to JRL - turned on backward compatibility with hpp-fcl - updated required version to 3.0.0 (coal < 3.0.0 does not exist)
1 parent 6aa05c2 commit a5efd32

File tree

34 files changed

+421
-541
lines changed

34 files changed

+421
-541
lines changed

‎math/hpp-pinocchio/Makefile

+5-4
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,18 @@
22
# Created: Guilhem Saurel on Wed, 14 Mar 2018
33
#
44

5-
HPP_PACKAGE= hpp-pinocchio
6-
HPP_COMMENT= Wrapping of the kinematic/dynamic chain Pinocchio for HPP.
5+
PKGREVISION= 1
6+
HPP_PACKAGE= hpp-pinocchio
7+
HPP_COMMENT= Wrapping of the kinematic/dynamic chain Pinocchio for HPP
78

8-
CATEGORIES= math
9+
CATEGORIES= math
910

1011
include ../../meta-pkgs/hpp/Makefile.common
1112

1213
include ../../mapping/octomap/depend.mk
1314
include ../../math/eigen3/depend.mk
1415
include ../../math/pinocchio/depend.mk
15-
include ../../path/hpp-fcl/depend.mk
16+
include ../../path/coal/depend.mk
1617
include ../../path/hpp-util/depend.mk
1718
include ../../simulation/hpp-environments/depend.mk
1819
include ../../robots/example-robot-data/depend.mk

‎math/hpp-pinocchio/depend.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ SYSTEM_SEARCH.hpp-pinocchio= \
2929
DEPEND_ABI.eigen3 += eigen3>=3.2.92
3030
include ../../math/eigen3/depend.mk
3131
include ../../math/pinocchio/depend.mk
32-
include ../../path/hpp-fcl/depend.mk
32+
include ../../path/coal/depend.mk
3333

3434
endif # HPP_PINOCCHIO_DEPEND_MK ---------------------------------
3535

‎math/pinocchio/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# Created: Olivier Stasse on Thu, 4 Feb 2016
33
#
44

5+
PKGREVISION= 1
56
ORG= stack-of-tasks
67
NAME= pinocchio
78
VERSION= 3.2.0
@@ -36,7 +37,7 @@ endif
3637

3738
include ../../graphics/urdfdom/depend.mk
3839
include ../../math/eigen3/depend.mk
39-
include ../../path/hpp-fcl/depend.mk
40+
include ../../path/coal/depend.mk
4041
include ../../mapping/octomap/depend.mk
4142
include ../../optimization/casadi/depend.mk
4243
include ../../pkgtools/pkg-config/depend.mk

‎math/pinocchio/depend.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
3232
# pulled by the package public headers
3333
include ../../graphics/urdfdom/depend.mk
3434
include ../../math/eigen3/depend.mk
35-
include ../../path/hpp-fcl/depend.mk
35+
include ../../path/coal/depend.mk

‎math/py-pinocchio/Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# Created: Olivier Stasse on Thu, 4 Feb 2016
33
#
44

5+
PKGREVISION= 1
56
ORG= stack-of-tasks
67
NAME= pinocchio
78
VERSION= 3.2.0
@@ -43,8 +44,8 @@ endif
4344

4445
include ../../math/pinocchio/depend.mk
4546
include ../../math/py-eigenpy/depend.mk
46-
include ../../path/hpp-fcl/depend.mk
47-
include ../../path/py-hpp-fcl/depend.mk
47+
include ../../path/coal/depend.mk
48+
include ../../path/py-coal/depend.mk
4849
include ../../mapping/octomap/depend.mk
4950
include ../../optimization/py-casadi/depend.mk
5051
include ../../pkgtools/pkg-config/depend.mk

‎optimization/py-crocoddyl/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# Created: Guilhem Saurel on Tue, 14 Apr 2020
33
#
44

5+
PKGREVISION= 1
56
ORG= loco-3d
67
NAME= crocoddyl
78
VERSION= 2.1.0
@@ -29,7 +30,7 @@ include ../../math/pinocchio/depend.mk
2930
include ../../math/py-eigenpy/depend.mk
3031
include ../../math/py-pinocchio/depend.mk
3132
include ../../optimization/ipopt/depend.mk
32-
include ../../path/hpp-fcl/depend.mk
33+
include ../../path/coal/depend.mk
3334
include ../../pkgtools/pkg-config/depend.mk
3435
include ../../robots/example-robot-data/depend.mk
3536
include ../../robots/py-example-robot-data/depend.mk

‎optimization/py-tsid/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# Created: Guilhem Saurel on Tue, 14 Apr 2020
33
#
44

5+
PKGREVISION= 1
56
ORG= stack-of-tasks
67
NAME= tsid
78
VERSION= 1.7.1
@@ -26,7 +27,7 @@ include ../../math/pinocchio/depend.mk
2627
include ../../math/py-eigenpy/depend.mk
2728
include ../../math/py-pinocchio/depend.mk
2829
include ../../optimization/tsid/depend.mk
29-
include ../../path/hpp-fcl/depend.mk
30+
include ../../path/coal/depend.mk
3031
include ../../mk/sysdep/boost-headers.mk
3132
include ../../mk/sysdep/boost-libs.mk
3233
include ../../mk/sysdep/cmake.mk

‎optimization/tsid/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# Created: Justin Carpentier on Tue, 14 Apr 2020
33
#
44

5+
PKGREVISION= 1
56
ORG= stack-of-tasks
67
NAME= tsid
78
VERSION= 1.7.1
@@ -20,7 +21,7 @@ include ../../mapping/octomap/depend.mk
2021
include ../../math/eigen3/depend.mk
2122
include ../../math/eiquadprog/depend.mk
2223
include ../../math/pinocchio/depend.mk
23-
include ../../path/hpp-fcl/depend.mk
24+
include ../../path/coal/depend.mk
2425
include ../../mk/sysdep/boost-headers.mk
2526
include ../../mk/sysdep/boost-libs.mk
2627
include ../../mk/sysdep/cmake.mk

‎path/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
COMMENT= Path planning algorithms and tools
77

88
SUBDIR+= aspect-genom
9+
SUBDIR+= coal
910
SUBDIR+= hpp-affordance
1011
SUBDIR+= hpp-constraints
1112
SUBDIR+= hpp-core
12-
SUBDIR+= hpp-fcl
1313
SUBDIR+= hpp-manipulation
1414
SUBDIR+= hpp-manipulation-urdf
1515
SUBDIR+= hpp-statistics
@@ -20,11 +20,11 @@ SUBDIR+= libp3d
2020
SUBDIR+= maneuver-genom3
2121
SUBDIR+= ndd-genom
2222
SUBDIR+= p3d-genom
23+
SUBDIR+= py-coal
2324
SUBDIR+= py-hpp-affordance-corba
2425
SUBDIR+= py-hpp-bezier-com-traj
2526
SUBDIR+= py-hpp-centroidal-dynamics
2627
SUBDIR+= py-hpp-corbaserver
27-
SUBDIR+= py-hpp-fcl
2828
SUBDIR+= py-hpp-manipulation-corba
2929

3030
include ../mk/robotpkg.subdir.mk

‎path/hpp-fcl/DESCR ‎path/coal/DESCR

File renamed without changes.

‎path/hpp-fcl/Makefile ‎path/coal/Makefile

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
# robotpkg Makefile for: path/hpp-fcl
1+
# robotpkg Makefile for: path/coal
22
# Created: Florent Lamiraux on Sat, 7 Mar 2015
33
#
44

5-
HPP_PACKAGE= hpp-fcl
6-
HPP_VERSION= 2.4.5
5+
ORG= coal-library
6+
NAME= coal
7+
VERSION= 3.0.0
78

89
CATEGORIES= path
9-
HPP_COMMENT= collision detection and distance computations
10+
COMMENT= collision detection and distance computations
1011
LICENSE= 2-clause-bsd
11-
12-
CONFLICTS+= hpp-fcl04-[0-9]*
13-
14-
include ../../meta-pkgs/hpp/Makefile.common
12+
CONFLICTS+= hpp-fcl-[0-9]*
1513

1614
USE_BOOST_LIBS= thread date_time system filesystem unit_test_framework chrono
15+
USE_MASTER_GITHUB= true
1716

1817
# boost-1.47.0 has -Wconversion warnings in date_time/posix_time/posix_time.hpp
1918
CMAKE_ARGS+= -DCXX_DISABLE_WERROR=yes
2019
CMAKE_ARGS+= -DBUILD_PYTHON_INTERFACE=OFF
20+
CMAKE_ARGS+= -DCOAL_BACKWARD_COMPATIBILITY_WITH_HPP_FCL=ON
2121

22-
DEPEND_ABI.cmake+= cmake>=3.10
22+
include ../../devel/jrl-cmakemodules/Makefile.common
2323

2424
include ../../mk/robotpkg.prefs.mk
2525
ifeq (,$(filter Ubuntu-16.04 Debian-9,${OPSYS}-${OS_VERSION}))
@@ -34,6 +34,7 @@ include ../../math/eigen3/depend.mk
3434
include ../../mk/sysdep/assimp.mk
3535
include ../../mk/sysdep/boost-headers.mk
3636
include ../../mk/sysdep/boost-libs.mk
37+
include ../../mk/sysdep/cmake.mk
3738
include ../../mk/language/c.mk
3839
include ../../mk/language/c++.mk
3940
include ../../mk/robotpkg.mk

0 commit comments

Comments
 (0)