diff --git a/labs/lab_models/lab_models.py b/labs/lab_models/lab_models.py index c309939..e1e7828 100644 --- a/labs/lab_models/lab_models.py +++ b/labs/lab_models/lab_models.py @@ -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] diff --git a/labs/modules/camera_calibration_scene.py b/labs/modules/camera_calibration_scene.py index 9c50e1a..692e6bf 100644 --- a/labs/modules/camera_calibration_scene.py +++ b/labs/modules/camera_calibration_scene.py @@ -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] diff --git a/parts/camera.py b/parts/camera.py index c7b24dd..44fd753 100644 --- a/parts/camera.py +++ b/parts/camera.py @@ -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.)) diff --git a/parts/centerpart.py b/parts/centerpart.py index fbf35ac..46741f5 100644 --- a/parts/centerpart.py +++ b/parts/centerpart.py @@ -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): @@ -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.] diff --git a/parts/gripper.py b/parts/gripper.py index 8dd1fe6..69cab9e 100644 --- a/parts/gripper.py +++ b/parts/gripper.py @@ -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 diff --git a/parts/leg.py b/parts/leg.py index 4ad2535..7f37699 100644 --- a/parts/leg.py +++ b/parts/leg.py @@ -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: diff --git a/parts/motor.py b/parts/motor.py index 4ea959b..5156f88 100644 --- a/parts/motor.py +++ b/parts/motor.py @@ -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): diff --git a/tests/test_models.py b/tests/test_models.py index 1bfcd9b..0ee7ce1 100644 --- a/tests/test_models.py +++ b/tests/test_models.py @@ -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] diff --git a/tests/test_utils.py b/tests/test_utils.py index 99ce4db..9cfee8c 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -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