Skip to content

Commit f57b898

Browse files
committed
[algorithm] Add an experimental component in the algorithm
1 parent 91ad07d commit f57b898

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

src/CollisionAlgorithm/algorithm/InsertionAlgorithm.h

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -200,21 +200,18 @@ class InsertionAlgorithm : public BaseAlgorithm
200200

201201
if (d_projective.getValue())
202202
{
203-
shaftProx =
204-
projectOnShaft(surfProx->getPosition(), itShaft->element()).prox;
203+
//shaftProx =
204+
// projectOnShaft(surfProx->getPosition(), itShaft->element()).prox;
205+
//if (!shaftProx) continue;
206+
//shaftProx->normalize();
207+
// Experimental - This enables projection anywhere on the edge
208+
auto findClosestProxOnShaft =
209+
Operations::FindClosestProximity::Operation::get(l_shaftGeom);
210+
shaftProx = findClosestProxOnShaft(surfProx, l_shaftGeom,
211+
projectOnShaft, getFilterFunc());
205212
if (!shaftProx) continue;
206213
shaftProx->normalize();
207214
}
208-
// Experimental
209-
//else
210-
//{
211-
// auto findClosestProxOnShaft =
212-
// Operations::FindClosestProximity::Operation::get(l_shaftGeom);
213-
// shaftProx = findClosestProxOnShaft(surfProx, l_shaftGeom,
214-
// projectOnShaft, getFilterFunc());
215-
// if (!shaftProx) continue;
216-
// shaftProx->normalize();
217-
//}
218215
collisionOutput.add(shaftProx, surfProx);
219216
}
220217
}

0 commit comments

Comments
 (0)