Skip to content

Commit 25a096d

Browse files
alxbilgerfredroy
alxbilger
and
fredroy
authored
[all] In RequiredPlugin, use pluginName instead of name (#6039)
* [all] In RequiredPlugin, use pluginName instead of name * Revert wrong change Co-authored-by: Frederick Roy <fredroy@users.noreply.github.com> * replace in CantileverBeam_ElementFEMForceField.xml --------- Co-authored-by: Frederick Roy <fredroy@users.noreply.github.com>
1 parent 78f1e1d commit 25a096d

675 files changed

Lines changed: 7280 additions & 7281 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3737,7 +3737,7 @@ ____________________________________________________________
37373737

37383738
**Examples / Scenes**
37393739
- [examples] Fix TopologySurfaceDifferentMesh.scn [#716]( https://github.com/sofa-framework/sofa/pull/716 )
3740-
- [examples] Fix the examples missing a <RequiredPlugin name="SofaSparseSolver"/> [#748]( https://github.com/sofa-framework/sofa/pull/748 )
3740+
- [examples] Fix the examples missing a <RequiredPlugin pluginName="SofaSparseSolver"/> [#748]( https://github.com/sofa-framework/sofa/pull/748 )
37413741
- [examples] Fix scenes having issue with CollisionGroup [#821]( https://github.com/sofa-framework/sofa/pull/821 )
37423742

37433743

‎Sofa/Component/Constraint/Lagrangian/Correction/tests/UncoupledConstraintCorrection_test.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ struct UncoupledConstraintCorrection_test: public BaseSimulationTest
3939
{
4040
SceneInstance sceneinstance("xml",
4141
"<Node>\n"
42-
" <RequiredPlugin name='Sofa.Component'/>"
43-
" <RequiredPlugin name='Sofa.Component.Collision.Geometry'/>"
44-
" <RequiredPlugin name='Sofa.Component.Collision.Detection.Intersection'/>"
45-
" <RequiredPlugin name='Sofa.Component.Collision.Response.Contact'/>"
42+
" <RequiredPlugin pluginName='Sofa.Component'/>"
43+
" <RequiredPlugin pluginName='Sofa.Component.Collision.Geometry'/>"
44+
" <RequiredPlugin pluginName='Sofa.Component.Collision.Detection.Intersection'/>"
45+
" <RequiredPlugin pluginName='Sofa.Component.Collision.Response.Contact'/>"
4646
" <LCPConstraintSolver maxIt='1000' tolerance='0.001' />\n"
4747
" <FreeMotionAnimationLoop />\n"
4848
" <Node name='collision'>\n"

‎Sofa/Component/Constraint/Projective/tests/FixedProjectiveConstraint_test.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ struct FixedProjectiveConstraint_test : public BaseTest
8181
const simulation::Node::SPtr root = simulation->createNewGraph("root");
8282
root->setGravity( type::Vec3(0,0,0) );
8383

84-
simpleapi::createObject(root , "RequiredPlugin", {{"name", Sofa.Component.LinearSolver.Direct}}) ;
85-
simpleapi::createObject(root , "RequiredPlugin", {{"name", Sofa.Component.ODESolver.Forward}}) ;
86-
simpleapi::createObject(root , "RequiredPlugin", {{"name", Sofa.Component.ODESolver.Backward}}) ;
84+
simpleapi::createObject(root , "RequiredPlugin", {{"pluginName", Sofa.Component.LinearSolver.Direct}}) ;
85+
simpleapi::createObject(root , "RequiredPlugin", {{"pluginName", Sofa.Component.ODESolver.Forward}}) ;
86+
simpleapi::createObject(root , "RequiredPlugin", {{"pluginName", Sofa.Component.ODESolver.Backward}}) ;
8787

8888
simulation::Node::SPtr node = createEulerSolverNode(root,"test", integrationScheme);
8989

‎Sofa/Component/Diffusion/tests/scenes/TetrahedronDiffusionFEMForceField.scn‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<Node name="root" dt="0.0001" gravity="0 0 0" >
2-
<RequiredPlugin name="Sofa.Component.Collision.Geometry"/> <!-- Needed to use components [TriangleCollisionModel] -->
3-
<RequiredPlugin name="Sofa.Component.Constraint.Projective"/> <!-- Needed to use components [FixedProjectiveConstraint LinearMovementProjectiveConstraint] -->
4-
<RequiredPlugin name="Sofa.Component.Diffusion"/> <!-- Needed to use components [TetrahedronDiffusionFEMForceField] -->
5-
<RequiredPlugin name="Sofa.Component.Engine.Select"/> <!-- Needed to use components [BoxROI] -->
6-
<RequiredPlugin name="Sofa.Component.IO.Mesh"/> <!-- Needed to use components [MeshOBJLoader] -->
7-
<RequiredPlugin name="Sofa.Component.LinearSolver.Iterative"/> <!-- Needed to use components [CGLinearSolver] -->
8-
<RequiredPlugin name="Sofa.Component.Mass"/> <!-- Needed to use components [DiagonalMass] -->
9-
<RequiredPlugin name="Sofa.Component.ODESolver.Backward"/> <!-- Needed to use components [EulerImplicitSolver] -->
10-
<RequiredPlugin name="Sofa.Component.StateContainer"/> <!-- Needed to use components [MechanicalObject] -->
11-
<RequiredPlugin name="Sofa.Component.Topology.Container.Dynamic"/> <!-- Needed to use components [TetrahedronSetGeometryAlgorithms TetrahedronSetTopologyContainer TetrahedronSetTopologyModifier] -->
12-
<RequiredPlugin name="Sofa.Component.Topology.Container.Grid"/> <!-- Needed to use components [RegularGridTopology] -->
13-
<RequiredPlugin name="Sofa.Component.Topology.Mapping"/> <!-- Needed to use components [Hexa2TetraTopologicalMapping] -->
14-
<RequiredPlugin name="Sofa.Component.Visual"/> <!-- Needed to use components [VisualStyle] -->
2+
<RequiredPlugin pluginName="Sofa.Component.Collision.Geometry"/> <!-- Needed to use components [TriangleCollisionModel] -->
3+
<RequiredPlugin pluginName="Sofa.Component.Constraint.Projective"/> <!-- Needed to use components [FixedProjectiveConstraint LinearMovementProjectiveConstraint] -->
4+
<RequiredPlugin pluginName="Sofa.Component.Diffusion"/> <!-- Needed to use components [TetrahedronDiffusionFEMForceField] -->
5+
<RequiredPlugin pluginName="Sofa.Component.Engine.Select"/> <!-- Needed to use components [BoxROI] -->
6+
<RequiredPlugin pluginName="Sofa.Component.IO.Mesh"/> <!-- Needed to use components [MeshOBJLoader] -->
7+
<RequiredPlugin pluginName="Sofa.Component.LinearSolver.Iterative"/> <!-- Needed to use components [CGLinearSolver] -->
8+
<RequiredPlugin pluginName="Sofa.Component.Mass"/> <!-- Needed to use components [DiagonalMass] -->
9+
<RequiredPlugin pluginName="Sofa.Component.ODESolver.Backward"/> <!-- Needed to use components [EulerImplicitSolver] -->
10+
<RequiredPlugin pluginName="Sofa.Component.StateContainer"/> <!-- Needed to use components [MechanicalObject] -->
11+
<RequiredPlugin pluginName="Sofa.Component.Topology.Container.Dynamic"/> <!-- Needed to use components [TetrahedronSetGeometryAlgorithms TetrahedronSetTopologyContainer TetrahedronSetTopologyModifier] -->
12+
<RequiredPlugin pluginName="Sofa.Component.Topology.Container.Grid"/> <!-- Needed to use components [RegularGridTopology] -->
13+
<RequiredPlugin pluginName="Sofa.Component.Topology.Mapping"/> <!-- Needed to use components [Hexa2TetraTopologicalMapping] -->
14+
<RequiredPlugin pluginName="Sofa.Component.Visual"/> <!-- Needed to use components [VisualStyle] -->
1515

1616
<VisualStyle displayFlags="showBehaviorModels"/>
1717
<DefaultAnimationLoop />

‎Sofa/Component/Engine/Select/tests/BoxROI_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ struct BoxROITest : public sofa::testing::BaseTest
192192
"<?xml version='1.0'?>"
193193
"<Node name='Root' gravity='0 0 0' time='0' animate='0' > "
194194
" <Node name='Level 1'> "
195-
" <RequiredPlugin name='Sofa.Component.IO.Mesh' /> "
195+
" <RequiredPlugin pluginName='Sofa.Component.IO.Mesh' /> "
196196
" <TriangleSetTopologyContainer name='Container' /> "
197197
" <MeshOBJLoader filename='mesh/single_triangle.obj'/> "
198198
" <BoxROI name='myBoxROI'/> "

‎Sofa/Component/Haptics/tests/scenes/ToolvsFloorCollision_test.scn‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
<?xml version="1.0" ?>
22
<Node name="root" dt="0.05" showBoundingTree="0" gravity="0 -1 0">
3-
<RequiredPlugin name="Sofa.Component.AnimationLoop"/> <!-- Needed to use components [FreeMotionAnimationLoop] -->
4-
<RequiredPlugin name="Sofa.Component.Collision.Detection.Algorithm"/> <!-- Needed to use components [BVHNarrowPhase BruteForceBroadPhase CollisionPipeline] -->
5-
<RequiredPlugin name="Sofa.Component.Collision.Detection.Intersection"/> <!-- Needed to use components [LocalMinDistance] -->
6-
<RequiredPlugin name="Sofa.Component.Collision.Geometry"/> <!-- Needed to use components [LineCollisionModel PointCollisionModel TriangleCollisionModel] -->
7-
<RequiredPlugin name="Sofa.Component.Collision.Response.Contact"/> <!-- Needed to use components [CollisionResponse] -->
8-
<RequiredPlugin name="Sofa.Component.Constraint.Lagrangian.Correction"/> <!-- Needed to use components [LinearSolverConstraintCorrection] -->
9-
<RequiredPlugin name="Sofa.Component.Constraint.Lagrangian.Solver"/> <!-- Needed to use components [LCPConstraintSolver] -->
10-
<RequiredPlugin name="Sofa.Component.Haptics"/> <!-- Needed to use components [LCPForceFeedback] -->
11-
<RequiredPlugin name="Sofa.Component.IO.Mesh"/> <!-- Needed to use components [MeshOBJLoader] -->
12-
<RequiredPlugin name="Sofa.Component.LinearSolver.Direct"/> <!-- Needed to use components [SparseLDLSolver] -->
13-
<RequiredPlugin name="Sofa.Component.Mapping.Linear"/> <!-- Needed to use components [IdentityMapping] -->
14-
<RequiredPlugin name="Sofa.Component.Mapping.NonLinear"/> <!-- Needed to use components [RigidMapping] -->
15-
<RequiredPlugin name="Sofa.Component.Mass"/> <!-- Needed to use components [UniformMass] -->
16-
<RequiredPlugin name="Sofa.Component.ODESolver.Backward"/> <!-- Needed to use components [EulerImplicitSolver] -->
17-
<RequiredPlugin name="Sofa.Component.StateContainer"/> <!-- Needed to use components [MechanicalObject] -->
18-
<RequiredPlugin name="Sofa.Component.Topology.Container.Constant"/> <!-- Needed to use components [MeshTopology] -->
19-
<RequiredPlugin name="Sofa.GL.Component.Rendering3D"/> <!-- Needed to use components [OglModel] -->
3+
<RequiredPlugin pluginName="Sofa.Component.AnimationLoop"/> <!-- Needed to use components [FreeMotionAnimationLoop] -->
4+
<RequiredPlugin pluginName="Sofa.Component.Collision.Detection.Algorithm"/> <!-- Needed to use components [BVHNarrowPhase BruteForceBroadPhase CollisionPipeline] -->
5+
<RequiredPlugin pluginName="Sofa.Component.Collision.Detection.Intersection"/> <!-- Needed to use components [LocalMinDistance] -->
6+
<RequiredPlugin pluginName="Sofa.Component.Collision.Geometry"/> <!-- Needed to use components [LineCollisionModel PointCollisionModel TriangleCollisionModel] -->
7+
<RequiredPlugin pluginName="Sofa.Component.Collision.Response.Contact"/> <!-- Needed to use components [CollisionResponse] -->
8+
<RequiredPlugin pluginName="Sofa.Component.Constraint.Lagrangian.Correction"/> <!-- Needed to use components [LinearSolverConstraintCorrection] -->
9+
<RequiredPlugin pluginName="Sofa.Component.Constraint.Lagrangian.Solver"/> <!-- Needed to use components [LCPConstraintSolver] -->
10+
<RequiredPlugin pluginName="Sofa.Component.Haptics"/> <!-- Needed to use components [LCPForceFeedback] -->
11+
<RequiredPlugin pluginName="Sofa.Component.IO.Mesh"/> <!-- Needed to use components [MeshOBJLoader] -->
12+
<RequiredPlugin pluginName="Sofa.Component.LinearSolver.Direct"/> <!-- Needed to use components [SparseLDLSolver] -->
13+
<RequiredPlugin pluginName="Sofa.Component.Mapping.Linear"/> <!-- Needed to use components [IdentityMapping] -->
14+
<RequiredPlugin pluginName="Sofa.Component.Mapping.NonLinear"/> <!-- Needed to use components [RigidMapping] -->
15+
<RequiredPlugin pluginName="Sofa.Component.Mass"/> <!-- Needed to use components [UniformMass] -->
16+
<RequiredPlugin pluginName="Sofa.Component.ODESolver.Backward"/> <!-- Needed to use components [EulerImplicitSolver] -->
17+
<RequiredPlugin pluginName="Sofa.Component.StateContainer"/> <!-- Needed to use components [MechanicalObject] -->
18+
<RequiredPlugin pluginName="Sofa.Component.Topology.Container.Constant"/> <!-- Needed to use components [MeshTopology] -->
19+
<RequiredPlugin pluginName="Sofa.GL.Component.Rendering3D"/> <!-- Needed to use components [OglModel] -->
2020

2121
<CollisionPipeline name="pipeline" depth="6" verbose="0"/>
2222
<BruteForceBroadPhase/>

‎Sofa/Component/IO/Mesh/tests/MeshXspLoader_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class MeshXspLoader_test : public BaseSimulationTest
3535
const Node::SPtr root = sofa::simpleapi::createRootNode(simulation, "root");
3636

3737
sofa::simpleapi::createObject(root, "DefaultAnimationLoop");
38-
sofa::simpleapi::createObject(root, "RequiredPlugin", { { "name",Sofa.Component.IO.Mesh } });
38+
sofa::simpleapi::createObject(root, "RequiredPlugin", { { "pluginName",Sofa.Component.IO.Mesh } });
3939
auto loader = sofa::simpleapi::createObject(root, "MeshXspLoader",
4040
{{"filename", std::string(SOFA_COMPONENT_IO_MESH_TEST_FILES_DIR)+"test.xs3"}});
4141
sofa::simulation::node::initRoot(root.get());

0 commit comments

Comments
 (0)