Skip to content

Apply modification from SOFA PR 5518 #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fredroy merged 1 commit into from
Jul 3, 2025
Merged

Apply modification from SOFA PR 5518 #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/3instruments_collis.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@
<EdgeSetTopologyModifier name="colliseEdgeModifier" />
<MechanicalObject name="CollisionDOFs"/>
<MultiAdaptiveBeamMapping name="collisMap" controller="../IRController" useCurvAbs="1" printLog="0"/>
<LineCollisionModel proximity="0.0" group="1"/>
<PointCollisionModel proximity="0.0" group="1"/>
<LineCollisionModel contactDistance="0.0" group="1"/>
<PointCollisionModel contactDistance="0.0" group="1"/>
</Node>

<Node name="VisuCatheter" activated="true">
Expand Down
4 changes: 2 additions & 2 deletions examples/SingleBeamDeploymentCollision.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@
<EdgeSetTopologyModifier name="colliseEdgeModifier" />
<MechanicalObject name="CollisionDOFs" />
<MultiAdaptiveBeamMapping controller="../DeployController" useCurvAbs="1" printLog="0" name="collisMap" />
<LineCollisionModel proximity="0.0" />
<PointCollisionModel proximity="0.0" />
<LineCollisionModel contactDistance="0.0" />
<PointCollisionModel contactDistance="0.0" />
</Node>
</Node>

Expand Down
4 changes: 2 additions & 2 deletions examples/python3/SingleBeamDeploymentCollision.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down
8 changes: 4 additions & 4 deletions examples/python3/beamadapter/parts/instrument.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -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')
Expand Down
Loading