Skip to content

Commit 3533083

Browse files
bakpaulbakpaul
committed
Modify SOFA scenes
1 parent ff0c6ea commit 3533083

25 files changed

+67
-67
lines changed

‎applications/plugins/BulletCollisionDetection/examples/BulletConvexHullDemo.scn‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@
2929
<MeshOBJLoader name="loader" filename="mesh/dragon.obj" />
3030
<MechanicalObject template="Rigid3d" name="mObject1" position="0 0 10 0 0 0 1" velocity="0 0 0 0 0 0" force="0 0 0 0 0 0" externalForce="0 0 0 0 0 0" derivX="0 0 0 0 0 0" restScale="1" />
3131
<UniformMass template="Rigid3d" name="uniformMass0" totalMass="10" />
32-
<TBulletConvexHullModel template="Rigid3d" name="tBulletTriangleModel2" CHPoints="@loader.position" positionDefined="true" proximity="0" margin="1" computeConvexHullDecomposition="true" drawConvexHullDecomposition="true"/>
32+
<TBulletConvexHullModel template="Rigid3d" name="tBulletTriangleModel2" CHPoints="@loader.position" positionDefined="true" contactDistance="0" margin="1" computeConvexHullDecomposition="true" drawConvexHullDecomposition="true"/>
3333
<MeshTopology name="meshTopology1" triangles="@loader.triangles" />
3434
</Node>
3535

3636
<Node name="Frog" >
3737
<MeshOBJLoader name="loader" filename="mesh/frog_body.obj" />
3838
<MechanicalObject template="Rigid3d" name="mObject1" position="0 0 30 0 0 0 1" velocity="0 0 0 0 0 0" force="0 0 0 0 0 0" externalForce="0 0 0 0 0 0" derivX="0 0 0 0 0 0" restScale="1" />
3939
<UniformMass template="Rigid3d" name="uniformMass0" totalMass="10" />
40-
<TBulletConvexHullModel template="Rigid3d" name="tBulletTriangleModel2" CHPoints="@loader.position" positionDefined="true" proximity="0" margin="1" computeConvexHullDecomposition="true" drawConvexHullDecomposition="true" concavityThreeshold="50"/>
40+
<TBulletConvexHullModel template="Rigid3d" name="tBulletTriangleModel2" CHPoints="@loader.position" positionDefined="true" contactDistance="0" margin="1" computeConvexHullDecomposition="true" drawConvexHullDecomposition="true" concavityThreeshold="50"/>
4141
<MeshTopology name="meshTopology1" triangles="@loader.triangles" />
4242
</Node>
4343
<Node name="Floor" >

‎applications/plugins/BulletCollisionDetection/examples/BulletLMDragon.scn‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<MeshOBJLoader name="loader" filename="mesh/dragon.obj" />
1919
<MeshTopology name="meshTopology1" position="@loader.position" edges="@loader.edges" triangles="@loader.triangles" quads="@loader.quads" tetrahedra="@loader.tetras" hexahedra="@loader.hexas" />
2020
<MechanicalObject template="Vec3d" name="mObject1" position="@loader.position" velocity="0 0 0" force="0 0 0" externalForce="0 0 0" derivX="0 0 0" restScale="1" translation="0 0 0" rotation="33 0 0" />
21-
<TBulletTriangleModel template="Vec3d" name="tBulletTriangleModel2" proximity="0" margin="5"/>
21+
<TBulletTriangleModel template="Vec3d" name="tBulletTriangleModel2" contactDistance="0" margin="5"/>
2222
<RigidMapping template="Rigid,Vec3d" name="rigidMap1" input="@../" output="@./" />
2323
<UniformMass template="Vec3d" name="uniformMass0" totalMass="10" />
2424
</Node>
@@ -33,7 +33,7 @@
3333
<MechanicalObject template="Vec3d" name="fix" position="-2 -2 0 2 -2 0 0 2 0" velocity="0 0 0" force="0 0 0" externalForce="0 0 0" derivX="0 0 0" scale3d="50 50 50" reserve="0" />
3434
<UniformMass template="Vec3d" name="Mass" vertexMass="0.33333" />
3535
<RigidMapping template="Rigid,Vec3d" name="rigidMap1" input="@../rigidDOF" output="@fix" />
36-
<TBulletTriangleModel template="Vec3d" name="tBulletTriangleModel2" proximity="0" margin="2"/>
36+
<TBulletTriangleModel template="Vec3d" name="tBulletTriangleModel2" contactDistance="0" margin="2"/>
3737
</Node>
3838
</Node>
3939
</Node>

