Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion labs/lab_models/lab_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def createScene(rootnode):
rootnode.gravity = [0., -9810., 0.]
addSolvers(simulation)

settings.addObject('RequiredPlugin', name='Sofa.Component.Constraint.Projective')
settings.addObject('RequiredPlugin', pluginName='Sofa.Component.Constraint.Projective')
# Needed to use components [FixedProjectiveConstraint]

translation = [0, 0, 100]
Expand Down
2 changes: 1 addition & 1 deletion labs/modules/camera_calibration_scene.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def createScene(rootnode):
rootnode.dt = 0.01
rootnode.gravity = [0., -9810., 0.]

settings.addObject('RequiredPlugin', name='Sofa.Component.Constraint.Projective')
settings.addObject('RequiredPlugin', pluginName='Sofa.Component.Constraint.Projective')
# Needed to use components [FixedProjectiveConstraint]

translation = [0, 0, 100]
Expand Down
4 changes: 2 additions & 2 deletions parts/camera.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ def __init__(self, *args, **kwargs):

self.support = None

self.addObject('RequiredPlugin', name='Sofa.Component.IO.Mesh') # Needed to use components [MeshSTLLoader]
self.addObject('RequiredPlugin', name='Sofa.GL.Component.Rendering3D') # Needed to use components [OglModel]
self.addObject('RequiredPlugin', pluginName=['Sofa.Component.IO.Mesh' # Needed to use components [MeshSTLLoader]
,'Sofa.GL.Component.Rendering3D']) # Needed to use components [OglModel]

q = Quat()
q.rotateFromQuat(Quat.createFromAxisAngle([0., 1., 0.], -pi / 4.))
Expand Down
16 changes: 7 additions & 9 deletions parts/centerpart.py
Original file line number Diff line number Diff line change
Expand Up @@ -271,14 +271,12 @@ def _addVisualModel(self):

def _addRequiredPlugins(self):
plugins = self.addChild("RequiredPlugins")
plugins.addObject('RequiredPlugin', name='Sofa.Component.Topology.Container.Constant')
# Needed to use components [MeshTopology]
plugins.addObject('RequiredPlugin', name='Sofa.Component.Topology.Container.Grid')
# Needed to use components [RegularGridTopology]
plugins.addObject('RequiredPlugin', name='Sofa.GL.Component.Rendering3D')
# Needed to use components [OglModel]
plugins.addObject('RequiredPlugin', name='Sofa.Component.Engine.Generate')
# Needed to use components [GenerateRigidMass]
plugins.addObject('RequiredPlugin',
pluginName=['Sofa.Component.Topology.Container.Constant' # Needed to use components [MeshTopology]
,'Sofa.Component.Topology.Container.Grid' # Needed to use components [RegularGridTopology]
,'Sofa.GL.Component.Rendering3D' # Needed to use components [OglModel]
,'Sofa.Component.Engine.Generate' # Needed to use components [GenerateRigidMass]
])


def createScene(rootnode):
Expand All @@ -303,7 +301,7 @@ def createScene(rootnode):
args = parser.parse_args([])

settings, modelling, simulation = addHeader(rootnode)
settings.addObject('RequiredPlugin', name='Sofa.Component.Constraint.Projective')
settings.addObject('RequiredPlugin', pluginName='Sofa.Component.Constraint.Projective')

rootnode.dt = 0.01
rootnode.gravity = [0., -9810., 0.]
Expand Down
2 changes: 1 addition & 1 deletion parts/gripper.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ def createScene(rootnode):
args = parser.parse_args([])

settings, modelling, simulation = addHeader(rootnode, inverse=inverse)
settings.addObject('RequiredPlugin', name='Sofa.Component.Constraint.Projective')
settings.addObject('RequiredPlugin', pluginName='Sofa.Component.Constraint.Projective')
rootnode.addObject("VisualStyle", displayFlags=["showWireframe", "showBehavior"])

