[MeshTools] Update mesh to add more complex cases and update mass in …

…all scenes
InfinyTech3D · Dec 31, 2024 · 49236b4 · 49236b4
1 parent 3d623ee
commit 49236b4
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 42 deletions.
diff --git a/examples/topology_benchmarks/TriangleCuttingController_1Edge.scn b/examples/topology_benchmarks/TriangleCuttingController_1Edge.scn
@@ -43,7 +43,7 @@
         <TriangleSetTopologyContainer triangles="@loader.triangles" name="Ttopo" />
         <TriangleSetTopologyModifier name="Modifier" />
         <TriangleSetGeometryAlgorithms template="Vec3d" name="GeomAlgo" drawTriangles="1" showIndicesScale="0.04" showTriangleIndices="1" showEdgeIndices="1"/>
-        <DiagonalMass template="Vec3d,Vec3d" name="default5" massDensity="1.0" />
+        <DiagonalMass template="Vec3d,Vec3d" name="default5" massDensity="0.1" />
         <BoxROI template="Vec3d" name="box_roi1" box="-3.1 0 -9   -2.5 1 11    0.9 0 -9   1.1 1 11" drawBoxes="1"/>
         <FixedProjectiveConstraint template="Vec3d" name="fixedConstraint1" indices="@box_roi1.indices"/>
         <TriangularFEMForceField template="Vec3d" name="FEM" method="large" poissonRatio="0.45" youngModulus="600" />

diff --git a/examples/topology_benchmarks/TriangleCuttingController_1Node.scn b/examples/topology_benchmarks/TriangleCuttingController_1Node.scn
@@ -43,7 +43,7 @@
         <TriangleSetTopologyContainer triangles="@loader.triangles" name="Ttopo" />
         <TriangleSetTopologyModifier name="Modifier" />
         <TriangleSetGeometryAlgorithms template="Vec3d" name="GeomAlgo" drawTriangles="1" showIndicesScale="0.04" showTriangleIndices="1" showEdgeIndices="1"/>
-        <DiagonalMass template="Vec3d,Vec3d" name="default5" massDensity="1.0" />
+        <DiagonalMass template="Vec3d,Vec3d" name="default5" massDensity="0.1" />
         <BoxROI template="Vec3d" name="box_roi1" box="-3.1 0 -9   -2.5 1 11    0.9 0 -9   1.1 1 11" drawBoxes="1"/>
         <FixedProjectiveConstraint template="Vec3d" name="fixedConstraint1" indices="@box_roi1.indices"/>
         <TriangularFEMForceField template="Vec3d" name="FEM" method="large" poissonRatio="0.45" youngModulus="600" />

diff --git a/examples/topology_benchmarks/TriangleCuttingController_2Edge.scn b/examples/topology_benchmarks/TriangleCuttingController_2Edge.scn
@@ -43,12 +43,12 @@
         <TriangleSetTopologyContainer triangles="@loader.triangles" name="Ttopo" />
         <TriangleSetTopologyModifier name="Modifier" />
         <TriangleSetGeometryAlgorithms template="Vec3d" name="GeomAlgo" drawTriangles="1" showIndicesScale="0.04" showTriangleIndices="1" showEdgeIndices="1"/>
-        <DiagonalMass template="Vec3d,Vec3d" name="default5" massDensity="1.0" />
+        <DiagonalMass template="Vec3d,Vec3d" name="default5" massDensity="0.1" />
         <BoxROI template="Vec3d" name="box_roi1" box="-3.1 0 -9   -2.5 1 11    0.9 0 -9   1.1 1 11" drawBoxes="1"/>
         <FixedProjectiveConstraint template="Vec3d" name="fixedConstraint1" indices="@box_roi1.indices"/>
         <TriangularFEMForceField template="Vec3d" name="FEM" method="large" poissonRatio="0.45" youngModulus="600" />
         <TriangleCollisionModel name="default7" selfCollision="true" />       
-        <TriangleCuttingController name="TriCtrl" methodToTest="3"/>
+        <TriangleCuttingController name="TriCtrl" methodToTest="2"/>
     </Node>
 
 </Node>
diff --git a/examples/topology_benchmarks/TriangleCuttingController_2Node.scn b/examples/topology_benchmarks/TriangleCuttingController_2Node.scn
@@ -43,7 +43,7 @@
         <TriangleSetTopologyContainer triangles="@loader.triangles" name="Ttopo" />
         <TriangleSetTopologyModifier name="Modifier" />
         <TriangleSetGeometryAlgorithms template="Vec3d" name="GeomAlgo" drawTriangles="1" showIndicesScale="0.04" showTriangleIndices="1" showEdgeIndices="1"/>
-        <DiagonalMass template="Vec3d,Vec3d" name="default5" massDensity="1.0" />
+        <DiagonalMass template="Vec3d,Vec3d" name="default5" massDensity="0.1" />
         <BoxROI template="Vec3d" name="box_roi1" box="-3.1 0 -9   -2.5 1 11    0.9 0 -9   1.1 1 11" drawBoxes="1"/>
         <FixedProjectiveConstraint template="Vec3d" name="fixedConstraint1" indices="@box_roi1.indices"/>
         <TriangularFEMForceField template="Vec3d" name="FEM" method="large" poissonRatio="0.45" youngModulus="600" />

