Skip to content

Commit

Permalink
VS2017 Fix (#277)
Browse files Browse the repository at this point in the history
  • Loading branch information
David I.W. Levin authored and sherm1 committed Apr 8, 2018
1 parent 2b0f911 commit 24cda75
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -746,7 +746,7 @@ typename BV::S ShapeBVHConservativeAdvancement(const CollisionGeometry<typename
CollisionResult<S> c_result;
S toc;

bool is_collide = conservativeAdvancement(*obj1, motion1, *obj2, motion2, nsolver, c_request, c_result, toc);
bool is_collide = conservativeAdvancement<Shape, BV, NarrowPhaseSolver>(*obj1, motion1, *obj2, motion2, nsolver, c_request, c_result, toc);

result.is_collide = is_collide;
result.time_of_contact = toc;
Expand All @@ -768,7 +768,7 @@ typename BV::S BVHShapeConservativeAdvancement(const CollisionGeometry<typename
CollisionResult<S> c_result;
S toc;

bool is_collide = conservativeAdvancement(*obj1, motion1, *obj2, motion2, nsolver, c_request, c_result, toc);
bool is_collide = conservativeAdvancement<BV, Shape, NarrowPhaseSolver>(*obj1, motion1, *obj2, motion2, nsolver, c_request, c_result, toc);

result.is_collide = is_collide;
result.time_of_contact = toc;
Expand Down

0 comments on commit 24cda75

Please sign in to comment.