Subversion Repositories gelsvn

Rev

Rev 150 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 150 Rev 155
Line 136... Line 136...
136
								if(is_boundary(vc.get_halfedge()->vert)) continue;
136
								if(is_boundary(vc.get_halfedge()->vert)) continue;
137
								HalfEdgeIter he = vc.get_halfedge()->opp;
137
								HalfEdgeIter he = vc.get_halfedge()->opp;
138
 
138
 
139
								VertexIter n = vc.get_vertex();
139
								VertexIter n = vc.get_vertex();
140
								float dist = length(he);
140
								float dist = length(he);
141
								if((dist<thresh) && mani.collapse_precond(n,he))
141
								if((dist<thresh) && mani.collapse_precond(he))
142
									{
142
									{
143
											if(vertex_error(vi,n->pos) < 
143
											if(vertex_error(vi,n->pos) < 
144
											 vertex_error(n,vi->pos))
144
											 vertex_error(n,vi->pos))
145
													vi->pos = n->pos;
145
													vi->pos = n->pos;
146
 
146
 
147
										mani.collapse_halfedge(n,he);
147
										mani.collapse_halfedge(he);
148
										did_work = true;
148
										did_work = true;
149
										break;
149
										break;
150
									}
150
									}
151
							}
151
							}
152
					}
152
					}