diff --git a/examples/topology_benchmarks/TriangleCuttingController_3Edge.scn b/examples/topology_benchmarks/TriangleCuttingController_3Edge.scn
@@ -43,12 +43,12 @@
         <TriangleSetTopologyContainer triangles="@loader.triangles" name="Ttopo" />
         <TriangleSetTopologyModifier name="Modifier" />
         <TriangleSetGeometryAlgorithms template="Vec3d" name="GeomAlgo" drawTriangles="1" showIndicesScale="0.04" showTriangleIndices="1" showEdgeIndices="1"/>
-        <DiagonalMass template="Vec3d,Vec3d" name="default5" massDensity="1.0" />
+        <DiagonalMass template="Vec3d,Vec3d" name="default5" massDensity="0.1" />
         <BoxROI template="Vec3d" name="box_roi1" box="-3.1 0 -9   -2.5 1 11    0.9 0 -9   1.1 1 11" drawBoxes="1"/>
         <FixedProjectiveConstraint template="Vec3d" name="fixedConstraint1" indices="@box_roi1.indices"/>
         <TriangularFEMForceField template="Vec3d" name="FEM" method="large" poissonRatio="0.45" youngModulus="600" />
         <TriangleCollisionModel name="default7" selfCollision="true" />       
-        <TriangleCuttingController name="TriCtrl" methodToTest="4"/>
+        <TriangleCuttingController name="TriCtrl" methodToTest="3"/>
     </Node>
 
 </Node>
diff --git a/examples/topology_benchmarks/mesh/triangles_8.mtl b/examples/topology_benchmarks/mesh/triangles_8.mtl
@@ -1,2 +1,12 @@
-# Blender 4.0.2 MTL File: 'None'
-# www.blender.org
+# Blender MTL File: 'None'
+# Material Count: 1
+
+newmtl Default_OBJ
+Ns 225.000000
+Ka 1.000000 1.000000 1.000000
+Kd 0.800000 0.800000 0.800000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
diff --git a/examples/topology_benchmarks/mesh/triangles_8.obj b/examples/topology_benchmarks/mesh/triangles_8.obj
@@ -1,32 +1,31 @@
-# Blender 4.0.2
+# Blender v2.92.0 OBJ File: ''
 # www.blender.org
 mtllib triangles_8.mtl
 o Plane
-v 0.000000 0.000000 1.000000
 v 0.000000 0.000000 0.000000
-v 0.000000 -0.000000 -0.500000
-v 0.000000 0.000000 0.500000
-v -0.250000 0.000000 1.000000
-v 0.100000 -0.000000 -0.750000
-v 0.100000 0.000000 0.250000
-v 0.350000 0.000000 0.000000
-v 0.350000 0.000000 1.000000
-v 0.100000 -0.000000 -0.250000
-v 0.100000 0.000000 0.750000
+v -0.250000 0.000000 -0.250000
 v -0.250000 0.000000 0.000000
-v 0.350000 0.000000 0.500000
-v -0.250000 0.000000 0.500000
-v -0.250000 -0.000000 -0.500000
-v 0.350000 -0.000000 -0.500000
-v 0.350000 -0.000000 -0.250000
-v 0.350000 -0.000000 -0.750000
-v -0.250000 -0.000000 -0.250000
-v -0.250000 0.000000 0.750000
-v 0.350000 0.000000 0.750000
-v 0.350000 0.000000 0.250000
-v -0.250000 0.000000 0.250000
-v -0.250000 -0.000000 -0.750000
-vn -0.0000 1.0000 -0.0000
+v 0.000000 -0.000000 1.000000
+v -0.250000 -0.000000 0.750000
+v -0.250000 -0.000000 1.000000
+v 0.000000 -0.000000 0.500000
+v -0.250000 -0.000000 0.250000
+v -0.250000 -0.000000 0.500000
+v 0.000000 0.000000 -0.500000
+v -0.250000 0.000000 -0.750000
+v -0.250000 0.000000 -0.500000
+v 1.000000 0.000000 -0.125000
+v 1.000000 0.000000 -0.250000
+v 0.100000 0.000000 -0.250000
+v 0.350000 0.000000 -0.500000
+v 0.350000 0.000000 -1.250000
+v 0.100000 0.000000 -0.750000
+v 0.500000 -0.000000 1.250000
+v 0.500000 -0.000000 0.750000
+v 0.100000 -0.000000 0.750000
+v 0.350000 -0.000000 0.500000
+v 0.600000 -0.000000 0.250000
+v 0.100000 -0.000000 0.250000
 vt 0.500000 0.500000
 vt 0.375000 0.625000
 vt 0.375000 0.500000
@@ -51,12 +50,14 @@ vt 0.500000 0.125000
 vt 0.625000 0.250000
 vt 0.625000 0.375000
 vt 0.500000 0.375000
-s 0
-f 2/1/1 19/2/1 12/3/1
-f 1/4/1 20/5/1 5/6/1
-f 4/7/1 23/8/1 14/9/1
-f 3/10/1 24/11/1 15/12/1
-f 8/13/1 17/14/1 10/15/1
-f 16/16/1 18/17/1 6/18/1
-f 9/19/1 21/20/1 11/21/1
-f 13/22/1 22/23/1 7/24/1
+vn 0.0000 1.0000 0.0000
+usemtl Default_OBJ
+s 1
+f 1/1/1 2/2/1 3/3/1
+f 5/5/1 6/6/1 4/4/1
+f 9/9/1 7/7/1 8/8/1
+f 10/10/1 12/12/1 11/11/1
+f 13/13/1 14/14/1 15/15/1
+f 16/16/1 17/17/1 18/18/1
+f 19/19/1 20/20/1 21/21/1
+f 22/22/1 23/23/1 24/24/1