Création d'un compte pour un collaborateur extérieur au laboratoire depuis l'intranet ICube : https://intranet.icube.unistra.fr/fr/labs/member/profile

subdivision.hpp 17.1 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
27
* Contact information: cgogn@unistra.fr                                        *
*                                                                              *
*******************************************************************************/

#include "Algo/Geometry/centroid.h"
#include "Topology/generic/autoAttributeHandler.h"

thery's avatar
thery committed
28
29
30
#define _USE_MATH_DEFINES
#include <math.h>

Pierre Kraemer's avatar
Pierre Kraemer committed
31
32
33
34
35
36
37
38
39
40
41
42
43
44
namespace CGoGN
{

namespace Algo
{

namespace Modelisation
{

template <typename PFP>
Dart trianguleFace(typename PFP::MAP& map, Dart d)
{
	Dart d1 = map.phi1(d);
	if (d1 == d)
45
		CGoGNout << "Warning: triangulation of a face with only one edge" << CGoGNendl;
Pierre Kraemer's avatar
Pierre Kraemer committed
46
	if (map.phi1(d1) == d)
47
		CGoGNout << "Warning: triangulation of a face with only two edges" << CGoGNendl;
Pierre Kraemer's avatar
Pierre Kraemer committed
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65

	map.splitFace(d, d1) ;
	map.cutEdge(map.phi_1(d)) ;
	Dart x = map.phi2(map.phi_1(d)) ;
	Dart dd = map.template phi<111>(x) ;
	while(dd != x)
	{
		Dart next = map.phi1(dd) ;
		map.splitFace(dd, map.phi1(x)) ;
		dd = next ;
	}

	return map.phi2(x);	// Return a dart of the central vertex
}

template <typename PFP, typename EMBV, typename EMB>
void trianguleFaces(typename PFP::MAP& map, EMBV& attributs, const FunctorSelect& selected)
{
66
67
	TraversorF<typename PFP::MAP> t(map, selected) ;
	for (Dart d = t.begin(); d != t.end(); d = t.next())
Pierre Kraemer's avatar
Pierre Kraemer committed
68
	{
69
70
71
72
73
		EMB center = Algo::Geometry::faceCentroidGen<PFP,EMBV,EMB>(map, d, attributs);	// compute center
		Dart cd = trianguleFace<PFP>(map, d);	// triangule the face
		attributs[cd] = center;					// affect the data to the central vertex
		Dart fit = cd ;
		do
Pierre Kraemer's avatar
Pierre Kraemer committed
74
		{
75
			t.skip(fit);
76
			fit = map.phi2_1(fit);
77
		} while(fit != cd);
Pierre Kraemer's avatar
Pierre Kraemer committed
78
79
80
	}
}

81
template <typename PFP>
82
void trianguleFaces(typename PFP::MAP& map, VertexAttribute<typename PFP::VEC3>& position, const FunctorSelect& selected)
83
{
84
	trianguleFaces<PFP, VertexAttribute<typename PFP::VEC3>, typename PFP::VEC3>(map, position, selected) ;
85
86
}

Pierre Kraemer's avatar
Pierre Kraemer committed
87
88
89
template <typename PFP>
void trianguleFaces(
		typename PFP::MAP& map,
90
		VertexAttribute<typename PFP::VEC3>& position, const FaceAttribute<typename PFP::VEC3>& positionF,
Pierre Kraemer's avatar
Pierre Kraemer committed
91
92
		const FunctorSelect& selected)
{
93
94
	TraversorF<typename PFP::MAP> t(map, selected) ;
	for (Dart d = t.begin(); d != t.end(); d = t.next())
Pierre Kraemer's avatar
Pierre Kraemer committed
95
	{
96
97
98
99
		Dart cd = trianguleFace<PFP>(map, d);	// triangule the face
		position[cd] = positionF[d];			// affect the data to the central vertex
		Dart fit = cd ;
		do
Pierre Kraemer's avatar
Pierre Kraemer committed
100
		{
101
			t.skip(fit);
102
			fit = map.phi2_1(fit);
103
		} while(fit != cd);
Pierre Kraemer's avatar
Pierre Kraemer committed
104
105
106
	}
}

Pierre Kraemer's avatar
Pierre Kraemer committed
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
template <typename PFP>
Dart quadranguleFace(typename PFP::MAP& map, Dart d)
{
	d = map.phi1(d) ;
	map.splitFace(d, map.template phi<11>(d)) ;
	map.cutEdge(map.phi_1(d)) ;
	Dart x = map.phi2(map.phi_1(d)) ;
	Dart dd = map.template phi<1111>(x) ;
	while(dd != x)
	{
		Dart next = map.template phi<11>(dd) ;
		map.splitFace(dd, map.phi1(x)) ;
		dd = next ;
	}

	return map.phi2(x);	// Return a dart of the central vertex
}

template <typename PFP, typename EMBV, typename EMB>
void quadranguleFaces(typename PFP::MAP& map, EMBV& attributs, const FunctorSelect& selected)
{
	DartMarker me(map) ;
	DartMarker mf(map) ;

	// first pass: cut the edges
	for (Dart d = map.begin(); d != map.end(); map.next(d))
	{
134
		if (selected(d) && !map.isBoundaryMarked(d) && !me.isMarked(d))
Pierre Kraemer's avatar
Pierre Kraemer committed
135
136
		{
			Dart f = map.phi1(d);
David Cazier's avatar
David Cazier committed
137
			Dart e = map.cutEdge(d);
Pierre Kraemer's avatar
Pierre Kraemer committed
138
139
//			TODO trouver pourquoi lerp bug avec ECell
//			attributs[m] = AttribOps::lerp<EMB,PFP>(attributs[d],attributs[f], 0.5);
140

Pierre Kraemer's avatar
Pierre Kraemer committed
141
142
143
144
			attributs[e] = attributs[d];
			attributs[e] += attributs[f];
			attributs[e] *= 0.5;

Pierre Kraemer's avatar
Pierre Kraemer committed
145
146
147
			me.markOrbit<EDGE>(d);
			me.markOrbit<EDGE>(e);
			mf.markOrbit<VERTEX>(e);
Pierre Kraemer's avatar
Pierre Kraemer committed
148
149
150
151
152
153
		}
	}

	// second pass: quandrangule faces
	for (Dart d = map.begin(); d != map.end(); map.next(d))
	{
154
		if (selected(d) && !map.isBoundaryMarked(d) && !mf.isMarked(d))
Pierre Kraemer's avatar
Pierre Kraemer committed
155
156
157
158
159
160
161
		{
			EMB center = Algo::Geometry::faceCentroidGen<PFP,EMBV,EMB>(map, d, attributs);	// compute center
			Dart cf = quadranguleFace<PFP>(map, d);	// quadrangule the face
			attributs[cf] = center;					// affect the data to the central vertex
			Dart e = cf;
			do
			{
Pierre Kraemer's avatar
Pierre Kraemer committed
162
				mf.markOrbit<FACE>(e);
163
				e = map.phi2_1(e);
Pierre Kraemer's avatar
Pierre Kraemer committed
164
165
166
167
168
			} while (e != cf);
		}
	}
}

169
template <typename PFP>
170
void quadranguleFaces(typename PFP::MAP& map, VertexAttribute<typename PFP::VEC3>& position, const FunctorSelect& selected)
171
{
172
	quadranguleFaces<PFP, VertexAttribute<typename PFP::VEC3>, typename PFP::VEC3>(map, position, selected) ;
173
174
}

Pierre Kraemer's avatar
Pierre Kraemer committed
175
template <typename PFP, typename EMBV, typename EMB>
176
void CatmullClarkSubdivision(typename PFP::MAP& map, EMBV& attributs, const FunctorSelect& selected)
Pierre Kraemer's avatar
Pierre Kraemer committed
177
178
179
180
{
	std::vector<Dart> l_middles;
	std::vector<Dart> l_verts;

Pierre Kraemer's avatar
Pierre Kraemer committed
181
	CellMarkerNoUnmark<VERTEX> m0(map);
Pierre Kraemer's avatar
Pierre Kraemer committed
182
183
184
185
186
187
	DartMarkerNoUnmark mf(map);
	DartMarkerNoUnmark me(map);

	// first pass: cut edges
	for (Dart d = map.begin(); d != map.end(); map.next(d))
	{
188
		if (selected(d) && !map.isBoundaryMarked(d) && !me.isMarked(d))
Pierre Kraemer's avatar
Pierre Kraemer committed
189
190
191
192
193
194
		{
			if (!m0.isMarked(d))
			{
				m0.mark(d);
				l_verts.push_back(d);
			}
195
196
			Dart d2 = map.phi2(d);
			if (!m0.isMarked(d2))
Pierre Kraemer's avatar
Pierre Kraemer committed
197
			{
198
199
				m0.mark(d2);
				l_verts.push_back(d2);
Pierre Kraemer's avatar
Pierre Kraemer committed
200
201
202
			}

			Dart f = map.phi1(d);
203
			Dart e = map.cutEdge(d);
Pierre Kraemer's avatar
Pierre Kraemer committed
204

205
			attributs[e] = attributs[d];
Pierre Kraemer's avatar
Pierre Kraemer committed
206
207
208
			attributs[e] += attributs[f];
			attributs[e] *= 0.5;

Pierre Kraemer's avatar
Pierre Kraemer committed
209
210
			me.markOrbit<EDGE>(d);
			me.markOrbit<EDGE>(e);
Pierre Kraemer's avatar
Pierre Kraemer committed
211
212
213
214
215
216
217
218
219
220
221

			mf.mark(d) ;
			mf.mark(map.phi2(e)) ;

			l_middles.push_back(e);
		}
	}

	// second pass: quandrangule faces
	for (Dart d = map.begin(); d != map.end(); map.next(d))
	{
222
		if (selected(d) && !map.isBoundaryMarked(d) && mf.isMarked(d)) // for each face not subdivided
Pierre Kraemer's avatar
Pierre Kraemer committed
223
224
225
226
		{
			// compute center skip darts of new vertices non embedded
			EMB center = AttribOps::zero<EMB,PFP>();
			unsigned int count = 0 ;
Pierre Kraemer's avatar
Pierre Kraemer committed
227
			mf.unmarkOrbit<FACE>(d) ;
Pierre Kraemer's avatar
Pierre Kraemer committed
228
229
230
231
232
			Dart it = d;
			do
			{
				center += attributs[it];
				++count ;
Pierre Kraemer's avatar
Pierre Kraemer committed
233
				me.unmarkOrbit<PFP::MAP::EDGE_OF_PARENT>(it);
234

235
				it = map.phi1(it) ;
Pierre Kraemer's avatar
Pierre Kraemer committed
236
				me.unmarkOrbit<PFP::MAP::EDGE_OF_PARENT>(it);
237
				it = map.phi1(it) ;
Pierre Kraemer's avatar
Pierre Kraemer committed
238
239
240
241
242
243
244
245
246
247
248
249
			} while(it != d) ;
			center /= double(count);
			Dart cf = quadranguleFace<PFP>(map, d);	// quadrangule the face
			attributs[cf] = center;					// affect the data to the central vertex
		}
	}

	// Compute edge points
	for(typename std::vector<Dart>::iterator mid = l_middles.begin(); mid != l_middles.end(); ++mid)
	{
		Dart x = *mid;
		// other side of the edge
250
		if (!map.isBoundaryEdge(x))
Pierre Kraemer's avatar
Pierre Kraemer committed
251
252
		{
			Dart f1 = map.phi_1(x);
253
			Dart f2 = map.phi2(map.phi1(map.phi2(x)));
Pierre Kraemer's avatar
Pierre Kraemer committed
254
			EMB temp = AttribOps::zero<EMB,PFP>();
255
			temp = attributs[f1];
Pierre Kraemer's avatar
Pierre Kraemer committed
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
			temp += attributs[f2];			// E' = (V0+V1+F1+F2)/4
			temp *= 0.25;
			attributs[x] *= 0.5;
			attributs[x] += temp;
		}
		// else nothing to do point already in the middle of segment
	}

	// Compute vertex points
	for(typename std::vector<Dart>::iterator vert = l_verts.begin(); vert != l_verts.end(); ++vert)
	{
		m0.unmark(*vert);

		EMB temp = AttribOps::zero<EMB,PFP>();
		EMB temp2 = AttribOps::zero<EMB,PFP>();

		unsigned int n = 0;
		Dart x = *vert;
		do
		{
			Dart m = map.phi1(x);
			Dart f = map.phi2(m);
			Dart v = map.template phi<11>(f);

			temp += attributs[f];
			temp2 += attributs[v];

			++n;
284
			x = map.phi2_1(x);
Pierre Kraemer's avatar
Pierre Kraemer committed
285
286
287
288
289
290
291
292
293
294
295
296
		} while (x != *vert);

		EMB emcp = attributs[*vert];
		emcp *= double((n-2)*n);		// V' = (n-2)/n*V + 1/n2 *(F+E)
		emcp += temp;
		emcp += temp2;
		emcp /= double(n*n);

		attributs[*vert] = emcp ;
	}
}

297
template <typename PFP>
298
void CatmullClarkSubdivision(typename PFP::MAP& map, VertexAttribute<typename PFP::VEC3>& position, const FunctorSelect& selected)
299
{
300
	CatmullClarkSubdivision<PFP, VertexAttribute<typename PFP::VEC3>, typename PFP::VEC3>(map, position, selected) ;
301
302
}

Pierre Kraemer's avatar
Pierre Kraemer committed
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
inline double betaF(unsigned int n)
{
	switch(n)
	{
		case 1: return 0.234375 ;
		case 2: return 0.609375 ;
		case 3: return 0.5625 ;
		case 4: return 0.484375 ;
		case 5: return 0.420466 ;
		case 6: return 0.375 ;
		case 7: return 0.343174 ;
		case 8: return 0.320542 ;
		case 9: return 0.304065 ;
		case 10: return 0.291778 ;
		case 11: return 0.282408 ;
		case 12: return 0.27512 ;
		case 13: return 0.26935 ;
		case 14: return 0.264709 ;
		default:
			double t = 3.0 + 2.0 * cos((2.0*M_PI)/double(n)) ;
			return 5.0/8.0 - (t * t) / 64.0 ;
	}
}

template <typename PFP, typename EMBV, typename EMB>
void LoopSubdivision(typename PFP::MAP& map, EMBV& attributs, const FunctorSelect& selected)
{
	std::vector<Dart> l_middles;
	std::vector<Dart> l_verts;

Pierre Kraemer's avatar
Pierre Kraemer committed
333
	CellMarkerNoUnmark<VERTEX> m0(map);
Pierre Kraemer's avatar
Pierre Kraemer committed
334
335
336
337
338
339
	DartMarkerNoUnmark mv(map);
	DartMarkerNoUnmark me(map);

	// first pass cut edges
	for (Dart d = map.begin(); d != map.end(); map.next(d))
	{
340
		if (selected(d) && !map.isBoundaryMarked(d) && !me.isMarked(d))
Pierre Kraemer's avatar
Pierre Kraemer committed
341
342
343
344
345
346
347
348
349
350
351
352
353
		{
			if (!m0.isMarked(d))
			{
				m0.mark(d);
				l_verts.push_back(d);
			}
			if (!m0.isMarked(map.phi2(d)))
			{
				m0.mark(map.phi2(d));
				l_verts.push_back(map.phi2(d));
			}

			Dart f = map.phi1(d);
354
			Dart e = map.cutEdge(d);
Pierre Kraemer's avatar
Pierre Kraemer committed
355
356
357
358
359

			attributs[e] =  attributs[d];
			attributs[e] += attributs[f];
			attributs[e] *= 0.5;

Pierre Kraemer's avatar
Pierre Kraemer committed
360
361
			me.markOrbit<EDGE>(d);
			me.markOrbit<EDGE>(e);
Pierre Kraemer's avatar
Pierre Kraemer committed
362

Pierre Kraemer's avatar
Pierre Kraemer committed
363
			mv.markOrbit<VERTEX>(e);
Pierre Kraemer's avatar
Pierre Kraemer committed
364
365
366
367
368
369
370
371
372

			l_middles.push_back(e);
		}
	}

	// Compute edge points
	for(typename std::vector<Dart>::iterator mid = l_middles.begin(); mid != l_middles.end(); ++mid)
	{
		Dart d = *mid;
373
		if (!map.isBoundaryEdge(d))
Pierre Kraemer's avatar
Pierre Kraemer committed
374
		{
375
			Dart dd = map.phi2(d);
Pierre Kraemer's avatar
Pierre Kraemer committed
376
377
378
379
380
381
			attributs[d] *= 0.75;
			Dart e1 = map.template phi<111>(d);
			EMB temp = AttribOps::zero<EMB,PFP>();
			temp = attributs[e1];
			e1 = map.phi_1(map.phi_1(dd));
			temp += attributs[e1];
382
			temp *= 1.0 / 8.0;
Pierre Kraemer's avatar
Pierre Kraemer committed
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
			attributs[d] += temp;
		}
		// else nothing to do point already in the middle of segment
	}

	// Compute vertex points
	for(typename std::vector<Dart>::iterator vert = l_verts.begin(); vert != l_verts.end(); ++vert)
	{
		m0.unmark(*vert);

		EMB temp = AttribOps::zero<EMB,PFP>();
		int n = 0;
		Dart x = *vert;
		do
		{
			Dart y = map.phi1(map.phi1(x));
			temp += attributs[y];
			++n;
401
			x = map.phi2_1(x);
Pierre Kraemer's avatar
Pierre Kraemer committed
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
		} while ((x != *vert));
		EMB emcp = attributs[*vert];
		if (n == 6)
		{
			temp /= 16.0;
			emcp *= 10.0/16.0;
			emcp += temp;
		}
		else
		{
			double beta = betaF(n) ;
			temp *= (beta / double(n));
			emcp *= (1.0 - beta);
			emcp += temp;
		}
		attributs[*vert] = emcp;
	}

	// insert new edges
	for (Dart d = map.begin(); d != map.end(); map.next(d))
	{
		if (mv.isMarked(d))
		{
			// unmark the darts of the face
Pierre Kraemer's avatar
Pierre Kraemer committed
426
427
			me.unmarkOrbit<FACE>(d) ;
			mv.unmarkOrbit<FACE>(d) ;
Pierre Kraemer's avatar
Pierre Kraemer committed
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443

			Dart dd = d;
			Dart e = map.template phi<11>(dd) ;
			map.splitFace(dd, e);

			dd = e;
			e = map.template phi<11>(dd) ;
			map.splitFace(dd, e);

			dd = e;
			e = map.template phi<11>(dd) ;
			map.splitFace(dd, e);
		}
	}
}

444
template <typename PFP>
445
void LoopSubdivision(typename PFP::MAP& map, VertexAttribute<typename PFP::VEC3>& position, const FunctorSelect& selected)
446
{
447
	LoopSubdivision<PFP, VertexAttribute<typename PFP::VEC3>, typename PFP::VEC3>(map, position, selected) ;
448
449
}

450
451
452
template <typename PFP, typename EMBV, typename EMB>
void TwoNPlusOneSubdivision(typename PFP::MAP& map, EMBV& attributs, const FunctorSelect& selected)
{
453
	EdgeAutoAttribute<Dart> tablePred(map);
Pierre Kraemer's avatar
Pierre Kraemer committed
454
	CellMarker<EDGE> m0(map);
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486

	std::vector<Dart> dOrig;
	std::vector<EMB> cOrig;

	//first pass cut edge
	for (Dart d = map.begin(); d != map.end(); map.next(d))
	{
		if(selected(d))
		{
			if(!m0.isMarked(d)) {
				dOrig.push_back(d);

				Dart dd = d;
				do {
					if(!m0.isMarked(dd)) {
						EMB e1 = attributs[dd];
						EMB e2 = attributs[map.phi1(dd)];
						map.cutEdge(dd);
						attributs[map.phi1(dd)] = e1*2.0f/3.0f+e2/3.0f;
						map.cutEdge(map.phi1(dd));
						attributs[map.phi1(map.phi1(dd))] = e2*2.0f/3.0f+e1/3.0f;
						m0.mark(dd);
						m0.mark(map.phi1(dd));
						m0.mark(map.template phi<11>(dd));
					}
					dd = map.template phi<111>(dd);
				} while(dd!=d);

			}
		}
	}

487
	CGoGNout << "nb orig : " << dOrig.size() << CGoGNendl;
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517

	DartMarkerNoUnmark mCorner(map);
//	//second pass create corner face
	for (std::vector<Dart>::iterator it = dOrig.begin(); it != dOrig.end(); ++it)
	{
		EMB c = Algo::Geometry::faceCentroid<PFP>(map,*it,attributs);
		Dart dd = *it;
		do
		{
			map.splitFace(map.phi1(dd),map.phi_1(dd));
			map.cutEdge(map.phi1(dd));
			mCorner.mark(map.phi2(map.phi1(dd)));
			attributs[map.template phi<11>(dd)] = c*2.0/3.0f + attributs[dd]/3.0f;
			dd = map.phi1(map.phi1(map.phi1(map.phi2(map.phi1(dd)))));
		} while(!mCorner.isMarked(dd));
	}

	//third pass create center face
	for (std::vector<Dart>::iterator it = dOrig.begin(); it != dOrig.end(); ++it)
	{
		Dart dd = map.phi2(map.phi1(*it));
		do {
			mCorner.unmark(dd);
			Dart dNext = map.phi1(map.phi1(map.phi1(dd)));
			map.splitFace(dd,dNext);
			dd = dNext;
		} while(mCorner.isMarked(dd));
	}
}

518
519
520
template <typename PFP>
void reverseOrientation(typename PFP::MAP& map)
{
521
	DartAttribute<unsigned int> emb0(&map, map.template getEmbeddingAttributeVector<VERTEX>()) ;
522
523
	if(emb0.isValid())
	{
524
		DartAttribute<unsigned int> new_emb0 = map.template addAttribute<unsigned int, DART>("new_EMB_0") ;
525
526
527
		for(Dart d = map.begin(); d != map.end(); map.next(d))
			new_emb0[d] = emb0[map.phi1(d)] ;
		map.template swapAttributes<unsigned int>(emb0, new_emb0) ;
528
		map.removeAttribute(new_emb0) ;
529
530
	}

531
532
	DartAttribute<Dart> phi1 = map.template getAttribute<Dart, DART>("phi1") ;
	DartAttribute<Dart> phi_1 = map.template getAttribute<Dart, DART>("phi_1") ;
533
534
535
	map.template swapAttributes<Dart>(phi1, phi_1) ;
}

Pierre Kraemer's avatar
Pierre Kraemer committed
536
537
538
//template <typename PFP>
//void computeDual(typename PFP::MAP& map, const FunctorSelect& selected)
//{
539
540
541
542
//	DartAttribute<Dart> phi1 = map.template getAttribute<Dart, DART>("phi1") ;
//	DartAttribute<Dart> phi_1 = map.template getAttribute<Dart, DART>("phi_1") ;
//	DartAttribute<Dart> new_phi1 = map.template addAttribute<Dart, DART>("new_phi1") ;
//	DartAttribute<Dart> new_phi_1 = map.template addAttribute<Dart, DART>("new_phi_1") ;
Pierre Kraemer's avatar
Pierre Kraemer committed
543
544
545
546
547
548
549
550
551
552
553
//
//	for(Dart d = map.begin(); d != map.end(); map.next(d))
//	{
//		Dart dd = map.phi12(d) ;
//		new_phi1[d] = dd ;
//		new_phi_1[dd] = d ;
//	}
//
//	map.template swapAttributes<Dart>(phi1, new_phi1) ;
//	map.template swapAttributes<Dart>(phi_1, new_phi_1) ;
//
554
555
//	map.removeAttribute(new_phi1) ;
//	map.removeAttribute(new_phi_1) ;
Pierre Kraemer's avatar
Pierre Kraemer committed
556
557
558
559
560
//
//	map.swapEmbeddingContainers(VERTEX, FACE) ;
//
//	reverseOrientation<PFP>(map) ;
//}
Pierre Kraemer's avatar
Pierre Kraemer committed
561

Pierre Kraemer's avatar
Pierre Kraemer committed
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
inline double sqrt3_K(unsigned int n)
{
	switch(n)
	{
		case 1: return 0.333333 ;
		case 2: return 0.555556 ;
		case 3: return 0.5 ;
		case 4: return 0.444444 ;
		case 5: return 0.410109 ;
		case 6: return 0.388889 ;
		case 7: return 0.375168 ;
		case 8: return 0.365877 ;
		case 9: return 0.359328 ;
		case 10: return 0.354554 ;
		case 11: return 0.350972 ;
		case 12: return 0.348219 ;
		default:
			double t = cos((2.0*M_PI)/double(n)) ;
			return (4.0 - t) / 9.0 ;
	}
Pierre Kraemer's avatar
Pierre Kraemer committed
582
583
}

Pierre Kraemer's avatar
Pierre Kraemer committed
584
//template <typename PFP>
585
//void Sqrt3Subdivision(typename PFP::MAP& map, VertexAttribute<VEC3>& position, const FunctorSelect& selected)
Pierre Kraemer's avatar
Pierre Kraemer committed
586
587
588
589
//{
//	typedef typename PFP::VEC3 VEC3 ;
//	typedef typename PFP::REAL REAL ;
//
590
//	FaceAttribute<VEC3> positionF = map.template getAttribute<VEC3, FACE>("position") ;
Pierre Kraemer's avatar
Pierre Kraemer committed
591
//	if(!positionF.isValid())
592
//		positionF = map.template addAttribute<VEC3, FACE>("position") ;
Pierre Kraemer's avatar
Pierre Kraemer committed
593
594
595
596
//	Algo::Geometry::computeCentroidFaces<PFP>(map, position, positionF) ;
//
//	computeDual<PFP>(map, selected);
//
597
//	VertexAttribute<VEC3> tmp = position ;
Pierre Kraemer's avatar
Pierre Kraemer committed
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
//	position = positionF ;
//	positionF = tmp ;
//
//	CellMarker m(map, VERTEX) ;
//	m.markAll() ;
//
//	trianguleFaces<PFP>(map, position, positionF, selected);
//
//	for(Dart d = map.begin(); d != map.end(); map.next(d))
//	{
//		if(!m.isMarked(d))
//		{
//			m.mark(d) ;
//			VEC3 P = position[d] ;
//			VEC3 newP(0) ;
//			unsigned int val = 0 ;
//			Dart vit = d ;
//			do
//			{
//				newP += position[map.phi2(vit)] ;
//				++val ;
//				vit = map.phi2_1(vit) ;
//			} while(vit != d) ;
//			REAL K = sqrt3_K(val) ;
//			newP *= REAL(3) ;
//			newP -= REAL(val) * P ;
//			newP *= K / REAL(2 * val) ;
//			newP += (REAL(1) - K) * P ;
//			position[d] = newP ;
//		}
//	}
//}
Pierre Kraemer's avatar
Pierre Kraemer committed
630
631
632
633
634
635

} // namespace Modelisation

} // namespace Algo

} // namespace CGoGN