diff --git a/examples/CCDIntersection.py b/examples/CCDIntersection.py index ffe61360c..2a09e96d4 100644 --- a/examples/CCDIntersection.py +++ b/examples/CCDIntersection.py @@ -20,28 +20,15 @@ def createScene(root_node): plugins = root_node.addChild('plugins') - plugins.addObject('RequiredPlugin', name="MultiThreading") - plugins.addObject('RequiredPlugin', name="Sofa.Component.AnimationLoop") - plugins.addObject('RequiredPlugin', name="Sofa.Component.Collision.Detection.Algorithm") - plugins.addObject('RequiredPlugin', name="Sofa.Component.Collision.Detection.Intersection") - plugins.addObject('RequiredPlugin', name="Sofa.Component.Collision.Geometry") - plugins.addObject('RequiredPlugin', name="Sofa.Component.Collision.Response.Contact") - plugins.addObject('RequiredPlugin', name="Sofa.Component.Constraint.Lagrangian.Correction") - plugins.addObject('RequiredPlugin', name="Sofa.Component.Constraint.Lagrangian.Solver") - plugins.addObject('RequiredPlugin', name="Sofa.Component.IO.Mesh") - plugins.addObject('RequiredPlugin', name="Sofa.Component.LinearSolver.Direct") - plugins.addObject('RequiredPlugin', name="Sofa.Component.Mapping.Linear") - plugins.addObject('RequiredPlugin', name="Sofa.Component.Mass") - plugins.addObject('RequiredPlugin', name="Sofa.Component.ODESolver.Backward") - plugins.addObject('RequiredPlugin', name="Sofa.Component.SolidMechanics.FEM.Elastic") - plugins.addObject('RequiredPlugin', name="Sofa.Component.StateContainer") - plugins.addObject('RequiredPlugin', name="Sofa.Component.Topology.Container.Dynamic") - plugins.addObject('RequiredPlugin', name="Sofa.Component.Topology.Container.Grid") - plugins.addObject('RequiredPlugin', name="Sofa.Component.Topology.Mapping") - plugins.addObject('RequiredPlugin', name="Sofa.Component.Visual") - plugins.addObject('RequiredPlugin', name="Sofa.GL.Component.Rendering3D") - plugins.addObject('RequiredPlugin', name="Sofa.Component.Engine.Select") - plugins.addObject('RequiredPlugin', name="Sofa.GUI.Component") + plugins.addObject('RequiredPlugin', pluginName=["MultiThreading", "Sofa.Component.AnimationLoop", + "Sofa.Component.Collision.Detection.Algorithm", "Sofa.Component.Collision.Detection.Intersection", + "Sofa.Component.Collision.Geometry", "Sofa.Component.Collision.Response.Contact", + "Sofa.Component.Constraint.Lagrangian.Correction", "Sofa.Component.Constraint.Lagrangian.Solver", + "Sofa.Component.IO.Mesh", "Sofa.Component.LinearSolver.Direct", "Sofa.Component.Mapping.Linear", + "Sofa.Component.Mass", "Sofa.Component.ODESolver.Backward", "Sofa.Component.SolidMechanics.FEM.Elastic", + "Sofa.Component.StateContainer", "Sofa.Component.Topology.Container.Dynamic", + "Sofa.Component.Topology.Container.Grid", "Sofa.Component.Topology.Mapping", "Sofa.Component.Visual", + "Sofa.GL.Component.Rendering3D", "Sofa.Component.Engine.Select", "Sofa.GUI.Component"]) root_node.addObject('VisualStyle', displayFlags="showVisual") root_node.addObject('ConstraintAttachButtonSetting') diff --git a/examples/access_matrix.py b/examples/access_matrix.py index aeb1fa21e..1ba44ddc7 100644 --- a/examples/access_matrix.py +++ b/examples/access_matrix.py @@ -27,23 +27,16 @@ def createScene(root): root.addObject('VisualStyle', displayFlags="showBehaviorModels showForceFields") - root.addObject("RequiredPlugin", pluginName=['Sofa.Component.Mass', - 'Sofa.Component.StateContainer', - 'Sofa.Component.Topology.Container.Grid', - 'Sofa.Component.Visual' + root.addObject("RequiredPlugin", pluginName=['Sofa.Component.Mass', 'Sofa.Component.StateContainer', + 'Sofa.Component.Topology.Container.Grid', 'Sofa.Component.Visual', + 'Sofa.Component.Constraint.Projective', 'Sofa.Component.Engine.Select', + 'Sofa.Component.LinearSolver.Direct', 'Sofa.Component.LinearSystem', + 'Sofa.Component.ODESolver.Backward','Sofa.Component.SolidMechanics.FEM.Elastic' ]) root.addObject('DefaultAnimationLoop', parallelODESolving=True) root.addObject('DefaultVisualManagerLoop') - plugins = root.addChild('plugins') - plugins.addObject('RequiredPlugin', name='Sofa.Component.Constraint.Projective') - plugins.addObject('RequiredPlugin', name='Sofa.Component.Engine.Select') - plugins.addObject('RequiredPlugin', name='Sofa.Component.LinearSolver.Direct') - plugins.addObject('RequiredPlugin', name='Sofa.Component.LinearSystem') - plugins.addObject('RequiredPlugin', name='Sofa.Component.ODESolver.Backward') - plugins.addObject('RequiredPlugin', name='Sofa.Component.SolidMechanics.FEM.Elastic') - node_crs = createBeam(root, 'CompressedRowSparseMatrixMat3x3d') node_crs.addObject('SparseLDLSolver', template="CompressedRowSparseMatrixMat3x3d") diff --git a/examples/additional-examples/pygame_example.py b/examples/additional-examples/pygame_example.py index 75a1404ee..bba86c5a0 100644 --- a/examples/additional-examples/pygame_example.py +++ b/examples/additional-examples/pygame_example.py @@ -53,8 +53,7 @@ def simple_render(rootNode): def createScene(root): # Register all the common component in the factory. SofaRuntime.PluginRepository.addFirstPath(os.path.join(sofa_directory, 'bin')) - root.addObject("RequiredPlugin", name="Sofa.Component") - root.addObject("RequiredPlugin", name="Sofa.GL.Component") + root.addObject("RequiredPlugin", pluginName=["Sofa.Component", "Sofa.GL.Component"]) ### these are just some things that stay still and move around # so you know the animation is actually happening diff --git a/examples/basic-addGUI.py b/examples/basic-addGUI.py index ef570b158..00edf5843 100644 --- a/examples/basic-addGUI.py +++ b/examples/basic-addGUI.py @@ -36,7 +36,7 @@ def main(): # Function called when the scene graph is being created def createScene(root): - root.addObject('RequiredPlugin', name='Sofa.Component.StateContainer') + root.addObject('RequiredPlugin', pluginName='Sofa.Component.StateContainer') # Scene must now include a AnimationLoop root.addObject('DefaultAnimationLoop') diff --git a/examples/basic-useQtGUI.py b/examples/basic-useQtGUI.py index 3b730631f..8fb51ede9 100644 --- a/examples/basic-useQtGUI.py +++ b/examples/basic-useQtGUI.py @@ -37,7 +37,7 @@ def main(): # Function called when the scene graph is being created def createScene(root): - root.addObject('RequiredPlugin', name='Sofa.Component.StateContainer') + root.addObject('RequiredPlugin', pluginName='Sofa.Component.StateContainer') # Scene must now include a AnimationLoop root.addObject('DefaultAnimationLoop') diff --git a/examples/basic.py b/examples/basic.py index 43b4cb352..46f127cfe 100644 --- a/examples/basic.py +++ b/examples/basic.py @@ -25,7 +25,7 @@ def main(): # Function called when the scene graph is being created def createScene(root): - root.addObject('RequiredPlugin', name='Sofa.Component.StateContainer') + root.addObject('RequiredPlugin', pluginName='Sofa.Component.StateContainer') # Scene must now include a AnimationLoop root.addObject('DefaultAnimationLoop') diff --git a/examples/loadXMLfromPython.py b/examples/loadXMLfromPython.py index eb455097e..920f0c3f6 100644 --- a/examples/loadXMLfromPython.py +++ b/examples/loadXMLfromPython.py @@ -7,8 +7,8 @@ def createScene(root): # Call the above function to create the scene graph scene=""" - - + + diff --git a/examples/pointSetTopologyModifier.py b/examples/pointSetTopologyModifier.py index 83553fc54..d42776f47 100644 --- a/examples/pointSetTopologyModifier.py +++ b/examples/pointSetTopologyModifier.py @@ -8,8 +8,7 @@ def createScene(root): root.addObject("DefaultAnimationLoop") root.addObject("DefaultVisualManagerLoop") - root.addObject("RequiredPlugin", name="Sofa.Component.Topology.Container.Dynamic") - root.addObject('RequiredPlugin', name='Sofa.Component.StateContainer') + root.addObject("RequiredPlugin", pluginName=["Sofa.Component.Topology.Container.Dynamic", "Sofa.Component.StateContainer"]) container = root.addObject("PointSetTopologyContainer", points=[[0, 0, 0], [1, 0, 0]]) modifier = root.addObject("PointSetTopologyModifier") diff --git a/examples/scene_check.py b/examples/scene_check.py index e7c870881..940f8d510 100644 --- a/examples/scene_check.py +++ b/examples/scene_check.py @@ -20,7 +20,7 @@ def main(): # Function called when the scene graph is being created def createScene(root): - root.addObject('RequiredPlugin', name='Sofa.Component.StateContainer') + root.addObject('RequiredPlugin', pluginName='Sofa.Component.StateContainer') # Scene must now include a AnimationLoop root.addObject('DefaultAnimationLoop')