Skip to content

Commit 1c7197c

Browse files
committed
[scene] Added contact detection between the 2 layers
1 parent b3d664a commit 1c7197c

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

scenes/NeedleInsertionLayers.py

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
{
1616
"n":[12, 4, 6],
1717
"min":[-0.350, -0.050, -0.350],
18-
"max":[0.350, 0.050, -0.100]
18+
"max":[0.350, 0.049, -0.100]
1919
},
2020
{
2121
"n":[12, 4, 6],
22-
"min":[-0.350, 0.050, -0.350],
22+
"min":[-0.350, 0.051, -0.350],
2323
"max":[0.350, 0.150, -0.100]
2424
}
2525
] #Again all in mm
@@ -65,11 +65,17 @@ def createScene(root):
6565

6666

6767
root.addObject("ConstraintAttachButtonSetting")
68-
root.addObject("VisualStyle", displayFlags="showVisualModels hideBehaviorModels hideCollisionModels hideMappings hideForceFields hideWireframe showInteractionForceFields" )
68+
root.addObject("VisualStyle", displayFlags="showVisualModels hideBehaviorModels hideCollisionModels hideMappings hideForceFields hideWireframe hideInteractionForceFields")
6969
root.addObject("FreeMotionAnimationLoop")
7070
root.addObject("GenericConstraintSolver", tolerance=0.00001, maxIt=5000)
7171
root.addObject("CollisionLoop")
7272

73+
root.addObject("CollisionPipeline", name="pipeline", depth=6, verbose=0)
74+
root.addObject("BruteForceBroadPhase")
75+
root.addObject("BVHNarrowPhase")
76+
root.addObject("CollisionResponse", response="FrictionContact")
77+
root.addObject("LocalMinDistance", name="proximity", alarmDistance=0.002, contactDistance=0.0005)
78+
7379
#needleBaseMaster = root.addChild("NeedleBaseMaster")
7480
#needleBaseMaster.addObject("MechanicalObject", name="mstate_baseMaster", position=[0.04, 0.04, 0, 0, 0, 0, 1], template="Rigid3d", showObjectScale=0.002, showObject=False, drawMode=1)
7581
#needleBaseMaster.addObject("LinearMovementProjectiveConstraint",indices=[0], keyTimes=[0,1,7,9],movements=
@@ -170,6 +176,10 @@ def createScene(root):
170176
volumeCollision.addObject("PhongTriangleNormalHandler", name="SurfaceTriangles", geometry="@geom_tri")
171177
volumeCollision.addObject("AABBBroadPhase",name="AABBTriangles",thread=1,nbox=[2,2,3])
172178

179+
volumeCollision.addObject("TriangleCollisionModel", name="colli_tri", group=i)
180+
volumeCollision.addObject("LineCollisionModel", name="colli_line", group=i)
181+
volumeCollision.addObject("PointCollisionModel", name="colli_point", group=i)
182+
173183
volumeCollision.addObject("IdentityMapping", name="identityMappingToCollision", input="@../mstate_gel", output="@mstate_gelColi", isMechanical=True)
174184

175185
volumeVisu = volumeCollision.addChild("visu")

0 commit comments

Comments
 (0)