Subversion Repositories gelsvn

Rev

Rev 62 | Rev 113 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 62 Rev 104
Line 55... Line 55...
55
		link(hno,ho->next);
55
		link(hno,ho->next);
56
		link(ho, hno);
56
		link(ho, hno);
57
		hno->vert = vo;
57
		hno->vert = vo;
58
		ho->vert = vn;
58
		ho->vert = vn;
59
 
59
 
-
 
60
		if(h->face != NULL_FACE_ITER)
60
 		h->face->last = hn;
61
				h->face->last = hn;
-
 
62
		if(ho->face != NULL_FACE_ITER)
61
 		ho->face->last = ho;
63
				ho->face->last = ho;
-
 
64
 
62
		hn->face = h->face;
65
		hn->face = h->face;
63
		hno->face = ho->face;
66
		hno->face = ho->face;
64
 
67
 
65
		check_boundary_consistency(vn);
68
		check_boundary_consistency(vn);
66
		check_boundary_consistency(v);
69
		check_boundary_consistency(v);
Line 554... Line 557...
554
		// after the operation which means it would be degenerate.
557
		// after the operation which means it would be degenerate.
555
		VertexIter va = h1->vert;
558
		VertexIter va = h1->vert;
556
		VertexIter vb = h2->vert;
559
		VertexIter vb = h2->vert;
557
		int vala = valency(va);
560
		int vala = valency(va);
558
		int valb = valency(vb);
561
		int valb = valency(vb);
559
		if((vala <= 3) || (valb <= 3))
562
		if((vala <= 3 && !is_boundary(va)) || 
-
 
563
			 (valb <= 3 && !is_boundary(vb)))
560
			return false;
564
			return false;
561
		
565
		
562
		// If the two vertices being connected by the flip are already
566
		// If the two vertices being connected by the flip are already
563
		// connected, the mesh would become degenerate, so we disallow
567
		// connected, the mesh would become degenerate, so we disallow
564
		// the operation.
568
		// the operation.