[algorithm] Absorb the FindClosestProximity for shaft collision

th-skam · th-skam · commit 5352fb4887a0 · 2025-09-22T11:06:54.000+02:00
diff --git a/src/CollisionAlgorithm/algorithm/InsertionAlgorithm.h b/src/CollisionAlgorithm/algorithm/InsertionAlgorithm.h
@@ -205,6 +205,15 @@ class InsertionAlgorithm : public BaseAlgorithm
                             if (!shaftProx) continue;
                             shaftProx->normalize();
                         }
+                        else
+                        {
+                            auto findClosestProxOnShaft =
+                                Operations::FindClosestProximity::Operation::get(l_shaftGeom);
+                            shaftProx = findClosestProxOnShaft(surfProx, l_shaftGeom,
+                                                               projectOnShaft, getFilterFunc());
+                            if (!shaftProx) continue;
+                            shaftProx->normalize();
+                        }
                         collisionOutput.add(shaftProx, surfProx);
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -205,6 +205,15 @@ class InsertionAlgorithm : public BaseAlgorithm`
`205`	`205`	`if (!shaftProx) continue;`
`206`	`206`	`shaftProx->normalize();`
`207`	`207`	`}`
	`208`	`+ else`
	`209`	`+ {`
	`210`	`+ auto findClosestProxOnShaft =`
	`211`	`+ Operations::FindClosestProximity::Operation::get(l_shaftGeom);`
	`212`	`+ shaftProx = findClosestProxOnShaft(surfProx, l_shaftGeom,`
	`213`	`+ projectOnShaft, getFilterFunc());`
	`214`	`+ if (!shaftProx) continue;`
	`215`	`+ shaftProx->normalize();`
	`216`	`+ }`
`208`	`217`	`collisionOutput.add(shaftProx, surfProx);`
`209`	`218`	`}`
`210`	`219`	`}`