‎applications/plugins/BulletCollisionDetection/examples/BulletSphere.scn‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@
2626
<CGLinearSolver template="GraphScattered" iterations="25" tolerance="1e-5" threshold="1e-5" name="Conjugate Gradient"/>
2727
<Node name="RigMec" gravity="0 0 0" >
2828
<MechanicalObject template="Vec3d" name="falling_particle" position="0 0 5 3 3 6 6 7 7" velocity="0 0 -0.01 0 0 -0.01 0 0 -0.01" force="0 0 0" externalForce="0 0 0" derivX="0 0 0" restScale="1" reserve="0" />
29-
<TBulletSphereModel template="Vec3d" name="tBulletTriangleModel2" proximity="0" margin="0.04" />
29+
<TBulletSphereModel template="Vec3d" name="tBulletTriangleModel2" contactDistance="0" margin="0.04" />
3030
<UniformMass template="Vec3d" name="Mass" vertexMass="0.33" />
3131
</Node>
3232
<Node name="Floor" >
3333
<Node name="TRIANGLE" >
3434
<MechanicalObject template="Vec3d" name="fix" position="0 0 0 3 3 0 6 7 0" velocity="0 0 0" force="0 0 0" externalForce="0 0 0" derivX="0 0 0" restScale="1" reserve="0" />
3535
<UniformMass template="Vec3d" name="Mass" vertexMass="0.33333" />
36-
<TBulletSphereModel template="Vec3d" name="tBulletTriangleModel2" proximity="0" margin="0.04" />
36+
<TBulletSphereModel template="Vec3d" name="tBulletTriangleModel2" contactDistance="0" margin="0.04" />
3737
<FixedProjectiveConstraint template="Vec3d" name="fixedProjectiveConstraint0" indices="0 1 2" />
3838
</Node>
3939
</Node>

‎applications/plugins/Sensable/examples/CameraAlignment.scn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646

4747
<MechanicalObject src="@loader" template="Vec3d" name="toothState" />
4848

49-
<DistanceGrid fileRigidDistanceGrid="data/mesh/tooth.obj" scale ="2" usePoints="0" proximity="0.3" contactStiffness="1" />
49+
<DistanceGrid fileRigidDistanceGrid="data/mesh/tooth.obj" scale ="2" usePoints="0" contactDistance="0.3" contactStiffness="1" />
5050

5151

5252
</Node>

‎applications/plugins/Sensable/examples/Dentistry/dentalSurgeryDistanceGrid.scn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<OglModel name="ToothVisualModel" src="@meshLoader_0" color="white" />
2323
</Node>
2424
<Node name="CollisionModel" >
25-
<DistanceGrid fileRigidDistanceGrid="Demos/Dentistry/data/mesh/tooth-128.fmesh" scale="1.0" usePoints="0" proximity="0.0" contactStiffness="50.0" contactFriction="0.0"/>
25+
<DistanceGrid fileRigidDistanceGrid="Demos/Dentistry/data/mesh/tooth-128.fmesh" scale="1.0" usePoints="0" contactDistance="0.0" contactStiffness="50.0" contactFriction="0.0"/>
2626
</Node>
2727
</Node>
2828

