diff --git a/examples/3instruments_collis.scn b/examples/3instruments_collis.scn index 98cf3c4b0..ea5c8b58c 100644 --- a/examples/3instruments_collis.scn +++ b/examples/3instruments_collis.scn @@ -109,8 +109,8 @@ - - + + diff --git a/examples/SingleBeamDeploymentCollision.scn b/examples/SingleBeamDeploymentCollision.scn index 8a2c494fc..6c6cd5f53 100644 --- a/examples/SingleBeamDeploymentCollision.scn +++ b/examples/SingleBeamDeploymentCollision.scn @@ -66,8 +66,8 @@ - - + + diff --git a/examples/python3/SingleBeamDeploymentCollision.py b/examples/python3/SingleBeamDeploymentCollision.py index 09f80a18f..f56869dde 100644 --- a/examples/python3/SingleBeamDeploymentCollision.py +++ b/examples/python3/SingleBeamDeploymentCollision.py @@ -63,8 +63,8 @@ def createScene(rootNode): BeamCollis.addObject('EdgeSetTopologyModifier', name='colliseEdgeModifier') BeamCollis.addObject('MechanicalObject', name='CollisionDOFs') BeamCollis.addObject('MultiAdaptiveBeamMapping', controller='../DeployController', useCurvAbs=True, printLog=False, name='collisMap') - BeamCollis.addObject('LineCollisionModel', proximity=0.0) - BeamCollis.addObject('PointCollisionModel', proximity=0.0) + BeamCollis.addObject('LineCollisionModel', contactDistance=0.0) + BeamCollis.addObject('PointCollisionModel', contactDistance=0.0) Carotids = rootNode.addChild('Carotids') Carotids.addObject('MeshSTLLoader', filename='../mesh/carotids.stl', flipNormals=False, triangulate=True, name='meshLoader', rotation=[10.0, 0.0, -90.0]) diff --git a/examples/python3/beamadapter/parts/instrument.py b/examples/python3/beamadapter/parts/instrument.py index 2fab3fed0..aa2249a6b 100644 --- a/examples/python3/beamadapter/parts/instrument.py +++ b/examples/python3/beamadapter/parts/instrument.py @@ -101,8 +101,8 @@ def createInstrumentsCombined(node, xtip=[1, 0, 0], instruments=['guide'], Collis.addObject('MechanicalObject', name='CollisionDOFs') Collis.addObject('MultiAdaptiveBeamMapping', controller='../m_ircontroller', useCurvAbs=True, printLog=False, name='collisMap') - Collis.addObject('LineCollisionModel', proximity=0.0, group=1) - Collis.addObject('PointCollisionModel', proximity=0.0, group=1) + Collis.addObject('LineCollisionModel', contactDistance=0.0, group=1) + Collis.addObject('PointCollisionModel', contactDistance=0.0, group=1) # Visualization Guide VisuGuide = InstrumentCombined.addChild('VisuGuide') @@ -142,8 +142,8 @@ def createInstrumentsCombinedXRay(node, xtip=[1, 0, 0], instruments=['guide'], Collis.addObject('MechanicalObject', name='CollisionDOFs') Collis.addObject('MultiAdaptiveBeamMapping', controller='../m_ircontroller', useCurvAbs=True, printLog=False, name='collisMap') - Collis.addObject('LineCollisionModel', proximity=0.0, group=1) - Collis.addObject('PointCollisionModel', proximity=0.0, group=1) + Collis.addObject('LineCollisionModel', contactDistance=0.0, group=1) + Collis.addObject('PointCollisionModel', contactDistance=0.0, group=1) # Visualization Guide VisuGuide = InstrumentCombined.addChild('VisuGuide')