Skip to content

Commit 5570933

Browse files
committed
Apply proper transformation for rigid frames and the needle
1 parent dc4726c commit 5570933

2 files changed

Lines changed: 4 additions & 8 deletions

File tree

‎examples/NeedleInsertion.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,9 @@ def createScene(root):
105105
needle.addObject("LinearSolverConstraintCorrection", printLog=False, linearSolver="@LinearSolver")
106106

107107
needleBase = needle.addChild("needleBase")
108-
needleBase.addObject("PointSetTopologyContainer", name="Container_base", position=[0, 0, 0])
109-
needleBase.addObject("MechanicalObject",name="mstate_base", template="Rigid3d",)
108+
needleBase.addObject("MechanicalObject",name="mstate_base", template="Rigid3d", position=[g_needleBaseOffset + g_needleBaseOrientation])
110109
needleBase.addObject("RestShapeSpringsForceField",points=[0],stiffness=1e9, angularStiffness=1e4,external_points=[0],external_rest_shape="@/NeedleBaseMaster/mstate_baseMaster")
111-
112-
needleBase.addObject("SubsetMapping", indices="0")
110+
needleBase.addObject("RigidMapping", index=0, globalToLocalCoords=True)
113111

114112
needleBodyCollision = needle.addChild("bodyCollision")
115113
needleBodyCollision.addObject("EdgeSetTopologyContainer", name="Container_body", src="@../Container")

‎examples/NeedleInsertionCycles.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,9 @@ def createScene(root):
121121
needle.addObject("LinearSolverConstraintCorrection", printLog=False, linearSolver="@LinearSolver")
122122

123123
needleBase = needle.addChild("needleBase")
124-
needleBase.addObject("PointSetTopologyContainer", name="Container_base", position=[0, 0, 0])
125-
needleBase.addObject("MechanicalObject",name="mstate_base", template="Rigid3d",)
124+
needleBase.addObject("MechanicalObject",name="mstate_base", template="Rigid3d", position=[g_needleBaseOffset + g_needleBaseOrientation])
126125
needleBase.addObject("RestShapeSpringsForceField",points=[0],stiffness=1e9, angularStiffness=1e4,external_points=[0],external_rest_shape="@/NeedleBaseMaster/mstate_baseMaster")
127-
128-
needleBase.addObject("SubsetMapping", indices="0")
126+
needleBase.addObject("RigidMapping", index=0, globalToLocalCoords=True)
129127

130128
needleBodyCollision = needle.addChild("bodyCollision")
131129
needleBodyCollision.addObject("EdgeSetTopologyContainer", name="Container_body", src="@../Container")

0 commit comments

Comments
 (0)