Skip to content

Commit d9afc76

Browse files
Lucas-TJLucas-TJ
committed
delete comments
1 parent 8b956e2 commit d9afc76

7 files changed

Lines changed: 13 additions & 188 deletions

‎examples/xml/testClampedSquare.scn‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,7 @@
4848
<ConstantForceField indices="0-24" forces="0 0 11.1 0 0 0"/>
4949
<TriangularBendingFEMForceField name="FEM" bending="true" youngModulus="1.092e6" poissonRatio="0.3" thickness="0.1" />
5050

51-
<Node name="SubTriangles">
52-
53-
<TriangleSetTopologyContainer name="subTrianglesTopo"/>
54-
<!-- <TriangleSubdivisionTopologicalMapping object1="trianglesTopo" object2="subTrianglesTopo" subdivisions="2"/>
55-
--> <MechanicalObject name="subPoints" topology="@subTrianglesTopo" />
56-
<BendingPlateMechanicalMapping input="@../tri" output="@subPoints" />
57-
<TriangleCollisionModel/>
58-
</Node>
51+
5952

6053
</Node>
6154

‎examples/xml/testShell6.scn‎

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -31,30 +31,7 @@
3131
<BVHNarrowPhase/>
3232
<CollisionResponse name="Response" response="PenaltyContactForceField"/>
3333
<MinProximityIntersection name="Proximity" alarmDistance="0.8" contactDistance="0.5"/>
34-
<!--<Node name="pointA">
35-
<MechanicalObject template="Rigid3" name="fixedPoint" position="0 1 0 0 0 0 1"/>
36-
</Node>
37-
38-
<Node name="pointB">
39-
<MechanicalObject template="Rigid3" name="fixedPoint" position="0 0.5 0 0 0 0 1"/>
40-
</Node>
41-
42-
<Node name="pointC">
43-
<MechanicalObject template="Rigid3" name="fixedPoint" position="0 0 0 0 0 0 1"/>
44-
</Node>
45-
46-
<Node name="pointD">
47-
<MechanicalObject template="Rigid3" name="fixedPoint" position="0.45 0.75 0 0 0 0 1"/>
48-
</Node>
49-
50-
<Node name="pointE">
51-
<MechanicalObject template="Rigid3" name="fixedPoint" position="0.45 0.25 0 0 0 1"/>
52-
</Node>
53-
54-
<Node name="pointF">
55-
<MechanicalObject template="Rigid3" name="fixedPoint" position="0.9 0.5 0 0 0 0 1"/>
56-
</Node>-->
57-
34+
5835
<Node name="4triangles">
5936
<EulerImplicitSolver rayleighMass="1.0" rayleighStiffness="1.5"/>
6037
<!--<CGLinearSolver iterations="100" tolerance="1e-15" threshold="1e-15"/>-->
@@ -66,8 +43,6 @@
6643
<TriangleSetTopologyContainer name="baseTriangles" src="@loader"/>
6744
<MechanicalObject name="tri" template="Rigid3" topology="@baseTriangles" showIndices="false" showIndicesScale="0.0007"/>
6845
<UniformMass vertexMass="0.1 0.1 [ 0.1 0 0 , 0 0.1 0 , 0 0 0.05 ]" showAxisSizeFactor="0.2" />
69-
<!--<AttachProjectiveConstraint name="Constraint" object2="@tri" object1="@/pointA/fixedPoint" indices1="0" indices2="0" freeRotations="false" />
70-
<AttachProjectiveConstraint name="Constraint2" object2="@tri" object1="@/pointC/fixedPoint" indices1="0" indices2="2" freeRotations="false" />-->
7146
<FixedProjectiveConstraint indices="0 2"/>
7247
<FixedRotationProjectiveConstraint FixedZRotation="true"/>
7348
<ConstantForceField indices="5" forces="0 0 0.05 0 0 0"/>
@@ -86,16 +61,6 @@
8661
</Node>
8762
</Node>
8863

