curvature.hpp 28 KB
Newer Older
Pierre Kraemer's avatar
Pierre Kraemer committed
1 2 3
/*******************************************************************************
 * CGoGN: Combinatorial and Geometric modeling with Generic N-dimensional Maps  *
 * version 0.1                                                                  *
4
 * Copyright (C) 2009-2012, IGG Team, LSIIT, University of Strasbourg           *
Pierre Kraemer's avatar
Pierre Kraemer committed
5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
 *                                                                              *
 * This library is free software; you can redistribute it and/or modify it      *
 * under the terms of the GNU Lesser General Public License as published by the *
 * Free Software Foundation; either version 2.1 of the License, or (at your     *
 * option) any later version.                                                   *
 *                                                                              *
 * This library is distributed in the hope that it will be useful, but WITHOUT  *
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or        *
 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License  *
 * for more details.                                                            *
 *                                                                              *
 * You should have received a copy of the GNU Lesser General Public License     *
 * along with this library; if not, write to the Free Software Foundation,      *
 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.           *
 *                                                                              *
20
 * Web site: http://cgogn.unistra.fr/                                           *
Pierre Kraemer's avatar
Pierre Kraemer committed
21 22 23 24 25 26
 * Contact information: cgogn@unistra.fr                                        *
 *                                                                              *
 *******************************************************************************/

#include "Algo/Geometry/localFrame.h"
#include "Geometry/matrix.h"
27 28
#include "Topology/generic/traversor/traversorCell.h"
#include "Topology/generic/traversor/traversor2.h"
Sylvain Thery's avatar
Sylvain Thery committed
29

