File tree Expand file tree Collapse file tree 6 files changed +27
-11
lines changed
Expand file tree Collapse file tree 6 files changed +27
-11
lines changed Original file line number Diff line number Diff line change 247247 <TriangleSetTopologyContainer name =" FloorTopology" position =" -20 -15 1 50 -15 1 50 15 1 -20 15 1" triangles =" 0 2 1 0 3 2" />
248248 <MechanicalObject name =" FloorDOF" template =" Vec3d" />
249249 <TriangleCollisionModel name =" FloorCM" contactDistance =" 0.02" moving =" 0" simulated =" 0" color =" 0.3 0.3 0.3 0.1" />
250- <OglModel name =" VisualModel" src =" @FloorTopology" />
250+ <Node name =" Visu" >
251+ <OglModel name =" VisualModel" src =" @../FloorTopology" />
252+ </Node >
251253 </Node >
252254
253255
256258 <TriangleSetTopologyContainer name =" CeilTopology" position =" -20 -15 -20 50 -15 -20 50 15 -20 -20 15 -20" triangles =" 0 1 2 3 0 2" />
257259 <MechanicalObject name =" CeilDOF" template =" Vec3d" />
258260 <TriangleCollisionModel name =" CeilCM" contactDistance =" 0.02" moving =" 0" simulated =" 0" color =" 0.3 0.3 0.3 0.1" />
259- <OglModel name =" VisualModel" src =" @CeilTopology" />
261+ <Node name =" Visu" >
262+ <OglModel name =" VisualModel" src =" @../CeilTopology" />
263+ </Node >
260264 </Node >
261265</Node >
262266
Original file line number Diff line number Diff line change 3636 <TriangleCollisionModel moving="0" simulated="0" />
3737 <LineCollisionModel moving="0" simulated="0" />
3838 <PointCollisionModel moving="0" simulated="0" />
39- <OglModel color="0.500 0.500 0.500" src="@../loader_torus2" name="Visual" />
39+ <Node name="Visu">
40+ <OglModel color="0.500 0.500 0.500" src="@../../loader_torus2" name="Visual" />
41+ </Node>
4042 </Node>
4143 <Node name="TorusFEM">
4244 <EulerImplicitSolver rayleighStiffness="0.1" rayleighMass="0.1"/>
363365 <TriangleCollisionModel moving="0" simulated="0" />
364366 <LineCollisionModel moving="0" simulated="0" />
365367 <PointCollisionModel moving="0" simulated="0" />
366- <OglModel color="0.500 0.500 0.500" dx="0.0000" dy="0.0000" dz="24.0000" src="@../loader_torus2" name="Visual" rx="0.0000" ry="0.0000" rz="0.0000" />
368+ <Node name="Visu">
369+ <OglModel color="0.500 0.500 0.500" dx="0.0000" dy="0.0000" dz="24.0000" src="@../../loader_torus2" name="Visual" rx="0.0000" ry="0.0000" rz="0.0000" />
370+ </Node>
367371 </Node>
368372 <Node name="CRigid_Torus_1">
369373 <EulerImplicitSolver rayleighStiffness="0.01" rayleighMass="0.01"/>
Original file line number Diff line number Diff line change 3131 <MeshTopology src =" @loaderMeca" />
3232 <MechanicalObject src =" @loaderMeca" rx =" 90" />
3333 <TriangleCollisionModel simulated =" 0" moving =" 0" />
34- <OglModel name =" Visual" src =" @loaderVisual" color =" gray" rx =" 90" />
34+ <Node name =" Visu" >
35+ <OglModel name =" Visual" src =" @../loaderVisual" color =" gray" rx =" 90" />
36+ </Node >
3537 </Node >
3638 <include name =" FEM" href =" Objects/TorusFEM.xml" dx =" 2.5" />
3739 <include name =" Spring" href =" Objects/TorusSpring.xml" dx =" 5" rx =" 90" />
Original file line number Diff line number Diff line change 3030 <MeshTopology src =" @loaderMeca" />
3131 <MechanicalObject src =" @loaderMeca" rx =" 90" />
3232 <TriangleCollisionModel simulated =" 0" moving =" 0" />
33- <OglModel name =" Visual" src =" @loaderVisual" color =" gray" rx =" 90" />
33+ <Node name =" Visu" >
34+ <OglModel name =" Visual" src =" @../loaderVisual" color =" gray" rx =" 90" />
35+ </Node >
3436 </Node >
3537 <include name =" FEM" href =" Objects/TorusFEM.xml" dx =" 2.5" />
3638 <include name =" Spring" href =" Objects/TorusSpring.xml" dx =" 5" rx =" 90" />
Original file line number Diff line number Diff line change 117117 <TriangleCollisionModel name =" FloorTriangleModel" simulated =" 0" moving =" 0" />
118118 <LineCollisionModel name =" FloorLineModel" simulated =" 0" moving =" 0" />
119119 <PointCollisionModel name =" FloorPointModel" simulated =" 0" moving =" 0" />
120- <OglModel name =" FloorV" src =" @../../Loader-floor" scale =" 0.5" texturename =" textures/floor.bmp" dy =" -10" />
120+ <Node name =" Visu" >
121+ <OglModel name =" FloorV" src =" @../../../Loader-floor" scale =" 0.5" texturename =" textures/floor.bmp" dy =" -10" />
122+ </Node >
121123 </Node >
122124</Node >
Original file line number Diff line number Diff line change 3636
3737 <Node name =" BEAMVOLUME" >
3838 <RegularGridTopology name =" HexaTop" n =" 25 5 5" min =" 0 0 0" max =" 0.5 0.1 0.1" />
39- <TetrahedronSetTopologyContainer name =" Container" position =" @HexaTop.position" />
40- <TetrahedronSetTopologyModifier name =" Modifier" />
41- <Hexa2TetraTopologicalMapping input =" @HexaTop" output =" @Container" swapping =" true" />
39+ <Node name =" tetraGrid" >
40+ <TetrahedronSetTopologyContainer name =" Container" position =" @HexaTop.position" />
41+ <TetrahedronSetTopologyModifier name =" Modifier" />
42+ <Hexa2TetraTopologicalMapping input =" @HexaTop" output =" @Container" swapping =" true" />
43+ </Node >
4244 </Node >
4345
4446 <Node name =" FEM" >
4749 <SparseLDLSolver name =" precond" template =" CompressedRowSparseMatrixMat3x3" parallelInverseProduct =" true" />
4850
4951 <TetrahedronSetTopologyContainer name =" Container" position =" @../BEAMVOLUME/HexaTop.position"
50- tetrahedra =" @../BEAMVOLUME/Container.tetrahedra" />
52+ tetrahedra =" @../BEAMVOLUME/tetraGrid/ Container.tetrahedra" />
5153 <TetrahedronSetTopologyModifier name =" Modifier" />
5254
5355 <MechanicalObject name =" mstate" template =" Vec3d" src =" @Container" />
You can’t perform that action at this time.
0 commit comments