89-
90-
<!-- <Node>-->
91-
<!-- <MechanicalObject name="basePointsVec3" template="Vec3d"/>-->
92-
<!-- <IdentityMapping/>-->
93-
<!-- <Node name="VisualBasePoints">-->
94-
<!-- <OglModel name="Visual" color="green"/>-->
95-
<!-- <IdentityMapping object1="basePointsVec3" object2="Visual"/>-->
96-
<!-- </Node>-->
97-
<!-- </Node>-->
98-
9964

10065

10166
</Node>

‎examples/xml/testShell6bis.scn‎

Lines changed: 3 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -32,43 +32,17 @@
3232
<CollisionResponse name="Response" response="PenaltyContactForceField"/>
3333
<MinProximityIntersection name="Proximity" alarmDistance="0.8" contactDistance="0.5"/>
3434

35-
<!--<Node name="pointA">
36-
<MechanicalObject template="Rigid3" name="fixedPoint" position="0 0 0 0 0 0 1"/>
37-
</Node>
38-
39-
<Node name="pointB">
40-
<MechanicalObject template="Rigid3" name="fixedPoint" position="0.5 0 0 0 0 0 1"/>
41-
</Node>
42-
43-
<Node name="pointC">
44-
<MechanicalObject template="Rigid3" name="fixedPoint" position="1 0 0 0 0 0 1"/>
45-
</Node>
46-
47-
<Node name="pointD">
48-
<MechanicalObject template="Rigid3" name="fixedPoint" position="0.25 0.45 0 0 0 0 1"/>
49-
</Node>
50-
51-
<Node name="pointE">
52-
<MechanicalObject template="Rigid3" name="fixedPoint" position="0.75 0.45 0 0 0 1"/>
53-
</Node>
54-
55-
<Node name="pointF">
56-
<MechanicalObject template="Rigid3" name="fixedPoint" position="0.5 0.9 0 0 0 0 1"/>
57-
</Node>-->
58-
5935
<Node name="4triangles">
6036
<EulerImplicitSolver rayleighMass="1.0" rayleighStiffness="1.5"/>
61-
<!-- <CGLinearSolver iterations="100" tolerance="1e-15" threshold="1e-15"/>-->
62-
<!-- <CGLinearSolver template="FullMatrix" iterations="100" tolerance="1e-15" threshold="1e-15"/>-->
37+
<!--<CGLinearSolver iterations="100" tolerance="1e-15" threshold="1e-15"/>-->
38+
<!--<CGLinearSolver template="FullMatrix" iterations="100" tolerance="1e-15" threshold="1e-15"/>-->
6339
<!--<SparseLDLSolver name="SparseLDL Solver" printLog="false" />-->
6440
<CGLinearSolver iterations="100" tolerance="1e-15" threshold="1e-15"/>
6541
<Node name="fixed">
6642
<MeshOBJLoader name="loader" filename="../../../Shell/mesh/4triangles_bis.obj"/>
6743
<TriangleSetTopologyContainer name="baseTriangles" src="@loader" />
6844
<MechanicalObject name="tri" template="Rigid3" topology="@baseTriangles" showIndices="true" showIndicesScale="0.0007"/>
6945
<UniformMass vertexMass="0.1 0.1 [ 0.1 0 0 , 0 0.1 0 , 0 0 0.05 ]" showAxisSizeFactor="0.2" />
70-
<!--<AttachProjectiveConstraint name="Constraint" object2="@tri" object1="@/pointA/fixedPoint" indices1="0" indices2="0" freeRotations="false" />
71-
<AttachProjectiveConstraint name="Constraint2" object2="@tri" object1="@/pointC/fixedPoint" indices1="0" indices2="2" freeRotations="false" />-->
7246
<FixedProjectiveConstraint indices="0 2"/>
7347
<FixedRotationProjectiveConstraint FixedZRotation="true"/>
7448
<ConstantForceField indices="5" forces="0 0 1 0 0 0"/>
@@ -77,7 +51,7 @@
7751
<TriangleSetTopologyContainer name="subTriangles"/>
7852
<!--<TriangleSubdivisionTopologicalMapping object1="baseTriangles" object2="subTriangles" subdivisions="2"/>-->
7953
<MechanicalObject name="subPoints" topology="@subTriangles" showIndices="true" showIndicesScale="0.0003"/>
80-
<!-- <ConstantForceField points="5 9" forces="0 0 3"/>-->
54+
<!--<ConstantForceField points="5 9" forces="0 0 3"/>-->
8155
<BendingPlateMechanicalMapping input="@../tri" output="@subPoints"/>
8256
<TriangleCollisionModel />
8357
<Node name="visual">
@@ -86,15 +60,6 @@
8660
</Node>
8761
</Node>
8862
</Node>
89-
<!-- <Node>-->
90-
<!-- <MechanicalObject name="basePointsVec3" template="Vec3d"/>-->
91-
<!-- <IdentityMapping/>-->
92-
<!-- <Node name="VisualBasePoints">-->
93-
<!-- <OglModel name="Visual" color="green"/>-->
94-
<!-- <IdentityMapping object1="basePointsVec3" object2="Visual"/>-->
95-
<!-- </Node>-->
96-
<!-- </Node>-->
97-
9863

