Skip to content

Commit b2bb09a

Browse files
committed
[Scenes] Fix warnings in scenes init
1 parent 4273f27 commit b2bb09a

11 files changed

Lines changed: 12 additions & 9 deletions

scenes/Benchmarks/Scenario-02_squareTissue_diagonal-cut.scn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<RequiredPlugin name="Sofa.Component.Topology.Container.Dynamic"/> <!-- Needed to use components [TriangleSetGeometryAlgorithms, TriangleSetTopologyContainer, TriangleSetTopologyModifier] -->
2626
<RequiredPlugin name="Sofa.Component.Visual"/> <!-- Needed to use components [VisualStyle] -->
2727
<RequiredPlugin name="Sofa.GL.Component.Rendering3D"/> <!-- Needed to use components [OglModel] -->
28-
<RequiredPlugin name="tearing"/>
28+
<RequiredPlugin name="Tearing"/>
2929
</Node>
3030

3131

@@ -55,7 +55,7 @@
5555
<BoxROI template="Vec3d" name="PulledSide" box="-0.1 0.1 0.1 10.1 -0.1 -0.1" drawBoxes="1"/>
5656
<ConstantForceField name="CFF" indices="@PulledSide.indices" forces="0 -100 0" showArrowSize=".01" />
5757

58-
<TearingEngine name="TearingEngine" input_position="@Mo.position"
58+
<TearingScenarioEngine name="TearingEngine" input_position="@Mo.position"
5959
startVertexId="1" startDirection="0.707 0.707 0.0" startLength="3.5"/>
6060

6161
<TriangularFEMForceField name="FEM" youngModulus="60" poissonRatio="0.3" method="large" computePrincipalStress="true"/>

scenes/Benchmarks/Scenario-03_squareTissue_corner-horizontal-cut.scn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<RequiredPlugin name="Sofa.Component.Topology.Container.Dynamic"/> <!-- Needed to use components [TriangleSetGeometryAlgorithms, TriangleSetTopologyContainer, TriangleSetTopologyModifier] -->
2626
<RequiredPlugin name="Sofa.Component.Visual"/> <!-- Needed to use components [VisualStyle] -->
2727
<RequiredPlugin name="Sofa.GL.Component.Rendering3D"/> <!-- Needed to use components [OglModel] -->
28-
<RequiredPlugin name="tearing"/>
28+
<RequiredPlugin name="Tearing"/>
2929
</Node>
3030

3131

@@ -55,7 +55,7 @@
5555
<BoxROI template="Vec3d" name="PullCorner" box="9.9 0.1 0.1 10.1 -0.1 -0.1" drawBoxes="1"/>
5656
<ConstantForceField name="CFF" indices="@PullCorner.indices" forces="0 -130 0" showArrowSize=".02" />
5757

58-
<TearingEngine name="TearingEngine" input_position="@Mo.position"
58+
<TearingScenarioEngine name="TearingEngine" input_position="@Mo.position"
5959
startVertexId="45" startDirection="1.0 0.0 0.0" startLength="2.0"/>
6060

6161
<TriangularFEMForceField name="FEM" youngModulus="60" poissonRatio="0.3" method="large" computePrincipalStress="true"/>

scenes/Benchmarks/Scenario-04_squareTissue_corner-vertical-cut.scn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<BoxROI template="Vec3d" name="PullCorner" box="9.9 0.1 0.1 10.1 -0.1 -0.1" drawBoxes="1"/>
5656
<ConstantForceField name="CFF" indices="@PullCorner.indices" forces="0 -130 0" showArrowSize=".02" />
5757

58-
<TearingEngine name="TearingEngine" input_position="@Mo.position"
58+
<TearingScenarioEngine name="TearingEngine" input_position="@Mo.position"
5959
startVertexId="51" startDirection="0.0 1.0 0.0" startLength="10"/>
6060

6161
<TriangularFEMForceField name="FEM" youngModulus="60" poissonRatio="0.3" method="large" computePrincipalStress="true"/>

scenes/Benchmarks/Scenario-05_squareTissue-hole-vertical-cut.scn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<TriangularBendingSprings name="FEM-Bend" stiffness="300" damping="1.0" />
6262
<TriangleCollisionModel />
6363

64-
<TearingEngine name="TearingEngine" input_position="@Mo.position"
64+
<TearingScenarioEngine name="TearingEngine" input_position="@Mo.position"
6565
startVertexId="318" startDirection="0.0 1.0 0.0" startLength="2.5"/>
6666

6767
<Node >

scenes/Benchmarks/Scenario-06_squareTissue-hole-diagonal-cut.scn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<BoxROI template="Vec3d" name="PulledSide" box="-0.1 0.1 0.1 10.1 -0.1 -0.1" drawBoxes="1"/>
5858
<ConstantForceField name="CFF" indices="@PulledSide.indices" forces="0 -100 0" showArrowSize=".01" />
5959

60-
<TearingEngine name="TearingEngine" input_position="@Mo.position"
60+
<TearingScenarioEngine name="TearingEngine" input_position="@Mo.position"
6161
startVertexId="282" startDirection="0.707 -0.707 0.0" startLength="5.0"/>
6262

