don't do unnecessary work in DMesh3.FindTriangle. Add some utility fu…

…nctions in other classes.
EnvyKong · Aug 31, 2017 · 77d126e · 77d126e
1 parent fb372dd
commit 77d126e
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 7 deletions.
diff --git a/mesh/DMesh3.cs b/mesh/DMesh3.cs
@@ -1084,16 +1084,17 @@ public int FindTriangle(int a, int b, int c)
             if (eid == InvalidID)
                 return InvalidID;
             int ei = 4 * eid;
-            int ti = 3*edges[ei + 2];
-            Index3i tri = new Index3i(triangles[ti], triangles[ti + 1], triangles[ti + 2]);
-            if (IndexUtil.is_same_triangle(a, b, c, ref tri))
+
+            // triangles attached to edge [a,b] must contain verts a and b...
+            int ti = 3 * edges[ei + 2];
+            if (triangles[ti] == c || triangles[ti + 1] == c || triangles[ti + 2] == c )
                 return edges[ei + 2];
-            if ( edges[ei + 3] != InvalidID ) {
+            if (edges[ei + 3] != InvalidID) {
                 ti = 3 * edges[ei + 3];
-                tri.a = triangles[ti]; tri.b = triangles[ti + 1]; tri.c = triangles[ti + 2];
-                if (IndexUtil.is_same_triangle(a, b, c, ref tri))
+                if (triangles[ti] == c || triangles[ti + 1] == c || triangles[ti + 2] == c )
                     return edges[ei + 3];
             }
+
             return InvalidID;
         }
 

diff --git a/mesh/DSubmesh3.cs b/mesh/DSubmesh3.cs
@@ -64,6 +64,19 @@ public void MapVerticesToSubmesh(int[] vertices)
         }
 
 
+        public int MapEdgeToSubmesh(int base_eid)
+        {
+            Index2i base_ev = BaseMesh.GetEdgeV(base_eid);
+            Index2i sub_ev = MapVerticesToSubmesh(base_ev);
+            return SubMesh.FindEdge(sub_ev.a, sub_ev.b);
+        }
+        public void MapEdgesToSubmesh(int[] edges)
+        {
+            for (int i = 0; i < edges.Length; ++i)
+                edges[i] = MapEdgeToSubmesh(edges[i]);
+        }
+
+
         public void ComputeBoundaryInfo(int[] subTriangles) {
             ComputeBoundaryInfo(subTriangles, subTriangles.Length);
         }

diff --git a/mesh/MeshConstraintUtil.cs b/mesh/MeshConstraintUtil.cs
@@ -143,5 +143,16 @@ public static void PreserveBoundaryLoops(Remesher r)
         }
 
 
+
+        public static void AddTrackedEdges(MeshConstraints cons, int[] edges, int setID)
+        {
+            EdgeConstraint ec = EdgeConstraint.Unconstrained;
+            ec.TrackingSetID = setID;
+            for ( int i = 0; i < edges.Length; ++i ) {
+                cons.SetOrUpdateEdgeConstraint(edges[i], ec);
+            }
+        }
+
+
     }
 }
diff --git a/mesh_selection/MeshBoundaryLoops.cs b/mesh_selection/MeshBoundaryLoops.cs
@@ -79,6 +79,22 @@ public Index2i FindVertexIndex(int vID)
         }
 
 
+
+        /// <summary>
+        /// find the loop that contains an edge, or return -1
+        /// </summary>
+        public int FindLoopContainingEdge(int eid)
+        {
+            int N = Loops.Count;
+            for (int li = 0; li < N; ++li) {
+                if (Loops[li].Edges.Contains(eid))
+                    return li;
+            }
+            return -1;
+        }
+
+
+
 		/// <summary>
 		/// Find the set of boundary EdgeLoops. Note that if we encounter topological
 		/// issues, we will throw MeshBoundaryLoopsException w/ more info (if possible)

diff --git a/queries/MeshValidation.cs b/queries/MeshValidation.cs
@@ -14,7 +14,9 @@ public enum ValidationStatus
         NotBoundaryEdge,
 
         VerticesNotConnectedByEdge,
-        IncorrectLoopOrientation
+        IncorrectLoopOrientation,
+
+        DuplicateTriangles
     }
 
 
@@ -70,5 +72,18 @@ public static ValidationStatus IsBoundaryLoop(DMesh3 mesh, EdgeLoop loop)
         }
 
 
+
+        public static ValidationStatus HasDuplicateTriangles(DMesh3 mesh)
+        {
+            foreach (int tid in mesh.TriangleIndices()) {
+                Index3i nbrs = mesh.GetTriNeighbourTris(tid);
+                if (nbrs.a == nbrs.b && nbrs.b == nbrs.c && nbrs.a != DMesh3.InvalidID)
+                    return ValidationStatus.DuplicateTriangles;
+            }
+
+            return ValidationStatus.Ok;
+        }
+
+
     }
 }