9964

10065
</Node>

‎examples/xml/testShell7.scn‎

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -71,32 +71,9 @@
7171
<FixedRotationProjectiveConstraint FixedZRotation="true"/>
7272
<ConstantForceField indices="9-11" forces="0 0 5 0 0 0"/>
7373
<TriangularBendingFEMForceField name="FEM" bending="true" youngModulus="1.092e6" poissonRatio="0.49" thickness="0.1"/>
74-
<Node name="SubTriangles">
75-
<!--<TriangleSubdivisionTopologicalMapping name="subMapping"
76-
input="@../baseTriangles" output="@../baseTriangles"
77-
inputPositions="@../tri.position" inputTriangles="@../baseTriangles.triangles"
78-
subdivisions="3"/>-->
79-
<TriangleSetTopologyContainer name="subTrianglesTopo"
80-
position="@subMapping.outputPositions" triangles="@subMapping.outputTriangles" />
81-
<MechanicalObject name="subPoints" topology="@subTrianglesTopo" rest_position="@subMapping.outputPositions" />
82-
<BendingPlateMechanicalMapping input="@.." output="@."/>
83-
<TriangleCollisionModel />
84-
<Node name="visual">
85-
<OglModel name="Visual" color="red"/>
86-
<IdentityMapping input="@../subPoints" output="@Visual"/>
87-
</Node>
88-
</Node>
74+
8975
</Node>
90-
<!-- <Node>-->
91-
<!-- <MechanicalObject name="basePointsVec3" template="Vec3d"/>-->
92-
<!-- <IdentityMapping/>-->
93-
<!-- <Node name="VisualBasePoints">-->
94-
<!-- <OglModel name="Visual" color="green"/>-->
95-
<!-- <IdentityMapping object1="@basePointsVec3" object2="Visual"/>-->
96-
<!-- </Node>-->
97-
<!-- </Node>-->
98-
99-
76+
10077

10178
</Node>
10279
</Node>

‎examples/xml/testShell7_small_bis.scn‎

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -43,25 +43,6 @@
4343
<!-- <OglModel name="Visual" color="green"/>-->
4444
</Node>
4545

46-
<!--<Node name="pointA">
47-
<MechanicalObject template="Rigid3" name="fixedPoint" position="0 0 0 0.5 -0.5 -0.5 0.5"/>
48-
</Node>
49-
50-
<Node name="pointB">
51-
<MechanicalObject template="Rigid3" name="fixedPoint" position="0 0 0.001 0.5 -0.5 -0.5 0.5"/>
52-
</Node>
53-
54-
<Node name="pointC">
55-
<MechanicalObject template="Rigid3" name="fixedPoint" position="0 0 0.002 0.5 -0.5 -0.5 0.5"/>
56-
</Node>
57-
58-
<Node name="pointD">
59-
<MechanicalObject template="Rigid3" name="fixedPoint" position="0 0 0.003 0.5 -0.5 -0.5 0.5"/>
60-
</Node>
61-
62-
<Node name="pointE">
63-
<MechanicalObject template="Rigid3" name="fixedPoint" position="0 0 0.004 0.5 -0.5 -0.5 0.5"/>
64-
</Node>-->
6546

