Merge remote-tracking branch 'upstream/master' into bvh_model_addvertex
Conflicts: test/test_fcl_utility.cpp test/test_fcl_utility.h
Showing
- include/fcl/math/transform.h 6 additions, 0 deletionsinclude/fcl/math/transform.h
- include/fcl/shape/geometric_shapes_utility.h 18 additions, 1 deletioninclude/fcl/shape/geometric_shapes_utility.h
- src/ccd/conservative_advancement.cpp 32 additions, 0 deletionssrc/ccd/conservative_advancement.cpp
- src/collision_func_matrix.cpp 26 additions, 0 deletionssrc/collision_func_matrix.cpp
- src/distance_func_matrix.cpp 26 additions, 0 deletionssrc/distance_func_matrix.cpp
- test/test_fcl_geometric_shapes.cpp 948 additions, 663 deletionstest/test_fcl_geometric_shapes.cpp
- test/test_fcl_utility.cpp 10 additions, 0 deletionstest/test_fcl_utility.cpp
- test/test_fcl_utility.h 2 additions, 0 deletionstest/test_fcl_utility.h
Loading
Please register or sign in to comment