Pierre Kraemer's avatar
Pierre Kraemer committed
30 31 32 33 34 35
namespace CGoGN
{

namespace Algo
{

36 37 38
namespace Surface
{

Pierre Kraemer's avatar
Pierre Kraemer committed
39 40 41 42
namespace Geometry
{

template <typename PFP>
Pierre Kraemer's avatar
Pierre Kraemer committed
43 44
void computeCurvatureVertices_QuadraticFitting(
	typename PFP::MAP& map,
Pierre Kraemer's avatar
Pierre Kraemer committed
45 46 47 48 49 50
	const VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& position,
	const VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& normal,
	VertexAttribute<typename PFP::REAL, typename PFP::MAP::IMPL>& kmax,
	VertexAttribute<typename PFP::REAL, typename PFP::MAP::IMPL>& kmin,
	VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& Kmax,
	VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& Kmin)
Pierre Kraemer's avatar
Pierre Kraemer committed
51
{
52
	TraversorV<typename PFP::MAP> t(map) ;
53
	for(Dart d = t.begin(); d != t.end(); d = t.next())
Pierre Kraemer's avatar
Pierre Kraemer committed
54
		computeCurvatureVertex_QuadraticFitting<PFP>(map, d, position, normal, kmax, kmin, Kmax, Kmin) ;
Pierre Kraemer's avatar
Pierre Kraemer committed
55 56 57
}

template <typename PFP>
Pierre Kraemer's avatar
Pierre Kraemer committed
58 59 60
void computeCurvatureVertex_QuadraticFitting(
	typename PFP::MAP& map,
	Dart dart,
Pierre Kraemer's avatar
Pierre Kraemer committed
61 62 63 64 65 66
	const VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& position,
	const VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& normal,
	VertexAttribute<typename PFP::REAL, typename PFP::MAP::IMPL>& kmax,
	VertexAttribute<typename PFP::REAL, typename PFP::MAP::IMPL>& kmin,
	VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& Kmax,
	VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& Kmin)
Pierre Kraemer's avatar
Pierre Kraemer committed
67 68 69 70 71 72
{
	typedef typename PFP::REAL REAL ;
	typedef typename PFP::VEC3 VEC3 ;
	typedef typename PFP::MATRIX33 MATRIX33 ;

	VEC3 n = normal[dart] ;
Pierre Kraemer's avatar
Pierre Kraemer committed
73

74
	MATRIX33 localFrame = Algo::Geometry::vertexLocalFrame<PFP>(map, dart, position, n) ;
Pierre Kraemer's avatar
Pierre Kraemer committed
75 76 77 78 79
	MATRIX33 invLocalFrame ;
	localFrame.invert(invLocalFrame) ;

	REAL a, b, c, d, e;
	//vertexCubicFitting(map,dart,localFrame,a,b,c,d,e,f,g,h,i) ;
Pierre Kraemer's avatar
Pierre Kraemer committed
80
	vertexQuadraticFitting<PFP>(map, dart, localFrame, position, normal, a, b, c, d, e) ;
Pierre Kraemer's avatar
Pierre Kraemer committed
81

Pierre Kraemer's avatar
Pierre Kraemer committed
82
	REAL kmax_v, kmin_v, Kmax_x, Kmax_y ;
Pierre Kraemer's avatar
Pierre Kraemer committed
83
//	/*int res = */slaev2_(&a, &b, &c, &kmax_v, &kmin_v, &Kmax_x, &Kmax_y) ;
Pierre Kraemer's avatar
Pierre Kraemer committed
84

Pierre Kraemer's avatar
Pierre Kraemer committed
85
	Eigen::Matrix<REAL,2,2> m;
86
	m << 2*a, b, b, 2*c;
Pierre Kraemer's avatar
Pierre Kraemer committed
87 88 89 90 91 92 93 94 95 96

	// solve eigen problem
	Eigen::SelfAdjointEigenSolver<Eigen::Matrix<REAL,2,2> > solver(m);

	const Eigen::Matrix<REAL,2,1>& ev = solver.eigenvalues();
	kmax_v = ev[0];
	kmin_v = ev[1];

	const Eigen::Matrix<REAL,2,2>& evec = solver.eigenvectors();
	VEC3 Kmax_v(evec(0,0), evec(1,0), 0.0f) ;
Pierre Kraemer's avatar
Pierre Kraemer committed
97
	Kmax_v = invLocalFrame * Kmax_v ;
Pierre Kraemer's avatar
Pierre Kraemer committed
98 99 100
	VEC3 Kmin_v(evec(0,1), evec(1,1), 0.0f) ;
	Kmin_v = invLocalFrame * Kmin_v ;
//	VEC3 Kmin_v = n ^ Kmax_v ;
Pierre Kraemer's avatar
Pierre Kraemer committed
101

Pierre Kraemer's avatar
Pierre Kraemer committed
102
	if (kmax_v < kmin_v)
103
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
104 105 106 107
		kmax[dart] = -kmax_v ;
		kmin[dart] = -kmin_v ;
		Kmax[dart] = Kmax_v ;
		Kmin[dart] = Kmin_v ;
108 109 110
	}
	else
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
111 112 113 114
		kmax[dart] = -kmin_v ;
		kmin[dart] = -kmax_v ;
		Kmax[dart] = Kmin_v ;
		Kmin[dart] = Kmax_v ;
115
	}
Pierre Kraemer's avatar
Pierre Kraemer committed
116 117 118
}

template <typename PFP>
Pierre Kraemer's avatar
Pierre Kraemer committed
119
void vertexQuadraticFitting(
Pierre Kraemer's avatar
Pierre Kraemer committed
120 121 122
	typename PFP::MAP& map,
	Dart dart,
	typename PFP::MATRIX33& localFrame,
Pierre Kraemer's avatar
Pierre Kraemer committed
123 124
	const VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& position,
	const VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& normal,
Pierre Kraemer's avatar
Pierre Kraemer committed
125
	float& a, float& b, float& c, float& d, float& e)
Pierre Kraemer's avatar
Pierre Kraemer committed
126
{
Pierre Kraemer's avatar
Pierre Kraemer committed
127
	typename PFP::VEC3 p = position[dart] ;
Pierre Kraemer's avatar
Pierre Kraemer committed
128

129 130 131 132 133 134
	NLContext nlContext = nlNewContext() ;
	nlMakeCurrent(nlContext) ;
	nlSolverParameteri(NL_NB_VARIABLES, 5) ;
	nlSolverParameteri(NL_LEAST_SQUARES, NL_TRUE) ;
	nlBegin(NL_SYSTEM) ;
	nlBegin(NL_MATRIX) ;
135 136
	Traversor2VVaE<typename PFP::MAP> tav(map, dart) ;
	for(Dart it = tav.begin(); it != tav.end(); it = tav.next())
Pierre Kraemer's avatar
Pierre Kraemer committed
137
	{
138
		typename PFP::VEC3 v = position[it] ;
139
		quadraticFittingAddVertexPos<PFP>(v, p, localFrame) ;
140
		typename PFP::VEC3 n = normal[it] ;
141
		quadraticFittingAddVertexNormal<PFP>(v, n, p, localFrame) ;
142
	}
143 144 145 146 147 148 149 150 151 152 153
	nlEnd(NL_MATRIX) ;
	nlEnd(NL_SYSTEM) ;
	nlSolve() ;

	a = nlGetVariable(0) ;
	b = nlGetVariable(1) ;
	c = nlGetVariable(2) ;
	d = nlGetVariable(3) ;
	e = nlGetVariable(4) ;

	nlDeleteContext(nlContext) ;
Pierre Kraemer's avatar
Pierre Kraemer committed
154 155 156
}

template <typename PFP>
157
void quadraticFittingAddVertexPos(typename PFP::VEC3& v, typename PFP::VEC3& p, typename PFP::MATRIX33& localFrame)
Pierre Kraemer's avatar
Pierre Kraemer committed
158 159 160 161
{
	typename PFP::VEC3 vec = v - p ;
	vec = localFrame * vec ;

162 163 164 165 166 167 168 169
	nlRowParameterd(NL_RIGHT_HAND_SIDE, vec[2]) ;
	nlBegin(NL_ROW) ;
	nlCoefficient(0, vec[0]*vec[0]) ;
	nlCoefficient(1, vec[0]*vec[1]) ;
	nlCoefficient(2, vec[1]*vec[1]) ;
	nlCoefficient(3, vec[0]) ;
	nlCoefficient(4, vec[1]) ;
	nlEnd(NL_ROW) ;
Pierre Kraemer's avatar
Pierre Kraemer committed
170 171 172
}

template <typename PFP>
173
void quadraticFittingAddVertexNormal(typename PFP::VEC3& v, typename PFP::VEC3& n, typename PFP::VEC3& p, typename PFP::MATRIX33& localFrame)
Pierre Kraemer's avatar
Pierre Kraemer committed
174 175 176 177 178
{
	typename PFP::VEC3 vec = v - p ;
	vec = localFrame * vec ;
	typename PFP::VEC3 norm = localFrame * n ;

179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195
	nlRowParameterd(NL_RIGHT_HAND_SIDE, -1.0f * norm[0]) ;
	nlBegin(NL_ROW);
	nlCoefficient(0, 2.0f * vec[0] * norm[2]) ;
	nlCoefficient(1, vec[1] * norm[2]) ;
	nlCoefficient(2, 0) ;
	nlCoefficient(3, 1.0f * norm[2]) ;
	nlCoefficient(4, 0) ;
	nlEnd(NL_ROW) ;

	nlRowParameterd(NL_RIGHT_HAND_SIDE, -1.0f * norm[1]) ;
	nlBegin(NL_ROW);
	nlCoefficient(0, 0) ;
	nlCoefficient(1, vec[0] * norm[2]) ;
	nlCoefficient(2, 2.0f * vec[1] * norm[2]) ;
	nlCoefficient(3, 0) ;
	nlCoefficient(4, 1.0f * norm[2]) ;
	nlEnd(NL_ROW) ;
Pierre Kraemer's avatar
Pierre Kraemer committed
196 197 198
}
/*
template <typename PFP>
Pierre Kraemer's avatar
Pierre Kraemer committed
199
void vertexCubicFitting(Dart dart, gmtl::Vec3f& normal, float& a, float& b, float& c, float& d, float& e, float& f, float& g, float& h, float& i)
Pierre Kraemer's avatar
Pierre Kraemer committed
200 201
{
	gmtl::Matrix33f localFrame, invLocalFrame ;
202
	Geometry::vertexLocalFrame<PFP>(m_map,dart,normal,localFrame) ;
Pierre Kraemer's avatar
Pierre Kraemer committed
203 204 205 206 207
	gmtl::invertFull(invLocalFrame, localFrame) ;
	gmtl::Vec3f p = m_map.getVertexEmb(dart)->getPosition() ;
	solverC->reset(false) ;
	solverC->set_least_squares(true) ;
	solverC->begin_system() ;
208 209
	Traversor2VVaE<typename PFP::MAP> tav(map, dart) ;
	for(Dart it = tav.begin(); it != tav.end(); it = tav.next())
Pierre Kraemer's avatar
Pierre Kraemer committed
210 211
	{
		// 1-ring vertices
212
		gmtl::Vec3f v = m_map.getVertexEmb(it)->getPosition() ;
Pierre Kraemer's avatar
Pierre Kraemer committed
213
		cubicFittingAddVertexPos(v,p,localFrame) ;
214
		gmtl::Vec3f n = m_normalsV[m_map.getVertexEmb(it)->getLabel()] ;
Pierre Kraemer's avatar
Pierre Kraemer committed
215
		cubicFittingAddVertexNormal(v,n,p,localFrame) ;
216
	}
Pierre Kraemer's avatar
Pierre Kraemer committed
217 218
	solverC->end_system() ;
	solverC->solve() ;
219

Pierre Kraemer's avatar
Pierre Kraemer committed
220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235
	a = solverC->variable(0).value() ;
	b = solverC->variable(1).value() ;
	c = solverC->variable(2).value() ;
	d = solverC->variable(3).value() ;
	e = solverC->variable(4).value() ;
	f = solverC->variable(5).value() ;
	g = solverC->variable(6).value() ;
	h = solverC->variable(7).value() ;
	i = solverC->variable(8).value() ;

//	normal = gmtl::Vec3f(-h, -i, 1.0f) ;
//	gmtl::normalize(normal) ;
//	normal = invLocalFrame * normal ;
}

template <typename PFP>
Pierre Kraemer's avatar
Pierre Kraemer committed
236
void cubicFittingAddVertexPos(gmtl::Vec3f& v, gmtl::Vec3f& p, gmtl::Matrix33f& localFrame)
Pierre Kraemer's avatar
Pierre Kraemer committed
237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256
{
	gmtl::Vec3f vec = v - p ;
	vec = localFrame * vec ;
	solverC->begin_row() ;

	solverC->add_coefficient(0, vec[0]*vec[0]*vec[0]) ;
	solverC->add_coefficient(1, vec[0]*vec[0]*vec[1]) ;
	solverC->add_coefficient(2, vec[0]*vec[1]*vec[1]) ;
	solverC->add_coefficient(3, vec[1]*vec[1]*vec[1]) ;
	solverC->add_coefficient(4, vec[0]*vec[0]) ;
	solverC->add_coefficient(5, vec[0]*vec[1]) ;
	solverC->add_coefficient(6, vec[1]*vec[1]) ;
	solverC->add_coefficient(7, vec[0]) ;
	solverC->add_coefficient(8, vec[1]) ;

	solverC->set_right_hand_side(vec[2]) ;
	solverC->end_row() ;
}

template <typename PFP>
Pierre Kraemer's avatar
Pierre Kraemer committed
257
void cubicFittingAddVertexNormal(gmtl::Vec3f& v, gmtl::Vec3f& n, gmtl::Vec3f& p, gmtl::Matrix33f& localFrame)
Pierre Kraemer's avatar
Pierre Kraemer committed
258 259 260 261 262
{
	gmtl::Vec3f vec = v - p ;
	vec = localFrame * vec ;
	gmtl::Vec3f norm = localFrame * n ;

263
	solverC->begin_row() ;
Pierre Kraemer's avatar
Pierre Kraemer committed
264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289
	solverC->add_coefficient(0, 3.0f*vec[0]*vec[0]) ;
	solverC->add_coefficient(1, 2.0f*vec[0]*vec[1]) ;
	solverC->add_coefficient(2, vec[1]*vec[1]) ;
	solverC->add_coefficient(3, 0) ;
	solverC->add_coefficient(4, 2.0f*vec[0]) ;
	solverC->add_coefficient(5, vec[1]) ;
	solverC->add_coefficient(6, 0) ;
	solverC->add_coefficient(7, 1.0f) ;
	solverC->add_coefficient(8, 0) ;
	solverC->set_right_hand_side(-1.0f*norm[0]/norm[2]) ;
	solverC->end_row() ;

	solverC->begin_row() ;
	solverC->add_coefficient(0, 0) ;
	solverC->add_coefficient(1, vec[0]*vec[0]) ;
	solverC->add_coefficient(2, 2.0f*vec[0]*vec[1]) ;
	solverC->add_coefficient(3, 3.0f*vec[1]*vec[1]) ;
	solverC->add_coefficient(4, 0) ;
	solverC->add_coefficient(5, vec[0]) ;
	solverC->add_coefficient(6, 2.0f*vec[1]) ;
	solverC->add_coefficient(7, 0) ;
	solverC->add_coefficient(8, 1.0f) ;
	solverC->set_right_hand_side(-1.0f*norm[1]/norm[2]) ;
	solverC->end_row() ;
}
*/
Pierre Kraemer's avatar
Pierre Kraemer committed
290 291 292 293 294

template <typename PFP>
void computeCurvatureVertices_NormalCycles(
	typename PFP::MAP& map,
	typename PFP::REAL radius,
Pierre Kraemer's avatar
Pierre Kraemer committed
295 296 297 298 299 300 301 302
	const VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& position,
	const VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& normal,
	const EdgeAttribute<typename PFP::REAL, typename PFP::MAP::IMPL>& edgeangle,
	VertexAttribute<typename PFP::REAL, typename PFP::MAP::IMPL>& kmax,
	VertexAttribute<typename PFP::REAL, typename PFP::MAP::IMPL>& kmin,
	VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& Kmax,
	VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& Kmin,
	VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& Knormal,
303
	unsigned int thread)
Pierre Kraemer's avatar
Pierre Kraemer committed
304
{
305
	TraversorV<typename PFP::MAP> t(map) ;
306
	for(Dart d = t.begin(); d != t.end(); d = t.next())
307
		computeCurvatureVertex_NormalCycles<PFP>(map, d, radius, position, normal, edgeangle, kmax, kmin, Kmax, Kmin, Knormal,thread) ;
Pierre Kraemer's avatar
Pierre Kraemer committed
308 309 310 311 312 313 314
}

template <typename PFP>
void computeCurvatureVertex_NormalCycles(
	typename PFP::MAP& map,
	Dart dart,
	typename PFP::REAL radius,
Pierre Kraemer's avatar
Pierre Kraemer committed
315 316 317 318 319 320 321 322
	const VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& position,
	const VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& normal,
	const EdgeAttribute<typename PFP::REAL, typename PFP::MAP::IMPL>& edgeangle,
	VertexAttribute<typename PFP::REAL, typename PFP::MAP::IMPL>& kmax,
	VertexAttribute<typename PFP::REAL, typename PFP::MAP::IMPL>& kmin,
	VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& Kmax,
	VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& Kmin,
	VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& Knormal,
323
	unsigned int thread)
Pierre Kraemer's avatar
Pierre Kraemer committed
324
{
325 326
	typedef typename PFP::REAL REAL ;
	typedef typename PFP::VEC3 VEC3 ;
327 328
	typedef Geom::Matrix<3,3,REAL> MATRIX;
	typedef Eigen::Matrix<REAL,3,1> E_VEC3;
Sauvage's avatar
Sauvage committed
329
	typedef Eigen::Matrix<REAL,3,3,Eigen::RowMajor> E_MATRIX;
330

331
	// collect the normal cycle tensor
332
	Selection::Collector_WithinSphere<PFP> neigh(map, position, radius, thread) ;
Pierre Kraemer's avatar
Pierre Kraemer committed
333
	neigh.collectAll(dart) ;
334

335
	MATRIX tensor(0) ;
336
	neigh.computeNormalCyclesTensor(position, edgeangle,tensor);
337

338
	// solve eigen problem
339 340 341
	Eigen::SelfAdjointEigenSolver<E_MATRIX> solver (Utils::convertRef<E_MATRIX>(tensor));
	const VEC3& ev = Utils::convertRef<VEC3>(solver.eigenvalues());
	const MATRIX& evec = Utils::convertRef<MATRIX>(solver.eigenvectors());
342

343
	normalCycles_SortAndSetEigenComponents<PFP>(ev,evec,kmax[dart],kmin[dart],Kmax[dart],Kmin[dart],Knormal[dart],normal[dart],thread);
Sauvage's avatar
Sauvage committed
344 345 346 347 348 349 350 351 352 353

//	if (dart.index % 15000 == 0)
//	{
//		CGoGNout << solver.eigenvalues() << CGoGNendl;
//		CGoGNout << solver.eigenvectors() << CGoGNendl;
//		normalCycles_SortTensor<PFP>(tensor);
//		solver.compute(Utils::convertRef<E_MATRIX>(tensor));
//		CGoGNout << solver.eigenvalues() << CGoGNendl;
//		CGoGNout << solver.eigenvectors() << CGoGNendl;
//	}
354 355
}

Sauvage's avatar
Sauvage committed
356 357 358 359
template <typename PFP>
void computeCurvatureVertices_NormalCycles_Projected(
	typename PFP::MAP& map,
	typename PFP::REAL radius,
Pierre Kraemer's avatar
Pierre Kraemer committed
360 361 362 363 364 365 366 367
	const VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& position,
	const VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& normal,
	const EdgeAttribute<typename PFP::REAL, typename PFP::MAP::IMPL>& edgeangle,
	VertexAttribute<typename PFP::REAL, typename PFP::MAP::IMPL>& kmax,
	VertexAttribute<typename PFP::REAL, typename PFP::MAP::IMPL>& kmin,
	VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& Kmax,
	VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& Kmin,
	VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& Knormal,
368
	unsigned int thread)
Sauvage's avatar
Sauvage committed
369
{
370
	TraversorV<typename PFP::MAP> t(map) ;
Sauvage's avatar
Sauvage committed
371 372 373 374 375 376 377 378 379
	for(Dart d = t.begin(); d != t.end(); d = t.next())
		computeCurvatureVertex_NormalCycles_Projected<PFP>(map, d, radius, position, normal, edgeangle, kmax, kmin, Kmax, Kmin, Knormal,thread) ;
}

template <typename PFP>
void computeCurvatureVertex_NormalCycles_Projected(
	typename PFP::MAP& map,
	Dart dart,
	typename PFP::REAL radius,
Pierre Kraemer's avatar
Pierre Kraemer committed
380 381 382 383 384 385 386 387
	const VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& position,
	const VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& normal,
	const EdgeAttribute<typename PFP::REAL, typename PFP::MAP::IMPL>& edgeangle,
	VertexAttribute<typename PFP::REAL, typename PFP::MAP::IMPL>& kmax,
	VertexAttribute<typename PFP::REAL, typename PFP::MAP::IMPL>& kmin,
	VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& Kmax,
	VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& Kmin,
	VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& Knormal,
388
	unsigned int thread)
Sauvage's avatar
Sauvage committed
389
{
390
	typedef typename PFP::REAL REAL ;
Sauvage's avatar
Sauvage committed
391 392 393 394
	typedef typename PFP::VEC3 VEC3 ;
	typedef Geom::Matrix<3,3,REAL> MATRIX;
	typedef Eigen::Matrix<REAL,3,1> E_VEC3;
	typedef Eigen::Matrix<REAL,3,3,Eigen::RowMajor> E_MATRIX;
395

396
	// collect the normal cycle tensor
397
	Selection::Collector_WithinSphere<PFP> neigh(map, position, radius, thread) ;
Pierre Kraemer's avatar
Pierre Kraemer committed
398
	neigh.collectAll(dart) ;
399

Sauvage's avatar
Sauvage committed
400 401
	MATRIX tensor(0) ;
	neigh.computeNormalCyclesTensor(position, edgeangle,tensor);
402

Sauvage's avatar
Sauvage committed
403 404
	// project the tensor
	normalCycles_ProjectTensor<PFP>(tensor,normal[dart],thread);
405

Sauvage's avatar
Sauvage committed
406 407 408 409 410 411 412 413
	// solve eigen problem
	Eigen::SelfAdjointEigenSolver<E_MATRIX> solver (Utils::convertRef<E_MATRIX>(tensor));
	const VEC3& ev = Utils::convertRef<VEC3>(solver.eigenvalues());
	const MATRIX& evec = Utils::convertRef<MATRIX>(solver.eigenvectors());

	normalCycles_SortAndSetEigenComponents<PFP>(ev,evec,kmax[dart],kmin[dart],Kmax[dart],Kmin[dart],Knormal[dart],normal[dart],thread);
}

414 415 416
template <typename PFP>
void computeCurvatureVertices_NormalCycles(
	typename PFP::MAP& map,
417
	Selection::Collector<PFP> & neigh,
Pierre Kraemer's avatar
Pierre Kraemer committed
418 419 420 421 422 423 424 425
	const VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& position,
	const VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& normal,
	const EdgeAttribute<typename PFP::REAL, typename PFP::MAP::IMPL>& edgeangle,
	VertexAttribute<typename PFP::REAL, typename PFP::MAP::IMPL>& kmax,
	VertexAttribute<typename PFP::REAL, typename PFP::MAP::IMPL>& kmin,
	VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& Kmax,
	VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& Kmin,
	VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& Knormal,
426
	unsigned int thread)
427
{
428
	TraversorV<typename PFP::MAP> t(map) ;
429 430 431 432 433 434 435 436
	for(Dart d = t.begin(); d != t.end(); d = t.next())
		computeCurvatureVertex_NormalCycles<PFP>(map, d, neigh, position, normal, edgeangle, kmax, kmin, Kmax, Kmin, Knormal,thread) ;
}

template <typename PFP>
void computeCurvatureVertex_NormalCycles(
	typename PFP::MAP& map,
	Dart dart,
437
	Selection::Collector<PFP> & neigh,
Pierre Kraemer's avatar
Pierre Kraemer committed
438 439 440 441 442 443 444 445
	const VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& position,
	const VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& normal,
	const EdgeAttribute<typename PFP::REAL, typename PFP::MAP::IMPL>& edgeangle,
	VertexAttribute<typename PFP::REAL, typename PFP::MAP::IMPL>& kmax,
	VertexAttribute<typename PFP::REAL, typename PFP::MAP::IMPL>& kmin,
	VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& Kmax,
	VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& Kmin,
	VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& Knormal,
446
	unsigned int thread)
447 448 449 450 451
{
	typedef typename PFP::REAL REAL ;
	typedef typename PFP::VEC3 VEC3 ;
	typedef Geom::Matrix<3,3,REAL> MATRIX;
	typedef Eigen::Matrix<REAL,3,1> E_VEC3;
Sauvage's avatar
Sauvage committed
452
	typedef Eigen::Matrix<REAL,3,3,Eigen::RowMajor> E_MATRIX;
453 454 455

	// collect the normal cycle tensor
	neigh.collectAll(dart) ;
456

457 458
	MATRIX tensor(0) ;
	neigh.computeNormalCyclesTensor(position, edgeangle,tensor);
459

460
	// solve eigen problem
461 462 463 464 465 466 467
	Eigen::SelfAdjointEigenSolver<E_MATRIX> solver (Utils::convertRef<E_MATRIX>(tensor));
	const VEC3& ev = Utils::convertRef<VEC3>(solver.eigenvalues());
	const MATRIX& evec = Utils::convertRef<MATRIX>(solver.eigenvectors());

	normalCycles_SortAndSetEigenComponents<PFP>(ev,evec,kmax[dart],kmin[dart],Kmax[dart],Kmin[dart],Knormal[dart],normal[dart],thread);
}

Sauvage's avatar
Sauvage committed
468 469 470
template <typename PFP>
void computeCurvatureVertices_NormalCycles_Projected(
	typename PFP::MAP& map,
471
	Selection::Collector<PFP> & neigh,
Pierre Kraemer's avatar
Pierre Kraemer committed
472 473 474 475 476 477 478 479
	const VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& position,
	const VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& normal,
	const EdgeAttribute<typename PFP::REAL, typename PFP::MAP::IMPL>& edgeangle,
	VertexAttribute<typename PFP::REAL, typename PFP::MAP::IMPL>& kmax,
	VertexAttribute<typename PFP::REAL, typename PFP::MAP::IMPL>& kmin,
	VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& Kmax,
	VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& Kmin,
	VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& Knormal,
480
	unsigned int thread)
Sauvage's avatar
Sauvage committed
481
{
482
	TraversorV<typename PFP::MAP> t(map) ;
Sauvage's avatar
Sauvage committed
483 484 485 486 487 488 489 490
	for(Dart d = t.begin(); d != t.end(); d = t.next())
		computeCurvatureVertex_NormalCycles_Projected<PFP>(map, d, neigh, position, normal, edgeangle, kmax, kmin, Kmax, Kmin, Knormal,thread) ;
}

template <typename PFP>
void computeCurvatureVertex_NormalCycles_Projected(
	typename PFP::MAP& map,
	Dart dart,
491
	Selection::Collector<PFP> & neigh,
Pierre Kraemer's avatar
Pierre Kraemer committed
492 493 494 495 496 497 498 499
	const VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& position,
	const VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& normal,
	const EdgeAttribute<typename PFP::REAL, typename PFP::MAP::IMPL>& edgeangle,
	VertexAttribute<typename PFP::REAL, typename PFP::MAP::IMPL>& kmax,
	VertexAttribute<typename PFP::REAL, typename PFP::MAP::IMPL>& kmin,
	VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& Kmax,
	VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& Kmin,
	VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& Knormal,
500
	unsigned int thread)
Sauvage's avatar
Sauvage committed
501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523
{
	typedef typename PFP::REAL REAL ;
	typedef typename PFP::VEC3 VEC3 ;
	typedef Geom::Matrix<3,3,REAL> MATRIX;
	typedef Eigen::Matrix<REAL,3,1> E_VEC3;
	typedef Eigen::Matrix<REAL,3,3,Eigen::RowMajor> E_MATRIX;

	// collect the normal cycle tensor
	neigh.collectAll(dart) ;

	MATRIX tensor(0) ;
	neigh.computeNormalCyclesTensor(position, edgeangle,tensor);

	// project the tensor
	normalCycles_ProjectTensor<PFP>(tensor,normal[dart],thread);

	// solve eigen problem
	Eigen::SelfAdjointEigenSolver<E_MATRIX> solver (Utils::convertRef<E_MATRIX>(tensor));
	const VEC3& ev = Utils::convertRef<VEC3>(solver.eigenvalues());
	const MATRIX& evec = Utils::convertRef<MATRIX>(solver.eigenvectors());

	normalCycles_SortAndSetEigenComponents<PFP>(ev,evec,kmax[dart],kmin[dart],Kmax[dart],Kmin[dart],Knormal[dart],normal[dart],thread);
}
524

525 526 527 528 529 530 531 532 533 534
template <typename PFP>
void normalCycles_SortAndSetEigenComponents(
	const typename PFP::VEC3& e_val,
	const Geom::Matrix<3,3,typename PFP::REAL> & e_vec,
	typename PFP::REAL& kmax,
	typename PFP::REAL& kmin,
	typename PFP::VEC3& Kmax,
	typename PFP::VEC3& Kmin,
	typename PFP::VEC3& Knormal,
	const typename PFP::VEC3& normal,
Sylvain Thery's avatar
Sylvain Thery committed
535
	unsigned int /*thread*/)
536
{
Sauvage's avatar
Sauvage committed
537
	// sort eigen components : ev[inormal] has minimal absolute value ; kmin = ev[imin] <= ev[imax] = kmax
Sauvage's avatar
Sauvage committed
538
	int inormal=0, imin, imax ;
Pierre Kraemer's avatar
Pierre Kraemer committed
539 540
	if (fabs(e_val[1]) < fabs(e_val[inormal])) inormal = 1;
	if (fabs(e_val[2]) < fabs(e_val[inormal])) inormal = 2;
Sauvage's avatar
Sauvage committed
541 542
	imin = (inormal + 1) % 3;
	imax = (inormal + 2) % 3;
Sauvage's avatar
Sauvage committed
543
	if (e_val[imax] < e_val[imin]) { int tmp = imin ; imin = imax ; imax = tmp ; }
544

545
	// set curvatures from sorted eigen components
546 547
	// warning : Kmin and Kmax are switched w.r.t. kmin and kmax
	// normal direction : minimal absolute eigen value
Sauvage's avatar
Sauvage committed
548 549 550
	Knormal[0] = e_vec(0,inormal);
	Knormal[1] = e_vec(1,inormal);
	Knormal[2] = e_vec(2,inormal);
551
	if (Knormal * normal < 0) Knormal *= -1; // change orientation
552
	// min curvature
Sauvage's avatar
Sauvage committed
553 554 555 556
	kmin = e_val[imin] ;
	Kmin[0] = e_vec(0,imax);
	Kmin[1] = e_vec(1,imax);
	Kmin[2] = e_vec(2,imax);
557
	// max curvature
Sauvage's avatar
Sauvage committed
558 559 560 561
	kmax = e_val[imax] ;
	Kmax[0] = e_vec(0,imin);
	Kmax[1] = e_vec(1,imin);
	Kmax[2] = e_vec(2,imin);
Pierre Kraemer's avatar
Pierre Kraemer committed
562 563
}

Sauvage's avatar
Sauvage committed
564
template <typename PFP>
Sylvain Thery's avatar
Sylvain Thery committed
565
void normalCycles_SortTensor(Geom::Matrix<3,3,typename PFP::REAL> & tensor, unsigned int /*thread*/)
Sauvage's avatar
Sauvage committed
566 567 568 569 570 571 572 573 574
{
	typedef typename PFP::REAL REAL ;
	typedef typename PFP::VEC3 VEC3 ;
	typedef Geom::Matrix<3,3,REAL> MATRIX;
	typedef Eigen::Matrix<REAL,3,1> E_VEC3;
	typedef Eigen::Matrix<REAL,3,3,Eigen::RowMajor> E_MATRIX;

	// compute eigen components
	Eigen::SelfAdjointEigenSolver<E_MATRIX> solver (Utils::convertRef<E_MATRIX>(tensor));
Sauvage's avatar
Sauvage committed
575 576
	const VEC3& e_val = Utils::convertRef<VEC3>(solver.eigenvalues());
	const MATRIX& e_vec = Utils::convertRef<MATRIX>(solver.eigenvectors());
Sauvage's avatar
Sauvage committed
577

Sauvage's avatar
Sauvage committed
578 579
	// switch kmin and kmax w.r.t. Kmin and Kmax
	int inormal=0, imin, imax ;
Pierre Kraemer's avatar
Pierre Kraemer committed
580 581
	if (fabs(e_val[1]) < fabs(e_val[inormal])) inormal = 1;
	if (fabs(e_val[2]) < fabs(e_val[inormal])) inormal = 2;
Sauvage's avatar
Sauvage committed
582 583 584 585 586 587 588 589 590 591 592 593 594
	imin = (inormal + 1) % 3;
	imax = (inormal + 2) % 3;
	if (e_val[imax] < e_val[imin]) { int tmp = imin ; imin = imax ; imax = tmp ; }

	tensor = e_vec;
	int i; REAL v;
	i = inormal; v = e_val[inormal];
	tensor(0,i) *= v; tensor(1,i) *= v; tensor(2,i) *= v;
	i = imin; v = e_val[imax];
	tensor(0,i) *= v; tensor(1,i) *= v; tensor(2,i) *= v;
	i = imax; v = e_val[imin];
	tensor(0,i) *= v; tensor(1,i) *= v; tensor(2,i) *= v;
	tensor = tensor*e_vec.transposed();
Sauvage's avatar
Sauvage committed
595 596
}

Sauvage's avatar
Sauvage committed
597
template <typename PFP>
598
void normalCycles_ProjectTensor(Geom::Matrix<3,3,typename PFP::REAL> & tensor, const typename PFP::VEC3& normal_vector, unsigned int thread)
Sauvage's avatar
Sauvage committed
599 600 601 602 603
{
	Geom::Matrix<3,3,typename PFP::REAL> proj;
	proj.identity();
	proj -= Geom::transposed_vectors_mult(normal_vector,normal_vector);
	tensor = proj * tensor * proj;
Pierre Kraemer's avatar
Pierre Kraemer committed
604 605
}

606 607 608 609 610 611 612

namespace Parallel
{

template <typename PFP>
class FunctorComputeCurvatureVertices_NormalCycles: public FunctorMapThreaded<typename PFP::MAP >
{
Pierre Kraemer's avatar
Pierre Kraemer committed
613 614 615 616 617 618 619 620 621 622 623 624 625 626
	typedef typename PFP::MAP MAP ;
	typedef typename PFP::MAP::IMPL MAP_IMPL ;
	typedef typename PFP::VEC3 VEC3 ;
	typedef typename PFP::REAL REAL ;

