Merge pull request #821 from hugtalbot/fix_some_scene_stc6_collisiong…

…roup [Scenes] Fix scenes having issue with CollisionGroup
sofa-framework · Nov 20, 2018 · 32b1bee · 32b1bee
2 parents 8d88548 + e061012
commit 32b1bee
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/examples/Demos/chainAll.scn b/examples/Demos/chainAll.scn
@@ -3,7 +3,6 @@
     <BruteForceDetection name="N2" />
     <MinProximityIntersection alarmDistance="0.3" contactDistance="0.2" name="Proximity" />
     <CollisionResponse name="Response" response="default" />
-    <CollisionGroup name="Group" />
     <Node name="TorusFixed">
         <MeshObjLoader name="loader" filename="mesh/torus2_for_collision.obj" />
         <Mesh src="@loader" />

diff --git a/examples/Demos/chainHybrid.scn b/examples/Demos/chainHybrid.scn
@@ -4,7 +4,6 @@
     <BruteForceDetection name="N2" />
     <NewProximityIntersection name="Proximity" alarmDistance="0.3" contactDistance="0.2" />
     <CollisionResponse name="Response" response="default" />
-    <CollisionGroup name="Group" />
     <Node name="Chain">
         <Node name="Fixed">
             <MeshObjLoader name="loader" filename="mesh/torus_for_collision.obj" />

diff --git a/examples/Objects/TorusFFD.xml b/examples/Objects/TorusFFD.xml
@@ -11,13 +11,13 @@
 	<UniformMass totalMass="5" />
 	<RegularGridSpringForceField name="Springs" stiffness="200" damping="2" />
 	<Node name="Visu">
-		<OglModel name="Visual" fileMesh="mesh/torus.obj" color="yellow"  dx="0" dy="0" dz="0" scale="1.0"/>
+		<OglModel name="Visual" fileMesh="mesh/torus.obj" color="yellow"  scale="1.0"/>
 		<BarycentricMapping input="@.." output="@Visual" />
 	</Node>
 	<Node name="Surf2">
         <MeshObjLoader name="collisionLoader" filename="mesh/torus_for_collision.obj"/>
 		<Mesh src="@collisionLoader"/>
-		<MechanicalObject dx="0" dy="0" dz="0" scale="1.0"/>
+		<MechanicalObject scale="1.0"/>
 		<Triangle />
 		<BarycentricMapping />
 	</Node>