Subversion Repositories gelsvn

Rev

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

Rev 62 Rev 136
Line 14... Line 14...
14 
	namespace
 14 
	namespace
15 
	{
 15 
	{
16 
		float normal_cone(vector<Vec3f>& norms)
 16 
		float normal_cone(vector<Vec3f>& norms)
17 
		{
 17 
		{
18 
			float val = 1.0f;
 18 
			float val = 1.0f;
19 
			for(int i=0;i<norms.size()-1;++i)
 19 
			for(size_t i=0;i<norms.size()-1;++i)
20 
				for(int j=i+1;j<norms.size();++j)
 20 
				for(size_t j=i+1;j<norms.size();++j)
21 
					val = min(val, dot(norms[i], norms[j]));
 21 
					val = min(val, dot(norms[i], norms[j]));
22 
			return val;
 22 
			return val;
23 
		}
 23 
		}
24
24
25 
 
 25 
 
Line 127... Line 127...
127 
					if(find(nbrs[j].begin(), nbrs[j].end(), verts[i])
 127 
					if(find(nbrs[j].begin(), nbrs[j].end(), verts[i])
128 
						 == nbrs[j].end())
 128 
						 == nbrs[j].end())
129 
						{
 129 
						{
130 
							vector<Vec3f> norms_a;
 130 
							vector<Vec3f> norms_a;
131 
							vector<Vec3f> norms_b;
 131 
							vector<Vec3f> norms_b;
132 
							int n2=j-i+1;
 - 
 
133 
 
 132 
 
134 
							for(int k=0;k<n;++k)
 133 
							for(int k=0;k<n;++k)
135 
								{
 134 
								{
136 
									if(k>=i && k<=j)
 135 
									if(k>=i && k<=j)
137 
										norms_a.push_back(norms[k]);
 136 
										norms_a.push_back(norms[k]);
Line 181... Line 180...
181 
						FaceIter fn = m.split_face(pot.f, pot.v0, pot.v1);
 180 
						FaceIter fn = m.split_face(pot.f, pot.v0, pot.v1);
182
181
183 
						nbr_faces.push_back(pot.f);
 182 
						nbr_faces.push_back(pot.f);
184 
						nbr_faces.push_back(fn);
 183 
						nbr_faces.push_back(fn);
185
184
186 
						for(int i=0;i<nbr_faces.size();++i)
 185 
						for(size_t i=0;i<nbr_faces.size();++i)
187 
							{
 186 
							{
188 
								nbr_faces[i]->touched++;
 187 
								nbr_faces[i]->touched++;
189 
								process_face(nbr_faces[i],Q);
 188 
								process_face(nbr_faces[i],Q);
190 
							}
 189 
							}
191 
					}
 190 
					}