formatting
This commit is contained in:
parent
b60b799199
commit
d9fa9e04de
@ -837,7 +837,7 @@ CLD_ClosestPointData CLD_ClosestPointDataFromShapes(CLD_Shape *shape0, CLD_Shape
|
|||||||
CLD_GjkData gjk_result = ZI;
|
CLD_GjkData gjk_result = ZI;
|
||||||
CLD_EpaData epa_result = ZI;
|
CLD_EpaData epa_result = ZI;
|
||||||
|
|
||||||
/* Run GJK */
|
//- Run GJK
|
||||||
#if COLLIDER_DEBUG
|
#if COLLIDER_DEBUG
|
||||||
gjk_result = CLD_GjkDataFromShapes(shape0, shape1, xf0, xf1, min_unique_pt_dist_sq, dbg_step);
|
gjk_result = CLD_GjkDataFromShapes(shape0, shape1, xf0, xf1, min_unique_pt_dist_sq, dbg_step);
|
||||||
dbg_step = gjk_result.dbg_step;
|
dbg_step = gjk_result.dbg_step;
|
||||||
@ -846,7 +846,7 @@ CLD_ClosestPointData CLD_ClosestPointDataFromShapes(CLD_Shape *shape0, CLD_Shape
|
|||||||
#endif
|
#endif
|
||||||
CLD_DBGSTEP;
|
CLD_DBGSTEP;
|
||||||
|
|
||||||
/* Run EPA */
|
//- Run EPA
|
||||||
#if COLLIDER_DEBUG
|
#if COLLIDER_DEBUG
|
||||||
epa_result = CLD_EpaDataFromShapes(shape0, shape1, xf0, xf1, gjk_result, min_unique_pt_dist_sq, max_epa_iterations, dbg_step);
|
epa_result = CLD_EpaDataFromShapes(shape0, shape1, xf0, xf1, gjk_result, min_unique_pt_dist_sq, max_epa_iterations, dbg_step);
|
||||||
dbg_step = epa_result.dbg_step;
|
dbg_step = epa_result.dbg_step;
|
||||||
@ -855,10 +855,7 @@ CLD_ClosestPointData CLD_ClosestPointDataFromShapes(CLD_Shape *shape0, CLD_Shape
|
|||||||
#endif
|
#endif
|
||||||
CLD_DBGSTEP;
|
CLD_DBGSTEP;
|
||||||
|
|
||||||
/* ========================== *
|
//- Resolve points
|
||||||
* Resolve points
|
|
||||||
* ========================== */
|
|
||||||
|
|
||||||
colliding = gjk_result.overlapping;
|
colliding = gjk_result.overlapping;
|
||||||
CLD_MenkowskiFeature f = epa_result.closest_feature;
|
CLD_MenkowskiFeature f = epa_result.closest_feature;
|
||||||
if (f.len == 1)
|
if (f.len == 1)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user