rootnode.dt = 0.01
Expand Down
37 changes: 15 additions & 22 deletions parts/leg.py
Original file line number Diff line number Diff line change
Expand Up @@ -545,28 +545,21 @@ def _addRequiredPlugins(self):
Add the RequiredPlugins of the Leg class.
"""
plugins = self.addChild("RequiredPlugins")
plugins.addObject('RequiredPlugin', name='Sofa.Component.IO.Mesh')
# Needed to use components [MeshOBJLoader]
plugins.addObject('RequiredPlugin', name='Sofa.Component.Topology.Container.Dynamic')
# Needed to use components [EdgeSetTopologyContainer]
plugins.addObject('RequiredPlugin', name='Sofa.Component.Topology.Container.Constant')
# Needed to use components [MeshTopology]
plugins.addObject('RequiredPlugin', name='Sofa.GL.Component.Rendering3D')
# Needed to use components [OglModel]
plugins.addObject('RequiredPlugin', name='Sofa.Component.Topology.Container.Grid')
# Needed to use components [RegularGridTopology]
plugins.addObject('RequiredPlugin', name='SoftRobots')
plugins.addObject('RequiredPlugin', name='BeamAdapter')
plugins.addObject('RequiredPlugin', name='Sofa.Component.Mapping.Linear')
# Needed to use components [SubsetMultiMapping]
plugins.addObject('RequiredPlugin', name='Cosserat')
plugins.addObject('RequiredPlugin', name='Sofa.Component.SolidMechanics.FEM.Elastic')
# Needed to use components [TetrahedronFEMForceField]
plugins.addObject('RequiredPlugin', name='Sofa.Component.Mapping.NonLinear')
# Needed to use components [RigidMapping]
plugins.addObject('RequiredPlugin', name='Sofa.Component.Constraint.Projective')
plugins.addObject('RequiredPlugin', name='Sofa.Component.Engine.Generate')
# Needed to use components [VolumeFromTriangles]
plugins.addObject('RequiredPlugin',
pluginName=['Sofa.Component.IO.Mesh' # Needed to use components [MeshOBJLoader]
,'Sofa.Component.Topology.Container.Dynamic' # Needed to use components [EdgeSetTopologyContainer]
,'Sofa.Component.Topology.Container.Constant' # Needed to use components [MeshTopology]
,'Sofa.GL.Component.Rendering3D' # Needed to use components [OglModel]
,'Sofa.Component.Topology.Container.Grid' # Needed to use components [RegularGridTopology]
,'SoftRobots'
,'BeamAdapter'
,'Sofa.Component.Mapping.Linear' # Needed to use components [SubsetMultiMapping]
,'Cosserat'
,'Sofa.Component.SolidMechanics.FEM.Elastic' # Needed to use components [TetrahedronFEMForceField]
,'Sofa.Component.Mapping.NonLinear' # Needed to use components [RigidMapping]
,'Sofa.Component.Constraint.Projective'
,'Sofa.Component.Engine.Generate' # Needed to use components [VolumeFromTriangles]
])


def attachBase(self, attach, index) -> None:
Expand Down
20 changes: 8 additions & 12 deletions parts/motor.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,18 +96,14 @@ def _addRequiredPlugins(self):
"""
plugins = self.addChild("RequiredPlugins")
plugins.addObject('RequiredPlugin', name="ArticulatedSystemPlugin")
plugins.addObject('RequiredPlugin', name='Sofa.Component.IO.Mesh')
# Needed to use components [MeshOBJLoader,MeshSTLLoader]
plugins.addObject('RequiredPlugin', name='Sofa.Component.Mapping.NonLinear')
# Needed to use components [RigidMapping]
plugins.addObject('RequiredPlugin', name='Sofa.Component.Mass')
# Needed to use components [UniformMass]
plugins.addObject('RequiredPlugin', name='Sofa.Component.SolidMechanics.Spring')
# Needed to use components [RestShapeSpringsForceField]
plugins.addObject('RequiredPlugin', name='Sofa.Component.Topology.Container.Constant')
# Needed to use components [MeshTopology]
plugins.addObject('RequiredPlugin', name='Sofa.GL.Component.Rendering3D')
# Needed to use components [OglModel]
plugins.addObject('RequiredPlugin',
pluginName=['Sofa.Component.IO.Mesh' # Needed to use components [MeshOBJLoader,MeshSTLLoader]
,'Sofa.Component.Mapping.NonLinear' # Needed to use components [RigidMapping]
,'Sofa.Component.Mass' # Needed to use components [UniformMass]
,'Sofa.Component.SolidMechanics.Spring' # Needed to use components [RestShapeSpringsForceField]
,'Sofa.Component.Topology.Container.Constant' # Needed to use components [MeshTopology]
,'Sofa.GL.Component.Rendering3D' # Needed to use components [OglModel]
])


def createScene(rootnode):
Expand Down
2 changes: 1 addition & 1 deletion tests/test_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def createScene(rootnode):
rootnode.gravity = [0., -98100., 0.]
addSolvers(simulation)

settings.addObject('RequiredPlugin', name='Sofa.Component.Constraint.Projective')
settings.addObject('RequiredPlugin', pluginName='Sofa.Component.Constraint.Projective')
rootnode.VisualStyle.displayFlags = ["showWireframe", "showBehavior"]
# Needed to use components [FixedProjectiveConstraint]

Expand Down
2 changes: 1 addition & 1 deletion tests/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def test_getColorFromFilename():

def test_getExtremityFromBase():
node = Sofa.Core.Node()
node.addObject("RequiredPlugin", name="Sofa.Component.Topology.Container.Constant")
node.addObject("RequiredPlugin", pluginName=["Sofa.Component.Topology.Container.Constant"])
topology1 = node.addObject("MeshTopology", position=[[0, 0, 0], [10, 0, 0], [0, 20, 0]])
assert getExtremityFromBase(topology1, 0) == 2

Expand Down
Loading