6363
<TriangularFEMForceField name="FEM" youngModulus="60" poissonRatio="0.3" method="large" computePrincipalStress="true"/>

scenes/Benchmarks/TestCase-01_bad-cutted-mesh.scn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ On fixe un coté et nous tirons de façon uniforme du côté opposé avec une in
5757
<TriangularBendingSprings name="FEM-Bend" stiffness="300" damping="1.0" />
5858
<TriangleCollisionModel />
5959

60-
<TearingEngine name="TearingEngine" input_position="@Mo.position" stressThreshold="0.1" step="0" nbFractureMax="100"/>
60+
<TearingScenarioEngine name="TearingEngine" input_position="@Mo.position" stressThreshold="0.1" step="0" nbFractureMax="100"
6161
startVertexId="318" startDirection="0.0 1.0 0.0" startLength="2.5"/>
6262

6363
<Node >

scenes/Benchmarks/TestCase-03_vertexConnectedTriangles.scn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ On fixe un coté et nous tirons de façon uniforme du côté opposé avec une in
3737
<EulerImplicitSolver name="cg_odesolver" printLog="false" rayleighStiffness="0.1" rayleighMass="0.1" />
3838
<CGLinearSolver iterations="25" name="linear solver" tolerance="1.0e-9" threshold="1.0e-9" />
3939
<!--MeshGmshLoader name="meshLoader" filename="mesh/square3.msh" scale="10" createSubelements="true" /-->
40-
<MeshOBJLoader name="meshLoader" filename="mesh/sablier.obj" scale="1" createSubelements="true"/>
40+
<MeshOBJLoader name="meshLoader" filename="../TearingEngine/mesh/sablier.obj" scale="1" createSubelements="true"/>
4141

4242
<TriangleSetTopologyContainer name="Container" src="@meshLoader" fileTopology="" tags=" " />
4343
<TriangleSetTopologyModifier name="Modifier" />

scenes/TearingEngine/SquareTissue_01_gravity.scn

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<RequiredPlugin name="Sofa.Component.LinearSolver.Iterative"/> <!-- Needed to use components [CGLinearSolver] -->
1414
<RequiredPlugin name="Sofa.Component.Mapping.Linear"/> <!-- Needed to use components [IdentityMapping] -->
1515
<RequiredPlugin name="Sofa.Component.Mass"/> <!-- Needed to use components [DiagonalMass] -->
16+
<RequiredPlugin name="Sofa.Component.MechanicalLoad"/> <!-- Needed to use components [PlaneForceField] -->
1617
<RequiredPlugin name="Sofa.Component.ODESolver.Backward"/> <!-- Needed to use components [EulerImplicitSolver] -->
1718
<RequiredPlugin name="Sofa.Component.SceneUtility"/> <!-- Needed to use components [InfoComponent] -->
1819
<RequiredPlugin name="Sofa.Component.SolidMechanics.FEM.Elastic"/> <!-- Needed to use components [TriangularFEMForceField] -->

scenes/TearingEngine/SquareTissue_01_gravity_interaction.scn

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<RequiredPlugin name="Sofa.Component.LinearSolver.Iterative"/> <!-- Needed to use components [CGLinearSolver] -->
1414
<RequiredPlugin name="Sofa.Component.Mapping.Linear"/> <!-- Needed to use components [IdentityMapping] -->
1515
<RequiredPlugin name="Sofa.Component.Mass"/> <!-- Needed to use components [DiagonalMass] -->
16+
<RequiredPlugin name="Sofa.Component.MechanicalLoad"/> <!-- Needed to use components [PlaneForceField] -->
1617
<RequiredPlugin name="Sofa.Component.ODESolver.Backward"/> <!-- Needed to use components [EulerImplicitSolver] -->
1718
<RequiredPlugin name="Sofa.Component.SceneUtility"/> <!-- Needed to use components [InfoComponent] -->
1819
<RequiredPlugin name="Sofa.Component.SolidMechanics.FEM.Elastic"/> <!-- Needed to use components [TriangularFEMForceField] -->

scenes/TearingEngine/SquareTissue_05_circleHole_gravity.scn

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<RequiredPlugin name="Sofa.Component.LinearSolver.Iterative"/> <!-- Needed to use components [CGLinearSolver] -->
1414
<RequiredPlugin name="Sofa.Component.Mapping.Linear"/> <!-- Needed to use components [IdentityMapping] -->
1515
<RequiredPlugin name="Sofa.Component.Mass"/> <!-- Needed to use components [DiagonalMass] -->
16+
<RequiredPlugin name="Sofa.Component.MechanicalLoad"/> <!-- Needed to use components [PlaneForceField] -->
1617
<RequiredPlugin name="Sofa.Component.ODESolver.Backward"/> <!-- Needed to use components [EulerImplicitSolver] -->
1718
<RequiredPlugin name="Sofa.Component.SceneUtility"/> <!-- Needed to use components [InfoComponent] -->
1819
<RequiredPlugin name="Sofa.Component.SolidMechanics.FEM.Elastic"/> <!-- Needed to use components [TriangularFEMForceField] -->

0 commit comments

Comments
 (0)