	REAL m_radius;
	const VertexAttribute<VEC3, MAP_IMPL>& m_position;
	const VertexAttribute<VEC3, MAP_IMPL>& m_normal;
	const EdgeAttribute<REAL, MAP_IMPL>& m_edgeangle;
	VertexAttribute<REAL, MAP_IMPL>& m_kmax;
	VertexAttribute<REAL, MAP_IMPL>& m_kmin;
	VertexAttribute<VEC3, MAP_IMPL>& m_Kmax;
	VertexAttribute<VEC3, MAP_IMPL>& m_Kmin;
	VertexAttribute<VEC3, MAP_IMPL>& m_Knormal;
627
public:
Pierre Kraemer's avatar
Pierre Kraemer committed
628 629 630 631 632 633 634 635 636 637 638 639
	 FunctorComputeCurvatureVertices_NormalCycles(
		MAP& map,
		REAL radius,
		const VertexAttribute<VEC3, MAP_IMPL>& position,
		const VertexAttribute<VEC3, MAP_IMPL>& normal,
		const EdgeAttribute<REAL, MAP_IMPL>& edgeangle,
		VertexAttribute<REAL, MAP_IMPL>& kmax,
		VertexAttribute<REAL, MAP_IMPL>& kmin,
		VertexAttribute<VEC3, MAP_IMPL>& Kmax,
		VertexAttribute<VEC3, MAP_IMPL>& Kmin,
		VertexAttribute<VEC3, MAP_IMPL>& Knormal):
	  FunctorMapThreaded<MAP>(map),
640 641 642 643 644 645 646 647
	  m_radius(radius),
	  m_position(position),
	  m_normal(normal),
	  m_edgeangle(edgeangle),
	  m_kmax(kmax),
	  m_kmin(kmin),
	  m_Kmax(Kmax),
	  m_Kmin(Kmin),
Sylvain Thery's avatar
Sylvain Thery committed
648
	  m_Knormal(Knormal)
649 650
	 { }

651
	void run(Dart d, unsigned int threadID)
652
	{
Sylvain Thery's avatar
Sylvain Thery committed
653
		computeCurvatureVertex_NormalCycles<PFP>(this->m_map, d, m_radius, m_position, m_normal, m_edgeangle, m_kmax, m_kmin, m_Kmax, m_Kmin, m_Knormal, threadID) ;
654 655 656 657 658 659 660
	}
};

template <typename PFP>
void computeCurvatureVertices_NormalCycles(
	typename PFP::MAP& map,
	typename PFP::REAL radius,
Pierre Kraemer's avatar
Pierre Kraemer committed
661 662 663 664 665 666 667 668
	const VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& position,
	const VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& normal,
	const EdgeAttribute<typename PFP::REAL, typename PFP::MAP::IMPL>& edgeangle,
	VertexAttribute<typename PFP::REAL, typename PFP::MAP::IMPL>& kmax,
	VertexAttribute<typename PFP::REAL, typename PFP::MAP::IMPL>& kmin,
	VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& Kmax,
	VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& Kmin,
	VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& Knormal,
669
	unsigned int nbth)
670
{
Sylvain Thery's avatar
Sylvain Thery committed
671
	// WAHOO BIG PROBLEM WITH LAZZY EMBEDDING !!!
Pierre Kraemer's avatar
Pierre Kraemer committed
672
	if (!map.template isOrbitEmbedded<VERTEX>())
Sylvain Thery's avatar
Sylvain Thery committed
673
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
674 675
		CellMarkerNoUnmark<typename PFP::MAP, VERTEX> cm(map);
		map.template initAllOrbitsEmbedding<VERTEX>();
Sylvain Thery's avatar
Sylvain Thery committed
676
	}
Pierre Kraemer's avatar
Pierre Kraemer committed
677
	if (!map.template isOrbitEmbedded<EDGE>())
Sylvain Thery's avatar
Sylvain Thery committed
678
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
679 680
		CellMarkerNoUnmark<typename PFP::MAP, EDGE> cm(map);
		map.template initAllOrbitsEmbedding<EDGE>();
Sylvain Thery's avatar
Sylvain Thery committed
681
	}
Pierre Kraemer's avatar
Pierre Kraemer committed
682
	if (!map.template isOrbitEmbedded<FACE>())
Sylvain Thery's avatar
Sylvain Thery committed
683
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
684 685
		CellMarkerNoUnmark<typename PFP::MAP, FACE> cm(map);
		map.template initAllOrbitsEmbedding<FACE>();
Sylvain Thery's avatar
Sylvain Thery committed
686 687
	}

688
	FunctorComputeCurvatureVertices_NormalCycles<PFP> funct(map, radius, position, normal, edgeangle, kmax, kmin, Kmax, Kmin, Knormal);
689
	Algo::Parallel::foreach_cell<typename PFP::MAP,VERTEX>(map, funct, nbth, true);
690 691
}

