|
15 | 15 | { |
16 | 16 | "n":[12, 4, 6], |
17 | 17 | "min":[-0.350, -0.050, -0.350], |
18 | | - "max":[0.350, 0.050, -0.100] |
| 18 | + "max":[0.350, 0.049, -0.100] |
19 | 19 | }, |
20 | 20 | { |
21 | 21 | "n":[12, 4, 6], |
22 | | - "min":[-0.350, 0.050, -0.350], |
| 22 | + "min":[-0.350, 0.051, -0.350], |
23 | 23 | "max":[0.350, 0.150, -0.100] |
24 | 24 | } |
25 | 25 | ] #Again all in mm |
@@ -65,11 +65,17 @@ def createScene(root): |
65 | 65 |
|
66 | 66 |
|
67 | 67 | 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") |
69 | 69 | root.addObject("FreeMotionAnimationLoop") |
70 | 70 | root.addObject("GenericConstraintSolver", tolerance=0.00001, maxIt=5000) |
71 | 71 | root.addObject("CollisionLoop") |
72 | 72 |
|
| 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 | + |
73 | 79 | #needleBaseMaster = root.addChild("NeedleBaseMaster") |
74 | 80 | #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) |
75 | 81 | #needleBaseMaster.addObject("LinearMovementProjectiveConstraint",indices=[0], keyTimes=[0,1,7,9],movements= |
@@ -170,6 +176,10 @@ def createScene(root): |
170 | 176 | volumeCollision.addObject("PhongTriangleNormalHandler", name="SurfaceTriangles", geometry="@geom_tri") |
171 | 177 | volumeCollision.addObject("AABBBroadPhase",name="AABBTriangles",thread=1,nbox=[2,2,3]) |
172 | 178 |
|
| 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 | + |
173 | 183 | volumeCollision.addObject("IdentityMapping", name="identityMappingToCollision", input="@../mstate_gel", output="@mstate_gelColi", isMechanical=True) |
174 | 184 |
|
175 | 185 | volumeVisu = volumeCollision.addChild("visu") |
|
0 commit comments