Subversion Repositories gelsvn

Rev

Rev 373 | Rev 601 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 373 Rev 595
Line -... Line 1...
- 
 
 1 
/* ----------------------------------------------------------------------- *
- 
 
 2 
 * This file is part of GEL, http://www.imm.dtu.dk/GEL
- 
 
 3 
 * Copyright (C) the authors and DTU Informatics
- 
 
 4 
 * For license and list of authors, see ../../doc/intro.pdf
- 
 
 5 
 * ----------------------------------------------------------------------- */
- 
 
 6 
 
1 
#include <map>
 7 
#include <map>
2 
#include <algorithm>
 8 
#include <algorithm>
3 
#include <queue>
 9 
#include <queue>
4 
 
 10 
 
5 
#include "Util/Grid2D.h"
 11 
#include "Util/Grid2D.h"
Line 249... Line 255...
249 
		float subdiv(int level, const Point& lp, const Point& rp, TreeNodePtr& node)
 255 
		float subdiv(int level, const Point& lp, const Point& rp, TreeNodePtr& node)
250 
		{
 256 
		{
251 
			Point mid_point;
 257 
			Point mid_point;
252 
			float err = compute_mid_pt_err(lp,rp,mid_point);
 258 
			float err = compute_mid_pt_err(lp,rp,mid_point);
253
259
254 
			Vec3f dist = lp.pos-rp.pos;
 260 
//			Vec3f dist = lp.pos-rp.pos;
255 
			if (level>10)
261 
			if (level>10)
256 
			{
 262 
			{
257 
				node = new TreeNode(mid_point,err,0,0);
 263 
				node = new TreeNode(mid_point,err,0,0);
258 
				return err;
 264 
				return err;
259 
			}
 265 
			}
Line 585... Line 591...
585 
					std::vector<Vec3i> triangles)
 591 
					std::vector<Vec3i> triangles)
586 
	{
592 
	{
587 
		face_set_ptr = &face_set;
 593 
		face_set_ptr = &face_set;
588 
		int i;
 594 
		int i;
589 
		the_surf = &s;
 595 
		the_surf = &s;
590 
		int N = uv_points.size();
 596 
		size_t N = uv_points.size();
591 
		vector<Point> points(N);
 597 
		vector<Point> points(N);
592 
		for(i=0;i<N;++i)
 598 
		for(i=0;i<N;++i)
593 
		{
 599 
		{
594 
			points[i] = create_point(uv_points[i][0], uv_points[i][1]);
 600 
			points[i] = create_point(uv_points[i][0], uv_points[i][1]);
595 
			points[i].create_vertex();
 601 
			points[i].create_vertex();