WebSVN – gelsvn – Diff – /branches/cpp11-devel/src/HMesh/Manifold.cpp

         ensure_boundary_consistency(hv);
+    }
     FaceID Manifold::split_face_by_edge(FaceID f, VertexID v0, VertexID v1)
+    {
-		assert(!connected(*this, v0, v1));
+		if(connected(*this, v0, v1))
+            return InvalidFaceID;
         HalfEdgeID he = kernel.last(f);
         HalfEdgeID last = he;
         int steps = 0;
         while(he != last || steps == 0){
             ++steps;
+                }
                 link.push_back(ring_v);
                 // test for infinite loop around vertex
                 if(static_cast<size_t>(j.no_steps()) > m.no_vertices()){
-                    cout << "Vertex loop contains more vertices than manifold" << endl;
+                    cout << "Vertex loop CW contains more vertices than manifold" << endl;
+                    return false;
+                }
+            }
+            for(Walker j = m.walker(*v); !j.full_circle(); j = j.circulate_vertex_ccw()) {
+                if(static_cast<size_t>(j.no_steps()) > m.no_vertices()){
+                    cout << "Vertex loop CCW contains more vertices than manifold" << endl;
                     return false;
+                }
+            }
             // test one_ring size for boundary consistency
         VertexID v1 = hew.vertex();
         // get the one-ring of v0
         vector<VertexID> link0;
         vector<FaceID> faces0;
+        int k = 0;
         for(Walker vj = m.walker(h);
             !vj.full_circle(); vj = vj.circulate_vertex_ccw()){
             link0.push_back(vj.vertex());
             if(vj.halfedge() != h)
                 faces0.push_back(vj.face());
+            if(++k>m.no_vertices())
+            {
+                cout << "mesh is corrupted" << endl;
+                return false;
+            }
+        }
         assert(link0.size() > 1);
         // get the one-ring of v1
         vector<VertexID> link1;
         vector<FaceID> faces1;
+        k=0;
         for(Walker vj = m.walker(ho);
             !vj.full_circle(); vj = vj.circulate_vertex_ccw()){
             link1.push_back(vj.vertex());
             if(vj.halfedge() != ho)
                 faces1.push_back(vj.face());
+            if(++k>m.no_vertices())
+            {
+                cout << "mesh is corrupted" << endl;
+                return false;
+            }
+        }
         assert(link1.size() > 1);
         // sort the vertices of the two rings
         sort(link0.begin(), link0.end());
                          faces1.begin(), faces1.end(),
                          fii);
         if(fisect.size() > 0)
             return false;
-        int k = 0;
+         k = 0;
         // if the adjacent face is a triangle (see 2)
         if(hew.next().next().next().halfedge() == h){
             VertexID v = hew.next().vertex();
             // valency test (see 5)

Subversion Repositories gelsvn

(root)/branches/cpp11-devel/src/HMesh/Manifold.cpp – Rev 662 → 666