6647
<Node name="7smallTriangles">
6748
<EulerImplicitSolver rayleighMass="1.0" rayleighStiffness="0.5"/>
@@ -71,36 +52,10 @@
7152
<TriangleSetTopologyContainer name="baseTriangles" src="@loader" />
7253
<MechanicalObject name="tri" template="Rigid3" topology="@baseTriangles" showIndices="false" showIndicesScale="0.0007" rest_position="@../Rest_position/RestVertex2Frame.frames" position="@../Rest_position/RestVertex2Frame.frames"/>
7354
<UniformMass vertexMass="0.1 0.1 [ 0.1 0 0 , 0 0.1 0 , 0 0 0.05 ]" showAxisSizeFactor="0.0002" />
74-
<!--<AttachProjectiveConstraint name="ConstraintA" object2="@tri" object1="@/pointA/fixedPoint" indices1="0" indices2="0" freeRotations="false" />
75-
<AttachProjectiveConstraint name="ConstraintB" object2="@tri" object1="@/pointB/fixedPoint" indices1="0" indices2="1" freeRotations="false" />
76-
<AttachProjectiveConstraint name="ConstraintC" object2="@tri" object1="@/pointC/fixedPoint" indices1="0" indices2="2" freeRotations="false" />
77-
<AttachProjectiveConstraint name="ConstraintD" object2="@tri" object1="@/pointD/fixedPoint" indices1="0" indices2="3" freeRotations="false" />
78-
<AttachProjectiveConstraint name="ConstraintE" object2="@tri" object1="@/pointE/fixedPoint" indices1="0" indices2="4" freeRotations="false" />-->
79-
<FixedRotationProjectiveConstraint FixedZRotation="true"/>
8055
<FixedProjectiveConstraint indices="0-4"/>
8156
<ConstantForceField indices="9-11" forces="-0.00005 0 0 0 0 0"/>
8257
<TriangularBendingFEMForceField name="FEM" bending="true" youngModulus="1.092e6" poissonRatio="0.42" thickness="0.0001"/>
83-
84-
<!-- <Node>-->
85-
<!-- <MechanicalObject name="basePointsVec3" template="Vec3d"/>-->
86-
<!-- <IdentityMapping/>-->
87-
<!-- <Node name="VisualBasePoints">-->
88-
<!-- <OglModel name="Visual" color="green"/>-->
89-
<!-- <IdentityMapping object1="@/basePointsVec3" object2="@Visual"/>-->
90-
<!-- </Node>-->
91-
<!-- </Node>-->
92-
93-
<Node name="SubTriangles">
94-
<TriangleSetTopologyContainer name="subTriangles"/>
95-
<!--<TriangleSubdivisionTopologicalMapping object1="@baseTriangles" object2="@subTriangles" subdivisions="2"/>-->
96-
<MechanicalObject name="subPoints" topology="@subTriangles" showIndices="false" showIndicesScale="0.0003"/>
97-
<BendingPlateMechanicalMapping input="@../tri" output="@subPoints"/>
98-
<TriangleCollisionModel />
99-
<Node name="visual">
100-
<OglModel name="Visual" color="red"/>
101-
<IdentityMapping input="@../subPoints" output="@Visual"/>
102-
</Node>
103-
</Node>
58+
10459

10560
</Node>
10661
</Node>

‎examples/xml/testShellClampedSquare.scn‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -101,18 +101,7 @@ Results with bending only and a 9x9 grid:
101101
<TriangularBendingFEMForceField name="FEM" bending="true" youngModulus="1.092e6" poissonRatio="0.42" thickness="0.001" />
102102
<ConstantForceField indices="0 1 2 3 4 5 6 7 8" forces="0 0 0.001 0 0 0"/>
103103

