Skip to content

Commit 34a7aeb

Browse files
authored
[scenes] Clean all scenes to remove warnings due to change in SOFA or in component Data. Add example of multimateral beam (#23)
* [scenes] Update all scenes to remove warnings * Update script and note * [Scenes] Fix some scenes * [scenes] Add example of multi material beam
1 parent 20a9baa commit 34a7aeb

19 files changed

Lines changed: 138 additions & 41 deletions

examples/BeatingCube.scn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<CollisionPipeline verbose="0" />
3030
<BruteForceBroadPhase/>
3131
<BVHNarrowPhase/>
32-
<DefaultContactManager response="PenalityContactForceField" />
32+
<CollisionResponse response="PenalityContactForceField" />
3333
<MinProximityIntersection name="Proximity" alarmDistance="1.0" contactDistance="0.1"/>
3434

3535

@@ -47,7 +47,7 @@
4747
<DiagonalMass massDensity="1.0" />
4848

4949
<BoxROI name="box" box="-1 -1 -1 11 4 11" drawBoxes="true" />
50-
<FixedConstraint name="FixedConstraint" indices="@box.indices" activate_projectVelocity="1"/>
50+
<FixedProjectiveConstraint name="FixedConstraint" indices="@box.indices" activate_projectVelocity="1"/>
5151

5252
<TetrahedralCorotationalFEMForceField name="CFEM" youngModulus="600" poissonRatio="0.3" method="large" />
5353
<MiddleForceField name="center" force="110" pace="4.0" showForce="1" position="@Volume.position" />

examples/BeatingCube_moving.scn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<CollisionPipeline verbose="0" />
3030
<BruteForceBroadPhase/>
3131
<BVHNarrowPhase/>
32-
<DefaultContactManager response="PenalityContactForceField" />
32+
<CollisionResponse response="PenalityContactForceField" />
3333
<MinProximityIntersection name="Proximity" alarmDistance="1.0" contactDistance="0.1"/>
3434

3535

@@ -47,7 +47,7 @@
4747
<DiagonalMass massDensity="1.0" />
4848

4949
<BoxROI name="box" box="6 9 6 11 11 11" drawBoxes="true" />
50-
<FixedConstraint name="FixedConstraint" indices="@box.indices" activate_projectVelocity="1"/>
50+
<FixedProjectiveConstraint name="FixedConstraint" indices="@box.indices" activate_projectVelocity="1"/>
5151

5252
<TetrahedralCorotationalFEMForceField name="CFEM" youngModulus="600" poissonRatio="0.3" method="large" />
5353
<MiddleForceField name="center" force="80" pace="2.0" showForce="1" position="@Volume.position" refreshBaryRate="1" printLog="0"/>

examples/Cube_AdvCarvingTexcoords.scn

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@
3131
<CollisionPipeline verbose="0" />
3232
<BruteForceBroadPhase/>
3333
<BVHNarrowPhase/>
34-
<DefaultContactManager response="PenalityContactForceField" />
34+
<CollisionResponse response="PenalityContactForceField" />
3535
<MinProximityIntersection name="Proximity" alarmDistance="1.0" contactDistance="0.1" />
3636

3737
<EulerImplicitSolver name="EulerImplicit" rayleighStiffness="0.1" rayleighMass="0.1" />
3838
<CGLinearSolver name="CG Solver" iterations="25" tolerance="1e-9" threshold="1e-9"/>
3939

4040
<AdvancedCarvingManager name="ACarving" active="1" refineDistance="1.0" carvingDistance="0.05"
41-
carvingWithBurning="1" drawContacts="0"/>
41+
carvingWithBurning="1" process="1" drawContacts="0"/>
4242

4343
<Node name="carvingElement">
4444
<MechanicalObject name="Particles" template="Rigid3d" position="5 12 5 0 0 0 1" />
@@ -68,7 +68,7 @@
6868
<DiagonalMass massDensity="1.0" />
6969

7070
<BoxROI name="box" box="-1 -1 -1 11 0 11" drawBoxes="true" />
71-
<FixedConstraint name="FixedConstraint" indices="@box.indices" activate_projectVelocity="1"/>
71+
<FixedProjectiveConstraint name="FixedConstraint" indices="@box.indices" activate_projectVelocity="1"/>
7272

7373
<TetrahedralCorotationalFEMForceField name="CFEM" youngModulus="100" poissonRatio="0.3" method="large" />
7474

examples/Cube_AdvCarvingWithRefinement.scn

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<RequiredPlugin name="Sofa.Component.Visual"/> <!-- Needed to use components [VisualStyle] -->
2323
<RequiredPlugin name="Sofa.GL.Component.Rendering3D"/> <!-- Needed to use components [OglModel] -->
2424
<RequiredPlugin name="InfinyToolkit" />
25+
<RequiredPlugin name="MeshRefinement" />
2526
</Node>
2627

2728
<VisualStyle displayFlags="hideCollisionModels showVisual" />
@@ -31,14 +32,14 @@
3132
<CollisionPipeline verbose="0" />
3233
<BruteForceBroadPhase/>
3334
<BVHNarrowPhase/>
34-
<DefaultContactManager response="PenalityContactForceField" />
35+
<CollisionResponse response="PenalityContactForceField" />
3536
<MinProximityIntersection name="Proximity" alarmDistance="1.0" contactDistance="0.1" />
3637

3738
<EulerImplicitSolver name="EulerImplicit" rayleighStiffness="0.1" rayleighMass="0.1" />
3839
<CGLinearSolver name="CG Solver" iterations="25" tolerance="1e-9" threshold="1e-9"/>
3940

4041
<AdvancedCarvingManager name="ACarving" active="1" refineDistance="1.0" refineCriteria="0.5" carvingDistance="0.5"
41-
carvingWithBurning="0" carvingWithRefinement="1" drawContacts="0"/>
42+
carvingWithBurning="0" carvingWithRefinement="1" drawContacts="0" process="1"/>
4243

4344
<Node name="carvingElement">
4445
<MechanicalObject name="Particles" template="Rigid3d" position="5 15 5 0 0 0 1" />
@@ -68,7 +69,7 @@
6869
<DiagonalMass massDensity="1.0" />
6970

7071
<BoxROI name="box" box="-1 -1 -1 11 0 11" drawBoxes="true" />
71-
<FixedConstraint name="FixedConstraint" indices="@box.indices" activate_projectVelocity="1"/>
72+
<FixedProjectiveConstraint name="FixedConstraint" indices="@box.indices" activate_projectVelocity="1"/>
7273

7374
<TetrahedralCorotationalFEMForceField name="CFEM" youngModulus="100" poissonRatio="0.3" method="large" />
7475

examples/Cube_AdvCarvingWithRefinementTexcoords.scn

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,22 @@
2121
<RequiredPlugin name="Sofa.Component.Topology.Mapping"/> <!-- Needed to use components [Hexa2TetraTopologicalMapping, Tetra2TriangleTopologicalMapping] -->
2222
<RequiredPlugin name="Sofa.GL.Component.Rendering3D"/> <!-- Needed to use components [OglModel] -->
2323
<RequiredPlugin name="InfinyToolkit" />
24+
<RequiredPlugin name="MeshRefinement" />
2425
</Node>
2526

2627
<DefaultAnimationLoop />
2728
<DefaultVisualManagerLoop />
2829
<CollisionPipeline verbose="0" />
2930
<BruteForceBroadPhase/>
3031
<BVHNarrowPhase/>
31-
<DefaultContactManager response="PenalityContactForceField" />
32+
<CollisionResponse response="PenalityContactForceField" />
3233
<MinProximityIntersection name="Proximity" alarmDistance="1.0" contactDistance="0.1" />
3334

3435
<EulerImplicitSolver name="EulerImplicit" rayleighStiffness="0.1" rayleighMass="0.1" />
3536
<CGLinearSolver name="CG Solver" iterations="25" tolerance="1e-9" threshold="1e-9"/>
3637

3738
<AdvancedCarvingManager name="ACarving" active="1" refineDistance="1.0" refineCriteria="0.5" carvingDistance="0.5"
38-
carvingWithBurning="1" carvingWithRefinement="1" drawContacts="0"/>
39+
carvingWithBurning="1" carvingWithRefinement="1" drawContacts="0" process="1"/>
3940

4041
<Node name="carvingElement">
4142
<MechanicalObject name="Particles" template="Rigid3d" position="5 15 5 0 0 0 1" />
@@ -65,7 +66,7 @@
6566
<DiagonalMass massDensity="1.0" />
6667

6768
<BoxROI name="box" box="-1 -1 -1 11 0 11" drawBoxes="true" />
68-
<FixedConstraint name="FixedConstraint" indices="@box.indices" activate_projectVelocity="1"/>
69+
<FixedProjectiveConstraint name="FixedConstraint" indices="@box.indices" activate_projectVelocity="1"/>
6970

7071
<TetrahedralCorotationalFEMForceField name="CFEM" youngModulus="100" poissonRatio="0.3" method="large" />
7172

examples/Cube_Carving.scn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<CollisionPipeline verbose="0" />
2929
<BruteForceBroadPhase/>
3030
<BVHNarrowPhase/>
31-
<DefaultContactManager response="PenalityContactForceField" />
31+
<CollisionResponse response="PenalityContactForceField" />
3232
<MinProximityIntersection name="Proximity" alarmDistance="1.0" contactDistance="0.1"/>
3333

3434
<EulerImplicitSolver name="EulerImplicit" rayleighStiffness="0.1" rayleighMass="0.1" />
@@ -59,7 +59,7 @@
5959
<DiagonalMass massDensity="1.0" />
6060

6161
<BoxROI name="box" box="-1 -1 -1 11 0 11" drawBoxes="true" />
62-
<FixedConstraint name="FixedConstraint" indices="@box.indices" activate_projectVelocity="1"/>
62+
<FixedProjectiveConstraint name="FixedConstraint" indices="@box.indices" activate_projectVelocity="1"/>
6363

6464
<TetrahedralCorotationalFEMForceField name="CFEM" youngModulus="1000" poissonRatio="0.3" method="large" />
6565

examples/Cube_CarvingWithPenetration.scn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<CollisionPipeline verbose="0" />
3131
<BruteForceBroadPhase/>
3232
<BVHNarrowPhase/>
33-
<DefaultContactManager response="PenalityContactForceField" />
33+
<CollisionResponse response="PenalityContactForceField" />
3434
<MinProximityIntersection name="Proximity" alarmDistance="1.0" contactDistance="0.1"/>
3535

3636
<EulerImplicitSolver name="EulerImplicit" rayleighStiffness="0.1" rayleighMass="0.1" />
@@ -66,7 +66,7 @@
6666
<DiagonalMass massDensity="1.0" />
6767

6868
<BoxROI name="box" box="-1 -1 -1 11 0 11" drawBoxes="true" />
69-
<FixedConstraint name="FixedConstraint" indices="@box.indices" activate_projectVelocity="1"/>
69+
<FixedProjectiveConstraint name="FixedConstraint" indices="@box.indices" activate_projectVelocity="1"/>
7070

7171
<TetrahedralCorotationalFEMForceField name="CFEM" youngModulus="1000" poissonRatio="0.3" method="large" />
7272

examples/Geomagic-AdvCarving.scn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<CollisionPipeline name="pipeline" depth="6" verbose="0"/>
4040
<BruteForceBroadPhase/>
4141
<BVHNarrowPhase/>
42-
<DefaultContactManager name="response" response="FrictionContactConstraint" />
42+
<CollisionResponse name="response" response="FrictionContactConstraint" />
4343
<MinProximityIntersection name="Proximity" alarmDistance="1.0" contactDistance="0.1" />
4444

4545
<GeomagicDriver name="GeomagicDevice" deviceName="Default Device" scale="1" drawDeviceFrame="1"
@@ -72,7 +72,7 @@
7272
<DiagonalMass massDensity="10.0" />
7373

7474
<BoxROI name="box" box="-1 -1 -1 12 0 14" drawBoxes="true" />
75-
<FixedConstraint name="FixedConstraint" indices="@box.indices" activate_projectVelocity="1"/>
75+
<FixedProjectiveConstraint name="FixedConstraint" indices="@box.indices" activate_projectVelocity="1"/>
7676

7777
<TetrahedralCorotationalFEMForceField name="CFEM" youngModulus="5000" poissonRatio="0.3" method="large" />
7878
<LinearSolverConstraintCorrection/>

examples/Geomagic-AdvCarvingWithRefinement.scn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<CollisionPipeline name="pipeline" depth="6" verbose="0"/>
3939
<BruteForceBroadPhase/>
4040
<BVHNarrowPhase/>
41-
<DefaultContactManager name="response" response="FrictionContactConstraint" />
41+
<CollisionResponse name="response" response="FrictionContactConstraint" />
4242
<LocalMinDistance name="proximity" alarmDistance="0.5" contactDistance="0.1" angleCone="0.0" />
4343

4444
<GeomagicDriver name="GeomagicDevice" deviceName="Default Device" scale="1" drawDeviceFrame="1"

examples/Geomagic-AdvCarvingWithTexCoords.scn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<CollisionPipeline name="pipeline" depth="6" verbose="0"/>
4040
<BruteForceBroadPhase/>
4141
<BVHNarrowPhase/>
42-
<DefaultContactManager name="response" response="FrictionContactConstraint" />
42+
<CollisionResponse name="response" response="FrictionContactConstraint" />
4343
<MinProximityIntersection name="Proximity" alarmDistance="0.8" contactDistance="0.2" />
4444

4545
<GeomagicDriver name="GeomagicDevice" deviceName="Default Device" scale="1" drawDeviceFrame="0"
@@ -72,7 +72,7 @@
7272
<DiagonalMass massDensity="10.0" />
7373

7474
<BoxROI name="box" box="-1 -1 -1 12 0 14" drawBoxes="true" />
75-
<FixedConstraint name="FixedConstraint" indices="@box.indices" activate_projectVelocity="1"/>
75+
<FixedProjectiveConstraint name="FixedConstraint" indices="@box.indices" activate_projectVelocity="1"/>
7676

7777
<TetrahedralCorotationalFEMForceField name="CFEM" youngModulus="5000" poissonRatio="0.3" method="large" />
7878
<LinearSolverConstraintCorrection/>

0 commit comments

Comments
 (0)