Subversion Repositories gelsvn

Rev

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

Rev 149 Rev 155
Line 18... Line 18...
18 
#include "Util/HashTable.h"
 18 
#include "Util/HashTable.h"
19 
#include "Util/HashKey.h"
 19 
#include "Util/HashKey.h"
20 
 
 20 
 
21 
#include "fair_polygonize.h"
 21 
#include "fair_polygonize.h"
22 
 
 22 
 
23 
namespace Geometry
 23 
namespace HMesh
24 
{
 24 
{
25 
		using namespace HMesh;
 25 
		using namespace Geometry;
26 
		using namespace Util;
 26 
		using namespace Util;
27 
		using namespace CGLA;
 27 
		using namespace CGLA;
28 
		using namespace std;
 28 
		using namespace std;
29 
 
 29 
 
30 
		namespace
30 
		namespace
Line 468... Line 468...
468 
										for(;!vc.end();++vc)
 468 
										for(;!vc.end();++vc)
469 
										{
 469 
										{
470 
												assert(++k<1000);
 470 
												assert(++k<1000);
471 
												HalfEdgeIter he = vc.get_halfedge();
 471 
												HalfEdgeIter he = vc.get_halfedge();
472 
												VertexIter n = vc.get_vertex();
 472 
												VertexIter n = vc.get_vertex();
473 
												if(n->touched == vi->touched && m->collapse_precond(vi,he))
 473 
												if(n->touched == vi->touched && m->collapse_precond(he))
474 
												{
 474 
												{
475 
														VertexIter vi2 = vi;
 - 
 
476 
														++vi;
 475 
														++vi;
477 
														m->collapse_halfedge(vi2,he,true);
 476 
														m->collapse_halfedge(he,true);
478 
														did = did_work = true;
 477 
														did = did_work = true;
479 
														break;
 478 
														break;
480 
												}
 479 
												}
481 
										}
 480 
										}
482 
										if(!did) ++vi;
 481 
										if(!did) ++vi;