Sylvain Thery's avatar
Sylvain Thery committed
692 693 694 695 696


template <typename PFP>
class FunctorComputeCurvatureVertices_QuadraticFitting: public FunctorMapThreaded<typename PFP::MAP >
{
Pierre Kraemer's avatar
Pierre Kraemer committed
697 698 699 700 701 702 703 704 705 706 707
	typedef typename PFP::MAP MAP ;
	typedef typename PFP::MAP::IMPL MAP_IMPL ;
	typedef typename PFP::VEC3 VEC3 ;
	typedef typename PFP::REAL REAL ;

	const VertexAttribute<VEC3, MAP_IMPL>& m_position;
	const VertexAttribute<VEC3, MAP_IMPL>& m_normal;
	VertexAttribute<REAL, MAP_IMPL>& m_kmax;
	VertexAttribute<REAL, MAP_IMPL>& m_kmin;
	VertexAttribute<VEC3, MAP_IMPL>& m_Kmax;
	VertexAttribute<VEC3, MAP_IMPL>& m_Kmin;
Sylvain Thery's avatar
Sylvain Thery committed
708
public:
Pierre Kraemer's avatar
Pierre Kraemer committed
709 710 711 712 713 714 715 716 717
	 FunctorComputeCurvatureVertices_QuadraticFitting(
		MAP& map,
		const VertexAttribute<VEC3, MAP_IMPL>& position,
		const VertexAttribute<VEC3, MAP_IMPL>& normal,
		VertexAttribute<REAL, MAP_IMPL>& kmax,
		VertexAttribute<REAL, MAP_IMPL>& kmin,
		VertexAttribute<VEC3, MAP_IMPL>& Kmax,
		VertexAttribute<VEC3, MAP_IMPL>& Kmin):
	  FunctorMapThreaded<MAP>(map),
Sylvain Thery's avatar
Sylvain Thery committed
718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734
	  m_position(position),
	  m_normal(normal),
	  m_kmax(kmax),
	  m_kmin(kmin),
	  m_Kmax(Kmax),
	  m_Kmin(Kmin)
	 { }

