Subversion Repositories gelsvn

Rev

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

Rev 145 Rev 155
Line 97... Line 97...
97 
				check_boundary_consistency(v1);
 97 
				check_boundary_consistency(v1);
98 
 
 98 
 
99 
			}
 99 
			}
100 
	}
 100 
	}
101 
 
 101 
 
102 
	bool Manifold::collapse_precond(VertexIter v1, HalfEdgeIter h)
 102 
	bool Manifold::collapse_precond(HalfEdgeIter h)
103 
	{
103 
	{
- 
 
 104 
		VertexIter v1 = h->opp->vert;
104 
		VertexIter v2 = h->vert;
 105 
		VertexIter v2 = h->vert;
105 
 
 106 
 
106 
		std::vector<Vertex*> link1;
 107 
		std::vector<Vertex*> link1;
107 
		VertexCirculator vc1(v1);
 108 
		VertexCirculator vc1(v1);
108 
		for(;!vc1.end();++vc1)
 109 
		for(;!vc1.end();++vc1)
Line 171... Line 172...
171
172
172 
		return true;
 173 
		return true;
173 
	}
 174 
	}
174 
 
 175 
 
175 
 
 176 
 
176 
 	void Manifold::collapse_halfedge(VertexIter v, HalfEdgeIter h,
177 
 	void Manifold::collapse_halfedge(HalfEdgeIter h, bool avg_vertices)
177 
																	 bool avg_vertices)
 - 
 
178 
	{
 178 
	{
- 
 
 179 
		VertexIter v = h->opp->vert;
179 
		HalfEdgeIter ho = h->opp;
 180 
		HalfEdgeIter ho = h->opp;
180 
		VertexIter n = h->vert;
 181 
		VertexIter n = h->vert;
181 
 
 182 
 
182 
		if(avg_vertices)
 183 
		if(avg_vertices)
183 
			n->pos = ((v->pos + n->pos) / 2.0f);
 184 
			n->pos = ((v->pos + n->pos) / 2.0f);