104-
<Node name="SubTriangles">
105-
<TriangleSetTopologyContainer name="subTrianglesTopo"/>
106-
<!--TriangleSubdivisionTopologicalMapping object1="trianglesTopo" object2="subTrianglesTopo" subdivisions="1"/>-->
107-
<MechanicalObject name="subPoints" topology="@subTrianglesTopo"/>
108-
<BendingPlateMechanicalMapping input="@../../basePoints" output="@subPoints" />
109-
<TriangleCollisionModel />
110-
111-
<Node name="visual">
112-
<OglModel name="Visual" color="green"/>
113-
<IdentityMapping input="@../subPoints" output="@Visual"/>
114-
</Node>
115-
</Node>
104+
116105

117106
</Node>
118107
</Node>

‎examples/xml/testShellFoldingSquare2.scn‎

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
<Node name="Square">
3939
<EulerImplicitSolver rayleighMass="1.0" rayleighStiffness="1.0" />
4040
<CGLinearSolver iterations="75" tolerance="1e-15" threshold="1e-15"/>
41-
<!-- <SparseLDLSolver name="SparseLDL Solver" printLog="false" />-->
42-
<!-- <CholeskySolver name="Cholesky Preconditioner" printLog="false" />-->
41+
<!--<SparseLDLSolver name="SparseLDL Solver" printLog="false" />-->
42+
<!--<CholeskySolver name="Cholesky Preconditioner" printLog="false" />-->
4343
<RegularGridTopology name="gridTopo" min="0 0 0" max="0.01 0.01 0" nx="10" ny="10" nz="1"/>
4444
<MechanicalObject template="Rigid3" />
4545
<UniformMass vertexMass="0.01 0.1 [ 0.1 0 0 , 0 0.1 0 , 0 0 0.05 ]" showAxisSizeFactor="0.005"/>
@@ -53,32 +53,13 @@
5353
<TriangleSetTopologyModifier name="Modifier" />
5454
<Quad2TriangleTopologicalMapping input="@../gridTopo" output="@trianglesTopo" />
5555
<MechanicalObject name="basePoints" template="Rigid3"/>
56-
<!-- <WriteState filename="FoldingSquare.state" writeX="1" writeV="0"/>-->
56+
<!--<WriteState filename="FoldingSquare.state" writeX="1" writeV="0"/>-->
5757
<IdentityMapping />
5858
<TriangularBendingFEMForceField name="FEM" bending="true" youngModulus="1e6" poissonRatio="0.42" thickness="0.001" />
5959

6060
<ConstantForceField indices="0-99" forces="0 0 0.3 0 0 0"/>
6161

62-
<!-- <Node>-->
63-
<!-- <MechanicalObject name="basePointsVec3" template="Vec3d"/>-->
64-
<!-- <IdentityMapping/>-->
65-
<!-- <Node name="VisualBasePoints">-->
66-
<!-- <OglModel name="Visual" color="green"/>-->
67-
<!-- <IdentityMapping object1="basePointsVec3" object2="Visual"/>-->
68-
<!-- </Node>-->
69-
<!-- </Node>-->
70-
71-
<Node name="SubTriangles">
72-
<!-- <TriangleSetTopologyContainer name="subTrianglesTopo" filename="applications/plugins/shells/mesh/square3.msh"/>-->
73-
<TriangleSetTopologyContainer name="subTrianglesTopo"/>
74-
<!--<TriangleSubdivisionTopologicalMapping object1="trianglesTopo" object2="subTrianglesTopo" subdivisions="2"/>-->
75-
<MechanicalObject name="subPoints" topology="@subTrianglesTopo" />
76-
<BendingPlateMechanicalMapping input="@../basePoints" output="@subPoints"/>
77-
<Node name="visual">
78-
<OglModel name="Visual" color="red"/>
79-
<IdentityMapping input="@../subPoints" output="@Visual"/>
80-
</Node>
81-
</Node>
62+
8263

8364
</Node>
8465

0 commit comments

Comments
 (0)