Subversion Repositories gelsvn

Rev

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

Rev 299 Rev 309
Line 7... Line 7...
7
using namespace std;
7
using namespace std;
8
using namespace HMesh;
8
using namespace HMesh;
9
 
9
 
10
namespace
10
namespace
11
{
11
{
12
	const float EDGE_MIN_SQ_LENGTH = 1.0e-10f;
12
	const float EDGE_MIN_SQ_LENGTH = CGLA::MINUTE;
13
	
13
	
14
	inline bool degenerate_edge(HalfEdgeIter he)
14
	inline bool degenerate_edge(HalfEdgeIter he)
15
	{
15
	{
16
		if(sqr_length(he->vert->pos-he->opp->vert->pos)<1e-8)
16
		if(sqr_length(he->vert->pos-he->opp->vert->pos)<1e-8)
17
			return true;
17
			return true;
Line 146... Line 146...
146
			
146
			
147
			if(sqr_length(v0-v1)>EDGE_MIN_SQ_LENGTH &&
147
			if(sqr_length(v0-v1)>EDGE_MIN_SQ_LENGTH &&
148
				 sqr_length(v1-v2)>EDGE_MIN_SQ_LENGTH &&
148
				 sqr_length(v1-v2)>EDGE_MIN_SQ_LENGTH &&
149
				 sqr_length(v2-v0)>EDGE_MIN_SQ_LENGTH)
149
				 sqr_length(v2-v0)>EDGE_MIN_SQ_LENGTH)
150
					triangle_vec.push_back(Triangle(v0,v1,v2,vn0,vn1,vn2,en0,en1,en2));
150
					triangle_vec.push_back(Triangle(v0,v1,v2,vn0,vn1,vn2,en0,en1,en2));
151
			// 			else
151
			else
152
			// 				cout << "Killing degenerate triangle" << endl;
152
					cout << "Killing degenerate triangle" << endl;
153
		}
153
		}
154
#else
154
#else
155
	vector<Triangle> triangle_vec;
155
	vector<Triangle> triangle_vec;
156
	int i=0;
156
	int i=0;
157
	for(FaceIter fi=m.faces_begin(); fi != m.faces_end();++fi,++i)
157
	for(FaceIter fi=m.faces_begin(); fi != m.faces_end();++fi,++i)