Subversion Repositories gelsvn

Rev

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

Rev 382 Rev 459
Line 65... Line 65...
65 
 
 65 
 
66 
	void operator()(const CGLA::Vec3i& pi, float& vox_val)
 66 
	void operator()(const CGLA::Vec3i& pi, float& vox_val)
67 
	{
 67 
	{
68 
		Vec3f p(pi);
 68 
		Vec3f p(pi);
69 
 		if(sqr_length(pi-old_p)==1)
 69 
 		if(sqr_length(pi-old_p)==1)
70 
 			{
 - 
 
71 
 				vox_val = T->compute_signed_distance(p,CGLA::sqr(1.001+fabs(old_d)));
 70 
 				vox_val = T->compute_signed_distance(p,CGLA::sqr(1.001+fabs(old_d)));
72 
 			}
 - 
 
73 
 		else
 71 
 		else
74 
			vox_val = T->compute_signed_distance(p);
 72 
			vox_val = T->compute_signed_distance(p);
75 
		if(flip_normals) vox_val = -vox_val;
 73 
		if(flip_normals) vox_val = -vox_val;
76 
		old_p = pi;
 74 
		old_p = pi;
77 
		old_d = vox_val;
75 
		old_d = vox_val;
Line 139... Line 137...
139 
    else
 137 
    else
140 
	{
 138 
	{
141 
		string fn("../../data/bunny-little.x3d");
 139 
		string fn("../../data/bunny-little.x3d");
142 
		x3d_load(fn, m);
 140 
		x3d_load(fn, m);
143 
	}
 141 
	}
144
- 
 
- 
 
 142 
	cout << "Volume dimensions " << vol_dim << endl;
145 
	if(!m.is_valid())
 143 
	if(!m.is_valid())
146 
	{
 144 
	{
147 
		cout << "Not a valid manifold" << endl;
 145 
		cout << "Not a valid manifold" << endl;
148 
		exit(0);
 146 
		exit(0);
149 
	}
 147 
	}