	void run(Dart d, unsigned int threadID)
	{
		computeCurvatureVertex_QuadraticFitting<PFP>(this->m_map, d, m_position, m_normal, m_kmax, m_kmin, m_Kmax, m_Kmin) ;
	}
};

template <typename PFP>
void computeCurvatureVertices_QuadraticFitting(
	typename PFP::MAP& map,
Pierre Kraemer's avatar
Pierre Kraemer committed
735 736 737 738 739 740
	const VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& position,
	const VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& normal,
	VertexAttribute<typename PFP::REAL, typename PFP::MAP::IMPL>& kmax,
	VertexAttribute<typename PFP::REAL, typename PFP::MAP::IMPL>& kmin,
	VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& Kmax,
	VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& Kmin,
741
	unsigned int nbth)
Sylvain Thery's avatar
Sylvain Thery committed
742 743
{
	FunctorComputeCurvatureVertices_QuadraticFitting<PFP> funct(map, position, normal, kmax, kmin, Kmax, Kmin);
744
	Algo::Parallel::foreach_cell<typename PFP::MAP,VERTEX>(map, funct, nbth, true);
745 746
}

Sylvain Thery's avatar
Sylvain Thery committed
747
} // namespace Parallel
748 749


Pierre Kraemer's avatar
Pierre Kraemer committed
750 751
} // namespace Geometry

Pierre Kraemer's avatar
Pierre Kraemer committed
752
} // namespace Surface
753

Pierre Kraemer's avatar
Pierre Kraemer committed
754 755 756
} // namespace Algo

} // namespace CGoGN