‎applications/plugins/Sensable/examples/Dentistry/dentalSurgeryDistanceGrid_teeth.scn‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,19 @@
3131
<Node name="CollisionModel" >
3232
<Node>
3333
<MechanicalObject template="Rigid3d"/>
34-
<DistanceGrid fileRigidDistanceGrid="Demos/Dentistry/data/mesh/tooth-128.fmesh" scale="1.0" usePoints="0" proximity="0.0" contactStiffness="50.0" contactFriction="0.0"/>
34+
<DistanceGrid fileRigidDistanceGrid="Demos/Dentistry/data/mesh/tooth-128.fmesh" scale="1.0" usePoints="0" contactDistance="0.0" contactStiffness="50.0" contactFriction="0.0"/>
3535
</Node>
3636
<Node>
3737
<MechanicalObject template="Rigid3d" dy="-0.3" dz="-2"/>
38-
<DistanceGrid fileRigidDistanceGrid="Demos/Dentistry/data/mesh/tooth-128.fmesh" scale="1.0" usePoints="0" proximity="0.0" contactStiffness="50.0" contactFriction="0.0"/>
38+
<DistanceGrid fileRigidDistanceGrid="Demos/Dentistry/data/mesh/tooth-128.fmesh" scale="1.0" usePoints="0" contactDistance="0.0" contactStiffness="50.0" contactFriction="0.0"/>
3939
</Node>
4040
<Node>
4141
<MechanicalObject template="Rigid3d" dy="-8" dz="0.5"/>
42-
<DistanceGrid fileRigidDistanceGrid="Demos/Dentistry/data/mesh/tooth-128.fmesh" scale="1.0" usePoints="0" proximity="0.0" contactStiffness="50.0" contactFriction="0.0"/>
42+
<DistanceGrid fileRigidDistanceGrid="Demos/Dentistry/data/mesh/tooth-128.fmesh" scale="1.0" usePoints="0" contactDistance="0.0" contactStiffness="50.0" contactFriction="0.0"/>
4343
</Node>
4444
<Node>
4545
<MechanicalObject template="Rigid3d" dy="-8" dz="-1.5"/>
46-
<DistanceGrid fileRigidDistanceGrid="Demos/Dentistry/data/mesh/tooth-128.fmesh" scale="1.0" usePoints="0" proximity="0.0" contactStiffness="50.0" contactFriction="0.0"/>
46+
<DistanceGrid fileRigidDistanceGrid="Demos/Dentistry/data/mesh/tooth-128.fmesh" scale="1.0" usePoints="0" contactDistance="0.0" contactStiffness="50.0" contactFriction="0.0"/>
4747
</Node>
4848
</Node>
4949
</Node>

‎applications/plugins/Sensable/examples/SimpleBox-DistanceGrid.scn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
<MechanicalObject src="@loader" template="Vec3d" name="boxState" />
4747

48-
<DistanceGrid fileRigidDistanceGrid="data/mesh/box_inside.obj" usePoints="0" proximity="0.3" contactStiffness="2" />
48+
<DistanceGrid fileRigidDistanceGrid="data/mesh/box_inside.obj" usePoints="0" contactDistance="0.3" contactStiffness="2" />
4949

5050

5151
</Node>

‎applications/plugins/Sensable/examples/SimpleBoxLarge.scn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
<MechanicalObject src="@loader" template="Vec3d" tags="box" name="planeState" />
4747

48-
<DistanceGrid fileRigidDistanceGrid="data/mesh/box_inside.obj" scale="10" usePoints="0" proximity="0.3" contactStiffness="2" />
48+
<DistanceGrid fileRigidDistanceGrid="data/mesh/box_inside.obj" scale="10" usePoints="0" contactDistance="0.3" contactStiffness="2" />
4949

5050

5151
</Node>

‎applications/plugins/Sensable/examples/SimpleTooth-DistanceGrid.scn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646

4747
<MechanicalObject src="@loader" template="Vec3d" name="toothState" />
4848

49-
<DistanceGrid fileRigidDistanceGrid="data/mesh/tooth_closed.obj" usePoints="0" proximity="0.3" contactStiffness="1" />
49+
<DistanceGrid fileRigidDistanceGrid="data/mesh/tooth_closed.obj" usePoints="0" contactDistance="0.3" contactStiffness="1" />
5050

5151

5252
</Node>

‎applications/plugins/Sensable/examples/SpecifyingCamera.scn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848

4949
<MechanicalObject src="@loader" template="Vec3d" name="toothState" />
5050

51-
<DistanceGrid fileRigidDistanceGrid="data/mesh/tooth.obj" scale ="2" usePoints="0" proximity="0.3" contactStiffness="1" />
51+
<DistanceGrid fileRigidDistanceGrid="data/mesh/tooth.obj" scale ="2" usePoints="0" contactDistance="0.3" contactStiffness="1" />
5252

5353

5454
</Node>

0 commit comments

Comments
 (0)