Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

C

coal
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

a743c704

Commit a743c704 authored 9 years ago by Jeongseok Lee

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/master' into fix_inconsistent_normal

Conflicts:
	test/test_fcl_geometric_shapes.cpp

parents 536ef0a3 5dbc1d3c

No related branches found

No related tags found

No related merge requests found

Changes 8

Expand all Hide whitespace changes

Inline Side-by-side

Showing

include/fcl/shape/geometric_shapes_utility.h 18 additions, 1 deletion

include/fcl/shape/geometric_shapes_utility.h
src/BVH/BVH_model.cpp 1 addition, 1 deletion

src/BVH/BVH_model.cpp
src/ccd/conservative_advancement.cpp 32 additions, 0 deletions

src/ccd/conservative_advancement.cpp
src/collision_func_matrix.cpp 26 additions, 0 deletions

src/collision_func_matrix.cpp
src/distance_func_matrix.cpp 26 additions, 0 deletions

src/distance_func_matrix.cpp
test/CMakeLists.txt 1 addition, 0 deletions

test/CMakeLists.txt
test/test_fcl_bvh_models.cpp 224 additions, 0 deletions

test/test_fcl_bvh_models.cpp
test/test_fcl_geometric_shapes.cpp 18 additions, 25 deletions

test/test_fcl_geometric_shapes.cpp

with 346 additions and 27 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment