Skip to content

Commit

Permalink
Use GJK for box-box. Not sure why this helps.
Browse files Browse the repository at this point in the history
Without this, the sliding_bricks example in Drake doesn't display
stiction behavior at all.
  • Loading branch information
Andrés Valenzuela committed Jun 1, 2017
1 parent 5645721 commit 5638747
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion include/fcl/narrowphase/detail/gjk_solver_indep-inl.h
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ bool GJKSolver_indep<S>::shapeIntersect(
FCL_GJK_INDEP_SHAPE_SHAPE_INTERSECT_INV(SHAPE1, SHAPE2, ALG)

FCL_GJK_INDEP_SHAPE_INTERSECT(Sphere, detail::sphereSphereIntersect)
FCL_GJK_INDEP_SHAPE_INTERSECT(Box, detail::boxBoxIntersect)
//FCL_GJK_INDEP_SHAPE_INTERSECT(Box, detail::boxBoxIntersect)

FCL_GJK_INDEP_SHAPE_SHAPE_INTERSECT(Sphere, Capsule, detail::sphereCapsuleIntersect)

Expand Down

0 comments on commit 5638747

Please sign in to comment.