Subversion Repositories gelsvn

Rev

Rev 62 | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 62 Rev 136
Line 551... Line 551...
551 
			he = m.halfedges_begin();
 551 
			he = m.halfedges_begin();
552 
			for(;he != m.halfedges_end(); ++he)
 552 
			for(;he != m.halfedges_end(); ++he)
553 
				if(he->touched == 0)
 553 
				if(he->touched == 0)
554 
					add_to_queue(Q, he, efun);
 554 
					add_to_queue(Q, he, efun);
555 
		}
 555 
		}
556 
		double pri_old = -DBL_MAX;
 - 
 
- 
 
 556 
 
557 
		while(!Q.empty())
 557 
		while(!Q.empty())
558 
			{
 558 
			{
559 
				PQElem elem = Q.top();
 559 
				PQElem elem = Q.top();
560 
				Q.pop();
 560 
				Q.pop();
561 
				HalfEdgeIter he = elem.he;
 561 
				HalfEdgeIter he = elem.he;
Line 607... Line 607...
607 
						if(!is_boundary(he))
 607 
						if(!is_boundary(he))
608 
							halfedges.push_back(he);
 608 
							halfedges.push_back(he);
609 
					}
 609 
					}
610 
				random_shuffle(halfedges.begin(), halfedges.end());
 610 
				random_shuffle(halfedges.begin(), halfedges.end());
611 
				swaps = 0;
 611 
				swaps = 0;
612 
				for(int i=0;i<halfedges.size();++i)
 612 
				for(size_t i=0;i<halfedges.size();++i)
613 
					{
 613 
					{
614 
						he = halfedges[i];
 614 
						he = halfedges[i];
615 
 
 615 
 
616 
						// 							if(!would_flip(he))
 616 
						// 							if(!would_flip(he))
617 
						DihedralEnergy dih_en;
 617 
						DihedralEnergy dih_en;