polyhedron.hpp 30 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-2011, 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.u-strasbg.fr/                                         *
Pierre Kraemer's avatar
Pierre Kraemer committed
21
22
23
24
25
26
27
28
29
30
31
32
33
* Contact information: cgogn@unistra.fr                                        *
*                                                                              *
*******************************************************************************/

namespace CGoGN
{

namespace Algo
{

namespace Modelisation
{

34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
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
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
/**
 * create a n-sided pyramid
 */
template <typename PFP>
Dart createPyramid(typename PFP::MAP& map, unsigned int n)
{
	Dart dres = Dart::nil();
	std::vector<Dart> m_tableVertDarts;
	m_tableVertDarts.reserve(n);

	// creation of triangles around circunference and storing vertices
	for (unsigned int i = 0; i < n; ++i)
	{
		Dart d = map.newFace(3, false);
		m_tableVertDarts.push_back(d);
	}

	// sewing the triangles
	for (unsigned int i = 0; i < n-1; ++i)
	{
		Dart d = m_tableVertDarts[i];
		d = map.phi_1(d);
		Dart e = m_tableVertDarts[i+1];
		e = map.phi1(e);
		map.sewFaces(d, e, false);
	}
	//sewing the last with the first
	map.sewFaces(map.phi1(m_tableVertDarts[0]), map.phi_1(m_tableVertDarts[n-1]), false);

	//sewing the bottom face
	Dart d1 = map.newFace(n, false);
	dres = d1;
	for(unsigned int i = 0; i < n ; ++i)
	{
		map.sewFaces(m_tableVertDarts[i], d1, false);
		d1 = map.phi1(d1);
	}

	//return a dart from the base
	return dres;
}

/**
 * create a n-sided prism
 */
template <typename PFP>
Dart createPrism(typename PFP::MAP& map, unsigned int n)
{
	Dart dres = Dart::nil();
	unsigned int nb = n*2;
	std::vector<Dart> m_tableVertDarts;
	m_tableVertDarts.reserve(nb);

	// creation of quads around circunference and storing vertices
	for (unsigned int i = 0; i < n; ++i)
	{
		Dart d = map.newFace(4, false);
		m_tableVertDarts.push_back(d);
	}

	// storing a dart from the vertex pointed by phi1(phi1(d))
	for (unsigned int i = 0; i < n; ++i)
	{
		m_tableVertDarts.push_back(map.phi1(map.phi1(m_tableVertDarts[i])));
	}

	// sewing the quads
	for (unsigned int i = 0; i < n-1; ++i)
	{
		Dart d = m_tableVertDarts[i];
		d = map.phi_1(d);
		Dart e = m_tableVertDarts[i+1];
		e = map.phi1(e);
		map.sewFaces(d, e, false);
	}
	//sewing the last with the first
	map.sewFaces(map.phi1(m_tableVertDarts[0]), map.phi_1(m_tableVertDarts[n-1]), false);

	//sewing the top & bottom faces
	Dart d1 = map.newFace(n, false);
	Dart d2 = map.newFace(n, false);
	dres = d1;
	for(unsigned int i = 0; i < n ; ++i)
	{
		map.sewFaces(m_tableVertDarts[i], d1, false);
		map.sewFaces(m_tableVertDarts[n+i], d2, false);
		d1 = map.phi1(d1);
		d2 = map.phi_1(d2);
	}

	//return a dart from the base
	return dres;
}

/**
 * create a n-sided diamond
 */
template <typename PFP>
Dart createDiamond(typename PFP::MAP& map, unsigned int nbSides)
{
	Dart res = Dart::nil();

	Dart firstP = createPyramid<PFP>(map,nbSides);
	Dart secondP = createPyramid<PFP>(map,nbSides);

	res = map.phi2(firstP);

	map.sewVolumes(firstP, secondP);
	map.mergeVolumes(firstP);

	return res;
}



/**
 * create a 3-sided prism
 */
template <typename PFP>
Dart createTriangularPrism(typename PFP::MAP& map)
{
	return createPrism<PFP>(map, 3);
}

/**
 * create a hexahedron
 */
template <typename PFP>
Dart createHexahedron(typename PFP::MAP& map)
{
	return createPrism<PFP>(map, 4);
}

/**
 * create a tetrahedron
 */
template <typename PFP>
Dart createTetrahedron(typename PFP::MAP& map)
{
	return createPyramid<PFP>(map, 3);
}

/**
 * create a 4-sided pyramid
 */
template <typename PFP>
Dart createQuadrangularPyramid(typename PFP::MAP& map)
{
	return createPyramid<PFP>(map, 4);
}

/**
 * create an octahedron (i.e. 4-sided diamond)
 */
template <typename PFP>
Dart createOctahedron(typename PFP::MAP& map)
{
	return createDiamond<PFP>(map,4);
}





untereiner's avatar
untereiner committed
198
199
200
201
202
203
204
205
template <typename PFP>
void explodPolyhedron(typename PFP::MAP& map, Dart d, typename PFP::TVEC3 position)
{
	map.unsewVertexUmbrella(d);
	unsigned int newFaceDegree = map.closeHole(map.phi1(d));

	if(newFaceDegree != 3)
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
206
		// chercher le brin ou demarrer
untereiner's avatar
untereiner committed
207
208
209
210
211
212

		std::multimap<Dart, int> edges ;
		typename std::multimap<Dart, int>::iterator it ;

		Dart d12 = map.phi2(map.phi1(d));
		Dart fit = d12;
Pierre Kraemer's avatar
Pierre Kraemer committed
213
		unsigned int i;
untereiner's avatar
untereiner committed
214
215
216
217
218
219

		do
		{
			i = map.faceDegree(map.phi2(fit));
			std::cout << "edge(" << fit << "," << i << ")" << std::endl;
			edges.insert(std::make_pair(fit, i));
Pierre Kraemer's avatar
Pierre Kraemer committed
220
			fit = map.phi1(fit);
untereiner's avatar
untereiner committed
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
		}
		while(fit != d12);

		do
		{
			//44 44
			if(edges.find(fit)->second == 4 && edges.find(map.phi1(fit))->second == 4
				&& !map.sameFace(map.phi2(fit), map.phi2(map.phi1(fit))))
			{
				map.splitFace(fit, map.phi1(map.phi1(fit)));
				fit = map.phi2(map.phi_1(fit));
				int i = map.faceDegree(fit);
				edges.insert(std::make_pair(fit, i));

//				Dart fit2 = map.phi2(fit) ;
//				typename PFP::VEC3 p1 = position[fit] ;
//				typename PFP::VEC3 p2 = position[fit2] ;
//
//				map.cutEdge(fit) ;
//				position[map.phi1(fit)] = typename PFP::REAL(0.5) * (p1 + p2);


				std::cout << "flip cas quad quad " << std::endl;
			}

			//3 3
			if(edges.find(fit)->second == 3 && edges.find(map.phi1(fit))->second == 3
				&& !map.sameFace(map.phi2(fit), map.phi2(map.phi1(fit))))
			{
				map.splitFace(fit, map.phi1(fit));
				fit = map.phi2(map.phi_1(fit));
				int i = map.faceDegree(fit);
				edges.insert(std::make_pair(fit, i));

				std::cout << "flip cas tri tri" << std::endl;
			}

			//3 44 ou 44 3
			if( ((edges.find(fit)->second == 4 && edges.find(map.phi1(fit))->second == 3)
				|| (edges.find(fit)->second == 3 && edges.find(map.phi1(fit))->second == 4))
					&& !map.sameFace(map.phi2(fit), map.phi2(map.phi1(fit))))
			{
				map.splitFace(fit, map.phi1(map.phi1(fit)));
				fit = map.phi2(map.phi_1(fit));
				int i = map.faceDegree(fit);
				edges.insert(std::make_pair(fit, i));

				std::cout << "flip cas quad tri" << std::endl;
			}

			fit = map.phi1(fit);
		}
		while(map.faceDegree(fit) > 4 && fit != d12);

	}
}

Pierre Kraemer's avatar
Pierre Kraemer committed
278
template <typename PFP>
Pierre Kraemer's avatar
Pierre Kraemer committed
279
280
281
282
283
284
285
Polyhedron<PFP>::Polyhedron(const Polyhedron<PFP>& p1, const Polyhedron<PFP>& p2) :
	m_map(p1.m_map),
	m_dart(p1.m_dart),
	m_kind(COMPOSED),
	m_nx(-1), m_ny(-1), m_nz(-1),
	m_top_closed(false), m_bottom_closed(false),
	m_positions(p1.m_positions)
Pierre Kraemer's avatar
Pierre Kraemer committed
286
287
288
{
	if (&(p1.map) != &(p2.map))
	{
289
		CGoGNerr << "Warning, can not merge to Polyhedrons of different maps"<< CGoGNendl;
Pierre Kraemer's avatar
Pierre Kraemer committed
290
291
292
293
294
295
	}

	m_tableVertDarts.reserve(p1.m_tableVertDarts.size() + p2.m_tableVertDarts.size()); // can be too much but ...

	typename PFP::VEC3 center(0);

Pierre Kraemer's avatar
Pierre Kraemer committed
296
	for(typename std::vector<Dart>::const_iterator di = p1.m_tableVertDarts.begin(); di != p1.m_tableVertDarts.end(); ++di)
Pierre Kraemer's avatar
Pierre Kraemer committed
297
298
299
300
301
302
	{
		m_tableVertDarts.push_back(*di);
		center += m_positions[*di];
	}

	// O(n2) pas terrible !!
Pierre Kraemer's avatar
Pierre Kraemer committed
303
	for(typename std::vector<Dart>::const_iterator di = p2.m_tableVertDarts.begin(); di != p2.m_tableVertDarts.end(); ++di)
Pierre Kraemer's avatar
Pierre Kraemer committed
304
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
305
		unsigned int em = m_map.getEmbedding(*di, VERTEX);
Pierre Kraemer's avatar
Pierre Kraemer committed
306
307
308
309
310

		typename std::vector<Dart>::const_iterator dj=p1.m_tableVertDarts.begin();
		bool found = false;
		while ((dj !=p1.m_tableVertDarts.end()) && (!found))
		{
Pierre Kraemer's avatar
Pierre Kraemer committed
311
312
			unsigned int xm = m_map.getEmbedding(*dj, VERTEX);
			if (xm == em)
Pierre Kraemer's avatar
Pierre Kraemer committed
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
				found = true;
			else
				++dj;
		}
		if (!found)
		{
			m_tableVertDarts.push_back(*di);
			center += m_positions[*di];
		}
	}

	m_center = center / typename PFP::REAL(m_tableVertDarts.size());
}

template <typename PFP>
Pierre Kraemer's avatar
Pierre Kraemer committed
328
Dart Polyhedron<PFP>::grid_topo(unsigned int x, unsigned int y)
Pierre Kraemer's avatar
Pierre Kraemer committed
329
330
331
332
333
334
335
336
337
338
339
340
341
{
	if (m_kind != NONE) return m_dart;

	m_kind = GRID;
	m_nx = x;
	m_ny = y;
	// nb vertices
	int nb = (x+1)*(y+1);

	// vertice reservation
	m_tableVertDarts.reserve(nb);

	// creation of quads and storing vertices
Pierre Kraemer's avatar
Pierre Kraemer committed
342
	for (unsigned int i = 0; i < y; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
343
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
344
		for (unsigned int j = 1; j <= x; ++j)
Pierre Kraemer's avatar
Pierre Kraemer committed
345
		{
346
			Dart d = m_map.newFace(4,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
347
			m_tableVertDarts.push_back(d);
Pierre Kraemer's avatar
Pierre Kraemer committed
348
			if (j == x)
Pierre Kraemer's avatar
Pierre Kraemer committed
349
350
351
				m_tableVertDarts.push_back(m_map.phi1(d));
		}
	}
Pierre Kraemer's avatar
Pierre Kraemer committed
352

Pierre Kraemer's avatar
Pierre Kraemer committed
353
	// store last row of vertices
Pierre Kraemer's avatar
Pierre Kraemer committed
354
	for (unsigned int i = 0; i < x; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
355
356
357
358
359
360
	{
		m_tableVertDarts.push_back( m_map.phi_1(m_tableVertDarts[(y-1)*(x+1) + i]) );	
	}
	m_tableVertDarts.push_back( m_map.phi1(m_tableVertDarts[(y-1)*(x+1) +x]) );	

	//sewing the quads
Pierre Kraemer's avatar
Pierre Kraemer committed
361
	for (unsigned int i = 0; i < y; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
362
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
363
		for (unsigned int j = 0; j < x; ++j)
Pierre Kraemer's avatar
Pierre Kraemer committed
364
		{
Pierre Kraemer's avatar
Pierre Kraemer committed
365
			if (i > 0) // sew with preceeding row
Pierre Kraemer's avatar
Pierre Kraemer committed
366
367
368
369
370
			{
				int pos = i*(x+1)+j;
				Dart d = m_tableVertDarts[pos];
				Dart e = m_tableVertDarts[pos-(x+1)];
				e = m_map.phi1(m_map.phi1(e));
371
				m_map.sewFaces(d,e,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
372
			}
Pierre Kraemer's avatar
Pierre Kraemer committed
373
			if (j > 0) // sew with preceeding column
Pierre Kraemer's avatar
Pierre Kraemer committed
374
375
376
377
378
379
			{
				int pos = i*(x+1)+j;
				Dart d = m_tableVertDarts[pos];
				d = m_map.phi_1(d);
				Dart e = m_tableVertDarts[pos-1];
				e = m_map.phi1(e);
380
				m_map.sewFaces(d,e,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
381
382
383
384
385
386
			}
		}
	}

	// store & return reference dart
	m_dart = m_tableVertDarts[0]; // util ?
387
388
389

	m_map.closeHole(m_dart) ;

Pierre Kraemer's avatar
Pierre Kraemer committed
390
391
392
393
	return m_dart;
}

template <typename PFP>
Pierre Kraemer's avatar
Pierre Kraemer committed
394
Dart Polyhedron<PFP>::cylinder_topo(unsigned int n, unsigned int z, bool top_closed, bool bottom_closed)
Pierre Kraemer's avatar
Pierre Kraemer committed
395
396
397
398
399
400
401
{
	if (m_kind != NONE) return m_dart;

	m_kind = CYLINDER;
	m_nx = n;
	m_nz = z;

Pierre Kraemer's avatar
Pierre Kraemer committed
402
403
	m_bottom_closed = bottom_closed;
	m_top_closed = top_closed;
Pierre Kraemer's avatar
Pierre Kraemer committed
404
405
406
407
408
409
410
411
412

	int nb = (n)*(z+1);
	if (bottom_closed) nb++;
	if (top_closed) nb++;

	// vertice reservation
	m_tableVertDarts.reserve(nb);

	// creation of quads and storing vertices
Pierre Kraemer's avatar
Pierre Kraemer committed
413
	for (unsigned int i = 0; i < z; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
414
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
415
		for (unsigned int j = 0; j < n; ++j)
Pierre Kraemer's avatar
Pierre Kraemer committed
416
		{
Pierre Kraemer's avatar
Pierre Kraemer committed
417
			Dart d = m_map.newFace(4, false);
Pierre Kraemer's avatar
Pierre Kraemer committed
418
419
420
			m_tableVertDarts.push_back(d);
		}
	}
Pierre Kraemer's avatar
Pierre Kraemer committed
421
	for (unsigned int i = 0; i < n; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
422
423
424
425
426
	{
		m_tableVertDarts.push_back( m_map.phi_1(m_tableVertDarts[(z-1)*n+i]) );	
	}

	//sewing the quads
Pierre Kraemer's avatar
Pierre Kraemer committed
427
	for (unsigned int i = 0; i < z; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
428
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
429
		for (unsigned int j = 0; j < n; ++j)
Pierre Kraemer's avatar
Pierre Kraemer committed
430
		{
Pierre Kraemer's avatar
Pierre Kraemer committed
431
			if (i > 0) // sew with preceeding row
Pierre Kraemer's avatar
Pierre Kraemer committed
432
433
434
435
436
			{
				int pos = i*n+j;
				Dart d = m_tableVertDarts[pos];
				Dart e = m_tableVertDarts[pos-n];
				e = m_map.phi1(m_map.phi1(e));
Pierre Kraemer's avatar
Pierre Kraemer committed
437
				m_map.sewFaces(d, e, false);
Pierre Kraemer's avatar
Pierre Kraemer committed
438
			}
Pierre Kraemer's avatar
Pierre Kraemer committed
439
			if (j > 0) // sew with preceeding column
Pierre Kraemer's avatar
Pierre Kraemer committed
440
441
442
443
444
445
			{
				int pos = i*n+j;
				Dart d = m_tableVertDarts[pos];
				d = m_map.phi_1(d);
				Dart e = m_tableVertDarts[pos-1];
				e = m_map.phi1(e);
Pierre Kraemer's avatar
Pierre Kraemer committed
446
				m_map.sewFaces(d, e, false);
Pierre Kraemer's avatar
Pierre Kraemer committed
447
448
449
450
451
452
453
454
			}
			else 
			{
				int pos = i*n;
				Dart d = m_tableVertDarts[pos];
				d = m_map.phi_1(d);
				Dart e = m_tableVertDarts[pos+(n-1)];
				e = m_map.phi1(e);
Pierre Kraemer's avatar
Pierre Kraemer committed
455
				m_map.sewFaces(d, e, false);
Pierre Kraemer's avatar
Pierre Kraemer committed
456
457
458
459
460
461
462
			}
		}
	}

	if (bottom_closed)
	{
		Dart d = m_tableVertDarts[0];
463
		if(m_map.closeHole(d, false))
Pierre Kraemer's avatar
Pierre Kraemer committed
464
465
		{
			d = m_map.phi2(d);
466
			if(m_map.faceDegree(d) > 3)
Pierre Kraemer's avatar
Pierre Kraemer committed
467
			{
468
				Algo::Modelisation::trianguleFace<PFP>(m_map, d);
Pierre Kraemer's avatar
Pierre Kraemer committed
469
470
471
472
				m_tableVertDarts.push_back(m_map.phi_1(d));
			}
		}
	}
473
474
	else
		m_map.closeHole(m_tableVertDarts[0]);
Pierre Kraemer's avatar
Pierre Kraemer committed
475
476
477
478

	if (top_closed)
	{
		Dart d =  m_map.phi_1(m_tableVertDarts[n*z]);
479
		if(m_map.closeHole(d, false))
Pierre Kraemer's avatar
Pierre Kraemer committed
480
481
		{
			d = m_map.phi2(d);
482
			if(m_map.faceDegree(d) > 3)
Pierre Kraemer's avatar
Pierre Kraemer committed
483
			{
484
				Algo::Modelisation::trianguleFace<PFP>(m_map, d);
Pierre Kraemer's avatar
Pierre Kraemer committed
485
486
487
488
				m_tableVertDarts.push_back(m_map.phi_1(d));
			}
		}
	}
489
490
	else
		m_map.closeHole(m_map.phi_1(m_tableVertDarts[n*z]));
Pierre Kraemer's avatar
Pierre Kraemer committed
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

	m_dart = m_tableVertDarts.front();
	return m_dart;
}

// template <typename PFP>
// Dart Polyhedron<PFP>::cone_topo(int n, int z, bool bottom_closed)
// {
// 	if (m_kind != NONE) return m_dart;
// 
// 	if (z>1)
// 	{
// 		if  (n>4) // normal case
// 		{
// 			Dart d = cylinder_topo(n,z-1,true,bottom_closed);
// 			m_kind = CONE;
// 			m_nz = z;
// 			return d;
// 		}
// 		else if (n==4)
// 		{
// 			Dart d = cylinder_topo(n,z-1,true,false);
// 			m_kind = CONE;
// 			m_nz = z;
// 			// close bottom with one quad not three triangles
// 			if (bottom_closed)
// 			{
518
// 				Dart t= m_map.newFace(4,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
// 				m_map.sewFaces(m_tableVertDarts[0],t);
// 				t=m_map.phi_1(t);
// 				m_map.sewFaces(m_tableVertDarts[1],t);
// 				t=m_map.phi_1(t);
// 				m_map.sewFaces(m_tableVertDarts[2],t);
// 				t=m_map.phi_1(t);
// 				m_map.sewFaces(m_tableVertDarts[3],t);
// 			}
// 			return d;
// 		}
// 		else // n==3 (base is triangle)
// 		{
// 			Dart d = cylinder_topo(n,z-1,true,false);
// 			m_kind = CONE;
// 			m_nz = z;
// 			// close bottom with one triangle not three
// 			if (bottom_closed)
// 			{
537
// 				Dart t= m_map.newFace(3,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
// 				m_map.sewFaces(d,t);
// 				d=nextDV(d); t=m_map.phi_1(t);
// 				m_map.sewFaces(d,t);
// 				d=nextDV(d); t=m_map.phi_1(t);
// 				m_map.sewFaces(d,t);
// 			}
// 			return d;
// 		}
// 	}
// 	else //z==1 only on slice
// 	{
// 		m_kind = CONE;		
// 		m_nx = n;
// 		m_nz = z;
// 		if  (n>4) // normal case
// 		{
// 			if (bottom_closed)
// 				m_tableVertDarts.reserve(n+2);
// 			else
// 				m_tableVertDarts.reserve(n+1);
// 
// 			Dart ref = triangleFan_topo<PFP>(m_map,n);
// 			Dart d = ref;
// 			for (int i=0;i<n;++i)
// 			{
// 				m_tableVertDarts.push_back(d);
// 				d = nextDV(d);
// 			}
// 
// 			if (bottom_closed)
// 			{
// 				m_bottom_closed=true;
// 				Dart dd = triangleFan_topo<PFP>(m_map,n);
// 				m_tableVertDarts.push_back(m_map.phi_1(dd));
// 				for (int i=0;i<n;++i)
// 				{
// 					m_map.sewFaces(d,dd);
// 					d=nextDV(d);
// 					dd=precDV(dd);
// 				}
// 			}
// 
// 			m_tableVertDarts.push_back(m_map.phi_1(ref));
// 
// 			m_dart=ref;
// 			return ref;
// 		}
// 		else if (n==4)
// 		{
// 			m_bottom_closed=false; // because no vertex in bottom
// 			m_tableVertDarts.reserve(4);
// 
// 			Dart dd = triangleFan_topo<PFP>(m_map,4);
// 			for (int i=0;i<4;++i)
// 			{
// 				m_tableVertDarts.push_back(dd);
// 				dd = nextDV(dd);
// 			}
// 			m_tableVertDarts.push_back(m_map.phi_1(dd));
// 
// 			if (bottom_closed)
// 			{
600
// 				Dart t= m_map.newFace(4,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
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
// 				m_map.sewFaces(m_tableVertDarts[0],t);
// 				t=m_map.phi_1(t);
// 				m_map.sewFaces(m_tableVertDarts[1],t);
// 				t=m_map.phi_1(t);
// 				m_map.sewFaces(m_tableVertDarts[2],t);
// 				t=m_map.phi_1(t);
// 				m_map.sewFaces(m_tableVertDarts[3],t);
// 			}
// 			m_dart=dd;
// 			return dd;
// 		}
// 		else // n==3 (base is triangle, here we create a tetrahedron)
// 		{
// 			m_bottom_closed=false; // because no vertex in bottom
// 			m_tableVertDarts.reserve(4);
// 
// 			Dart dd = triangleFan_topo<PFP>(m_map,3);
// 			for (int i=0;i<3;++i)
// 			{
// 				m_tableVertDarts.push_back(dd);
// 				dd = nextDV(dd);
// 			}
// 			m_tableVertDarts.push_back(m_map.phi_1(dd));
// 
// 			if (bottom_closed)
// 			{
627
// 				Dart t= m_map.newFace(3,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
628
629
630
631
632
633
634
635
636
637
638
639
640
// 				m_map.sewFaces(m_tableVertDarts[0],t);
// 				t=m_map.phi_1(t);
// 				m_map.sewFaces(m_tableVertDarts[1],t);
// 				t=m_map.phi_1(t);
// 				m_map.sewFaces(m_tableVertDarts[2],t);
// 			}
// 			m_dart=dd;
// 			return dd;
// 		}
// 	}
// }

template <typename PFP>
Pierre Kraemer's avatar
Pierre Kraemer committed
641
Dart Polyhedron<PFP>::cube_topo(unsigned int x, unsigned int y, unsigned int z)
Pierre Kraemer's avatar
Pierre Kraemer committed
642
643
644
{
	if (m_kind != NONE) return m_dart;

Pierre Kraemer's avatar
Pierre Kraemer committed
645
	m_dart = cylinder_topo(2*(x+y), z, false, false);
Pierre Kraemer's avatar
Pierre Kraemer committed
646
647
648
649
650
651
652
653
654
655
	m_kind = CUBE;
	m_nx = x;
	m_ny = y;
	m_nz = z;

	int nb = 2*(x+y)*(z+1) + 2*(x-1)*(y-1);
	m_tableVertDarts.reserve(nb);
	
	// we now have the 4 sides, just need to create store and sew top & bottom
	// the top
656
	Polyhedron<PFP> primTop(m_map, m_positions);
Pierre Kraemer's avatar
Pierre Kraemer committed
657
658
659
660
	primTop.grid_topo(x,y);
	std::vector<Dart>& tableTop = primTop.getVertexDarts();

	int index_side = 2*(x+y)*z;
Pierre Kraemer's avatar
Pierre Kraemer committed
661
	for(unsigned int i = 0; i < x; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
662
663
664
	{
		Dart d = m_map.phi_1(m_tableVertDarts[index_side++]);
		Dart e = tableTop[i];
Pierre Kraemer's avatar
Pierre Kraemer committed
665
		m_map.sewFaces(d, e, false);
Pierre Kraemer's avatar
Pierre Kraemer committed
666
	}
Pierre Kraemer's avatar
Pierre Kraemer committed
667
	for(unsigned int i = 0; i < y; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
668
669
670
	{
		Dart d = m_map.phi_1(m_tableVertDarts[index_side++]);
		Dart e = tableTop[x+i*(x+1)];
Pierre Kraemer's avatar
Pierre Kraemer committed
671
		m_map.sewFaces(d, e, false);
Pierre Kraemer's avatar
Pierre Kraemer committed
672
	}
Pierre Kraemer's avatar
Pierre Kraemer committed
673
	for(unsigned int i = 0; i < x; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
674
675
676
677
	{
		Dart d = m_map.phi_1(m_tableVertDarts[index_side++]);
		Dart e = tableTop[(x+1)*(y+1)-2 - i];
		e = m_map.phi_1(e);
Pierre Kraemer's avatar
Pierre Kraemer committed
678
		m_map.sewFaces(d, e, false);
Pierre Kraemer's avatar
Pierre Kraemer committed
679
	}
Pierre Kraemer's avatar
Pierre Kraemer committed
680
	for(unsigned int i = 0; i < y; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
681
682
683
684
	{
		Dart d = m_map.phi_1(m_tableVertDarts[index_side++]);
		Dart e = tableTop[(y-1-i)*(x+1)];
		e = m_map.phi_1(e);
Pierre Kraemer's avatar
Pierre Kraemer committed
685
		m_map.sewFaces(d, e, false);
Pierre Kraemer's avatar
Pierre Kraemer committed
686
687
688
	}

	// the bottom
689
	Polyhedron<PFP> primBottom(m_map,m_positions);
Pierre Kraemer's avatar
Pierre Kraemer committed
690
691
692
693
	primBottom.grid_topo(x,y);
	std::vector<Dart>& tableBottom = primBottom.getVertexDarts();

	index_side = 3*(x+y)+(x-1);
Pierre Kraemer's avatar
Pierre Kraemer committed
694
	for(unsigned int i = 0; i < x; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
695
696
697
	{
		Dart d = m_tableVertDarts[(index_side--)%(2*(x+y))];
		Dart e = tableBottom[i];
Pierre Kraemer's avatar
Pierre Kraemer committed
698
		m_map.sewFaces(d, e, false);
Pierre Kraemer's avatar
Pierre Kraemer committed
699
	}
Pierre Kraemer's avatar
Pierre Kraemer committed
700
	for(unsigned int i = 0; i < y; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
701
702
703
	{
		Dart d = m_tableVertDarts[(index_side--)%(2*(x+y))];
		Dart e = tableBottom[x+i*(x+1)];
Pierre Kraemer's avatar
Pierre Kraemer committed
704
		m_map.sewFaces(d, e, false);
Pierre Kraemer's avatar
Pierre Kraemer committed
705
	}
Pierre Kraemer's avatar
Pierre Kraemer committed
706
	for(unsigned int i = 0; i < x; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
707
708
709
710
	{
		Dart d = m_tableVertDarts[(index_side--)%(2*(x+y))];
		Dart e = tableBottom[(x+1)*(y+1)-2 - i];
		e = m_map.phi_1(e);
Pierre Kraemer's avatar
Pierre Kraemer committed
711
		m_map.sewFaces(d, e, false);
Pierre Kraemer's avatar
Pierre Kraemer committed
712
	}
Pierre Kraemer's avatar
Pierre Kraemer committed
713
	for(unsigned int i = 0; i < y; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
714
715
716
717
	{
		Dart d = m_tableVertDarts[(index_side--)%(2*(x+y))];
		Dart e = tableBottom[(y-1-i)*(x+1)];
		e = m_map.phi_1(e);
Pierre Kraemer's avatar
Pierre Kraemer committed
718
		m_map.sewFaces(d, e, false);
Pierre Kraemer's avatar
Pierre Kraemer committed
719
720
721
722
	}

	// and add new vertex in m_tableVertDarts
	//top  first
Pierre Kraemer's avatar
Pierre Kraemer committed
723
	for(unsigned int i = 1; i < y; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
724
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
725
		for(unsigned int j = 1; j < x; ++j)
Pierre Kraemer's avatar
Pierre Kraemer committed
726
727
728
729
			m_tableVertDarts.push_back(tableTop[i*(x+1)+j]);
	}

	// then bottom
Pierre Kraemer's avatar
Pierre Kraemer committed
730
	for(unsigned int i = 1; i < y; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
731
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
732
		for(unsigned int j = 1; j < x; ++j)
Pierre Kraemer's avatar
Pierre Kraemer committed
733
734
735
736
737
738
739
			m_tableVertDarts.push_back(tableBottom[i*(x+1)+j]);
	}

	return m_dart;
}

template <typename PFP>
Pierre Kraemer's avatar
Pierre Kraemer committed
740
Dart Polyhedron<PFP>::tore_topo(unsigned int m, unsigned int n)
Pierre Kraemer's avatar
Pierre Kraemer committed
741
742
743
744
{
	if (m_kind != NONE) return m_dart;

	m_dart = cylinder_topo(n, m, false, false);
Pierre Kraemer's avatar
Pierre Kraemer committed
745
746
	m_nx = n;
	m_ny = m;
Pierre Kraemer's avatar
Pierre Kraemer committed
747
748
	m_kind = TORE;

Pierre Kraemer's avatar
Pierre Kraemer committed
749
	// just finish to sew
Pierre Kraemer's avatar
Pierre Kraemer committed
750
	for(unsigned int i = 0; i < n; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
751
752
753
754
	{
		Dart d = m_tableVertDarts[i];
		Dart e = m_tableVertDarts[(m*n)+i];
		e = m_map.phi_1(e);
Pierre Kraemer's avatar
Pierre Kraemer committed
755
		m_map.sewFaces(d, e);
Pierre Kraemer's avatar
Pierre Kraemer committed
756
757
758
759
760
761
762
763
764
765
	}

	// remove the last n vertex darts that are no more necessary (sewed with n first)
	// memory not freed (but will be when destroy the Polyhedron), not important ??
	m_tableVertDarts.resize(m*n); 

	return m_dart;
}

template <typename PFP>
Pierre Kraemer's avatar
Pierre Kraemer committed
766
void Polyhedron<PFP>::embedGrid(float x, float y, float z)
Pierre Kraemer's avatar
Pierre Kraemer committed
767
768
769
{
	typedef typename PFP::VEC3 VEC3 ;

Pierre Kraemer's avatar
Pierre Kraemer committed
770
771
	if (m_kind != GRID)
	{
772
		CGoGNerr << "Warning try to embedGrid something that is not a grid"<<CGoGNendl;
Pierre Kraemer's avatar
Pierre Kraemer committed
773
774
775
776
777
778
		return;
	}

	float dx = x/float(m_nx);
	float dy = y/float(m_ny);

Pierre Kraemer's avatar
Pierre Kraemer committed
779
	for(unsigned int i = 0; i <= m_ny; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
780
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
781
		for(unsigned int j = 0; j <= m_nx;++j)
Pierre Kraemer's avatar
Pierre Kraemer committed
782
783
784
785
		{
			VEC3 pos(-x/2 + dx*float(j), -y/2 + dy*float(i), z);
			unsigned int em = m_positions.insert(pos);
			Dart d = m_tableVertDarts[i*(m_nx+1)+j];
Pierre Kraemer's avatar
Pierre Kraemer committed
786
			m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
787
788
789
790
791
		}
	}
}

template <typename PFP>
Pierre Kraemer's avatar
Pierre Kraemer committed
792
void Polyhedron<PFP>::embedCylinder(float bottom_radius, float top_radius, float height)
Pierre Kraemer's avatar
Pierre Kraemer committed
793
794
795
{
	typedef typename PFP::VEC3 VEC3 ;

Pierre Kraemer's avatar
Pierre Kraemer committed
796
797
	if (m_kind != CYLINDER)
	{
798
		CGoGNerr << "Warning try to embedCylinder something that is not a cylnder"<<CGoGNendl;
Pierre Kraemer's avatar
Pierre Kraemer committed
799
800
801
802
803
804
		return;
	}

	float alpha = float(2.0*M_PI/m_nx);
	float dz = height/float(m_nz);

Pierre Kraemer's avatar
Pierre Kraemer committed
805
	for(unsigned int i = 0; i <= m_nz; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
806
807
808
	{
		float a = float(i)/float(m_nz);
		float radius = a*top_radius + (1.0f-a)*bottom_radius;
Pierre Kraemer's avatar
Pierre Kraemer committed
809
		for(unsigned int j = 0; j < m_nx; ++j)
Pierre Kraemer's avatar
Pierre Kraemer committed
810
811
812
813
814
815
816
		{
	
			float x = radius*cos(alpha*float(j));
			float y = radius*sin(alpha*float(j));
			VEC3 pos(x, y, -height/2 + dz*float(i));
			unsigned int em = m_positions.insert(pos);
			Dart d = m_tableVertDarts[i*(m_nx)+j];
Pierre Kraemer's avatar
Pierre Kraemer committed
817
			m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
818
819
820
821
822
823
824
825
826
		}
	}

	int indexUmbrella = m_nx*(m_nz+1);
	if (m_bottom_closed)
	{
		VEC3 pos(0.0f, 0.0f, -height/2 );
		unsigned int em = m_positions.insert(pos);
		Dart d = m_tableVertDarts[indexUmbrella++];
Pierre Kraemer's avatar
Pierre Kraemer committed
827
		m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
828
829
830
831
832
833
834
	}

	if (m_top_closed)
	{
		VEC3 pos(0.0f ,0.0f, height/2 );
		unsigned int em = m_positions.insert(pos);
		Dart d = m_tableVertDarts[indexUmbrella];
Pierre Kraemer's avatar
Pierre Kraemer committed
835
		m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
836
837
838
839
	}
}

template <typename PFP>
Pierre Kraemer's avatar
Pierre Kraemer committed
840
void Polyhedron<PFP>::embedCone(float radius, float height)
Pierre Kraemer's avatar
Pierre Kraemer committed
841
842
843
{
	typedef typename PFP::VEC3 VEC3 ;

Pierre Kraemer's avatar
Pierre Kraemer committed
844
845
	if (m_kind != CONE)
	{
846
		CGoGNerr << "Warning try to embedCone something that is not a cone"<<CGoGNendl;
Pierre Kraemer's avatar
Pierre Kraemer committed
847
848
849
850
851
852
853
		return;
	}

	float alpha = float(2.0*M_PI/m_nx);
	int zcyl = m_nz-1;
	float dz = height/float(m_nz);
	
Pierre Kraemer's avatar
Pierre Kraemer committed
854
	for(unsigned int i = 0; i <= zcyl; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
855
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
856
		for(unsigned int j = 0; j < m_nx; ++j)
Pierre Kraemer's avatar
Pierre Kraemer committed
857
858
859
860
861
862
863
864
865
866
		{
			float rad = radius * float(m_nz-i)/float(m_nz);
			float h = -height/2 + dz*float(i);

			float x = rad*cos(alpha*float(j));
			float y = rad*sin(alpha*float(j));

			VEC3 pos(x, y, h);
			unsigned int em = m_positions.insert(pos);
			Dart d = m_tableVertDarts[i*(m_nx)+j];
Pierre Kraemer's avatar
Pierre Kraemer committed
867
			m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
868
869
870
871
872
873
874
875
876
		}
	}

	int indexUmbrella = m_nx*(m_nz);
	if (m_bottom_closed)
	{
		VEC3 pos(0.0f, 0.0f, -height/2 );
		unsigned int em = m_positions.insert(pos);
		Dart d = m_tableVertDarts[indexUmbrella++];
Pierre Kraemer's avatar
Pierre Kraemer committed
877
		m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
878
879
880
881
882
883
	}

	//  top always closed in cone 
	VEC3 pos(0.0f ,0.0f, height/2.0f );
	unsigned int em = m_positions.insert(pos);
	Dart d = m_tableVertDarts[indexUmbrella];
Pierre Kraemer's avatar
Pierre Kraemer committed
884
	m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
885
886
887
}

template <typename PFP>
Pierre Kraemer's avatar
Pierre Kraemer committed
888
void Polyhedron<PFP>::embedSphere(float radius)
Pierre Kraemer's avatar
Pierre Kraemer committed
889
890
891
{
	typedef typename PFP::VEC3 VEC3 ;

Pierre Kraemer's avatar
Pierre Kraemer committed
892
893
	if (!((m_kind == CYLINDER) && (m_top_closed) && (m_bottom_closed)))
	{
894
		CGoGNerr << "Warning try to embedSphere something that is not a sphere (closed cylinder)"<<CGoGNendl;
Pierre Kraemer's avatar
Pierre Kraemer committed
895
896
897
898
899
900
		return;
	}

	float alpha = float(2.0*M_PI/m_nx);
	float beta = float(M_PI/(m_nz+2));

Pierre Kraemer's avatar
Pierre Kraemer committed
901
	for(unsigned int i = 0; i <= m_nz; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
902
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
903
		for(unsigned int j = 0; j < m_nx; ++j)
Pierre Kraemer's avatar
Pierre Kraemer committed
904
905
906
907
908
909
910
911
912
		{
			float h = float(radius * sin(-M_PI/2.0+(i+1)*beta));
			float rad = float(radius * cos(-M_PI/2.0+(i+1)*beta));

			float x = rad*cos(alpha*float(j));
			float y = rad*sin(alpha*float(j));
			VEC3 pos(x, y, h );
			unsigned int em = m_positions.insert(pos);
			Dart d = m_tableVertDarts[i*(m_nx)+j];
Pierre Kraemer's avatar
Pierre Kraemer committed
913
			m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
914
915
916
917
		}
	}

	// bottom  pole
Pierre Kraemer's avatar
Pierre Kraemer committed
918
	VEC3 pos(0.0f, 0.0f, -radius);
Pierre Kraemer's avatar
Pierre Kraemer committed
919
920
	unsigned int em = m_positions.insert(pos);
	Dart d = m_tableVertDarts[m_nx*(m_nz+1)];
Pierre Kraemer's avatar
Pierre Kraemer committed
921
	m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
922
923

	//  top pole
Pierre Kraemer's avatar
Pierre Kraemer committed
924
	pos = VEC3(0.0f, 0.0f, radius);
Pierre Kraemer's avatar
Pierre Kraemer committed
925
926
	em = m_positions.insert(pos);
	d = m_tableVertDarts[m_nx*(m_nz+1)+1];
Pierre Kraemer's avatar
Pierre Kraemer committed
927
	m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
928
929
930
}

template <typename PFP>
Pierre Kraemer's avatar
Pierre Kraemer committed
931
void Polyhedron<PFP>::embedTore(float big_radius, float small_radius)
Pierre Kraemer's avatar
Pierre Kraemer committed
932
933
934
{
	typedef typename PFP::VEC3 VEC3 ;

Pierre Kraemer's avatar
Pierre Kraemer committed
935
936
	if (m_kind != TORE)
	{
937
		CGoGNerr << "Warning try to embedTore something that is not a tore"<<CGoGNendl;
Pierre Kraemer's avatar
Pierre Kraemer committed
938
939
940
941
942
943
		return;
	}

	float alpha = float(2.0*M_PI/m_nx);
	float beta = float(2.0*M_PI/m_ny);

Pierre Kraemer's avatar
Pierre Kraemer committed
944
	for (unsigned int i = 0; i < m_nx; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
945
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
946
		for(unsigned int j = 0; j < m_ny; ++j)
Pierre Kraemer's avatar
Pierre Kraemer committed
947
948
949
950
951
952
953
954
		{
			float z = small_radius*sin(beta*float(j));
			float r = big_radius + small_radius*cos(beta*float(j));
			float x = r*cos(alpha*float(i));
			float y = r*sin(alpha*float(i));
			VEC3 pos(x, y, z);
			unsigned int em = m_positions.insert(pos);
			Dart d = m_tableVertDarts[j*(m_nx)+i];
Pierre Kraemer's avatar
Pierre Kraemer committed
955
			m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
956
957
958
959
960
		}
	}
}

template <typename PFP>
Pierre Kraemer's avatar
Pierre Kraemer committed
961
void Polyhedron<PFP>::embedCube(float sx, float sy, float sz)
Pierre Kraemer's avatar
Pierre Kraemer committed
962
963
964
{
	typedef typename PFP::VEC3 VEC3 ;

Pierre Kraemer's avatar
Pierre Kraemer committed
965
966
	if (m_kind != CUBE)
	{
967
		CGoGNerr << "Warning try to embedCube something that is not a cube"<<CGoGNendl;
Pierre Kraemer's avatar
Pierre Kraemer committed
968
969
970
971
972
973
974
975
976
		return;
	}

	float dz = sz/float(m_nz);
	float dy = sy/float(m_ny);
	float dx = sx/float(m_nx);

	// first embedding the sides
	int index = 0;
Pierre Kraemer's avatar
Pierre Kraemer committed
977
	for (unsigned int k = 0; k <= m_nz; ++k)
Pierre Kraemer's avatar
Pierre Kraemer committed
978
979
	{
		float z = float(k)*dz - sz/2.0f;
Pierre Kraemer's avatar
Pierre Kraemer committed
980
		for (unsigned int i = 0; i < m_nx; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
981
982
983
984
985
		{
			float x = float(i)*dx - sx/2.0f;
			VEC3 pos(x, -sy/2.0f, z);
			unsigned int em = m_positions.insert(pos);
			Dart d = m_tableVertDarts[index++];
Pierre Kraemer's avatar
Pierre Kraemer committed
986
			m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
987
		}
Pierre Kraemer's avatar
Pierre Kraemer committed
988
		for (unsigned int i = 0; i < m_ny; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
989
990
991
992
993
		{
			float y = float(i)*dy - sy/2.0f;
			VEC3 pos(sx/2.0f, y, z);
			unsigned int em = m_positions.insert(pos);
			Dart d = m_tableVertDarts[index++];
Pierre Kraemer's avatar
Pierre Kraemer committed
994
			m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
995
		}
Pierre Kraemer's avatar
Pierre Kraemer committed
996
		for (unsigned int i = 0; i < m_nx; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
997
998
999
1000
1001
		{
			float x = sx/2.0f-float(i)*dx;
			VEC3 pos(x, sy/2.0f, z);
			unsigned int em = m_positions.insert(pos);
			Dart d = m_tableVertDarts[index++];
Pierre Kraemer's avatar
Pierre Kraemer committed
1002
			m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
1003
		}
Pierre Kraemer's avatar
Pierre Kraemer committed
1004
		for (unsigned int i = 0; i < m_ny ;++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
1005
1006
1007
1008
1009
		{
			float y = sy/2.0f - float(i)*dy;
			VEC3 pos(-sx/2.0f, y, z);
			unsigned int em = m_positions.insert(pos);
			Dart d = m_tableVertDarts[index++];
Pierre Kraemer's avatar
Pierre Kraemer committed
1010
			m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
1011
1012
1013
1014
		}
	}

	// the top
Pierre Kraemer's avatar
Pierre Kraemer committed
1015
	for(unsigned int i = 1; i  <m_ny; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
1016
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
1017
		for(unsigned int j = 1; j < m_nx; ++j)
Pierre Kraemer's avatar
Pierre Kraemer committed
1018
1019
1020
1021
		{
			VEC3 pos(-sx/2.0f+float(j)*dx, -sy/2.0f+float(i)*dy, sz/2.0f);
			unsigned int em = m_positions.insert(pos);
			Dart d = m_tableVertDarts[index++];
Pierre Kraemer's avatar
Pierre Kraemer committed
1022
			m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
1023
1024
1025
1026
		}
	}

	// the bottom
Pierre Kraemer's avatar
Pierre Kraemer committed
1027
	for(unsigned int i = 1; i < m_ny; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
1028
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
1029
		for(unsigned int j = 1; j < m_nx; ++j)
Pierre Kraemer's avatar
Pierre Kraemer committed
1030
1031
1032
1033
		{
			VEC3 pos(-sx/2.0f+float(j)*dx, sy/2.0f-float(i)*dy, -sz/2.0f);
			unsigned int em = m_positions.insert(pos);
			Dart d = m_tableVertDarts[index++];
Pierre Kraemer's avatar
Pierre Kraemer committed
1034
			m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
1035
1036
1037
1038
1039
1040
1041
1042
1043
		}
	}
}

template <typename PFP>
void Polyhedron<PFP>::computeCenter()
{
	typename PFP::VEC3 center(0);

Pierre Kraemer's avatar
Pierre Kraemer committed
1044
	for(typename std::vector<Dart>::iterator di = m_tableVertDarts.begin(); di != m_tableVertDarts.end(); ++di)
Pierre Kraemer's avatar
Pierre Kraemer committed
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
	{
		center += m_positions[*di];
	}

	m_center = center / typename PFP::REAL(m_tableVertDarts.size());
}

template <typename PFP>
//void Polyhedron<PFP>::transform(float* matrice)
void Polyhedron<PFP>::transform(const Geom::Matrix44f& matrice)
{
//	Geom::Vec4f v1(matrice[0],matrice[4],matrice[8], matrice[12]);
//	Geom::Vec4f v2(matrice[1],matrice[5],matrice[9], matrice[13]);
//	Geom::Vec4f v3(matrice[2],matrice[6],matrice[10],matrice[14]);
//	Geom::Vec4f v4(matrice[3],matrice[7],matrice[11],matrice[15]);

Pierre Kraemer's avatar
Pierre Kraemer committed
1061
	for(typename std::vector<Dart>::iterator di = m_tableVertDarts.begin(); di != m_tableVertDarts.end(); ++di)
Pierre Kraemer's avatar
Pierre Kraemer committed
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
	{

		typename PFP::VEC3& pos = m_positions[*di];
//
//		Geom::Vec4f VA(pos[0],pos[1],pos[2],1.0f);
//
//		Geom::Vec4f VB((VA*v1),(VA*v2),(VA*v3),(VA*v4));
//		VEC3 newPos(VB[0]/VB[3],VB[1]/VB[3],VB[2]/VB[3]);
		
		pos = Geom::transform(pos, matrice);
	}
	// transform the center
	m_center = Geom::transform(m_center, matrice);

}

template <typename PFP>
Sylvain Thery's avatar
Sylvain Thery committed
1079
void Polyhedron<PFP>::mark(CellMarker& m)
Pierre Kraemer's avatar
Pierre Kraemer committed
1080
{
Pierre Kraemer's avatar
Pierre Kraemer committed
1081
	for(typename std::vector<Dart>::iterator di = m_tableVertDarts.begin(); di != m_tableVertDarts.end(); ++di)
Pierre Kraemer's avatar
Pierre Kraemer committed
1082
	{
Sylvain Thery's avatar
Sylvain Thery committed
1083
		m.mark(*di);
Pierre Kraemer's avatar
Pierre Kraemer committed
1084
1085
1086
	}
}

Pierre Kraemer's avatar
Pierre Kraemer committed
1087
1088
1089
1090
1091
1092
1093
1094
1095
//template <typename PFP>
//void Polyhedron<PFP>::markEmbVertices(Mark m)
//{
//	AttributeHandler<Mark> markers(VERTEX << 24, m_map);
//	for(typename std::vector<Dart>::iterator di = m_tableVertDarts.begin(); di != m_tableVertDarts.end(); ++di)
//	{
//		markers[*di].setMark(m);
//	}
//}
Pierre Kraemer's avatar
Pierre Kraemer committed
1096
1097

template <typename PFP>
Pierre Kraemer's avatar
Pierre Kraemer committed
1098
void Polyhedron<PFP>::embedTwistedStrip(float radius_min,  float radius_max, float turns)
Pierre Kraemer's avatar
Pierre Kraemer committed
1099
1100
1101
1102
1103
1104
1105
1106
1107
{
	typedef typename PFP::VEC3 VEC3 ;

	float alpha = float(2.0*M_PI/m_ny);
	float beta = turns/float(m_ny);

	float radius = (radius_max + radius_min)/2.0f;
	float rdiff = (radius_max - radius_min)/2.0f;

Pierre Kraemer's avatar
Pierre Kraemer committed
1108
	for(unsigned int i = 0; i <= m_ny; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
1109
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
1110
		for(unsigned int j = 0; j <= m_nx; ++j)
Pierre Kraemer's avatar
Pierre Kraemer committed
1111
1112
1113
1114
1115
1116
		{
			float rw = -rdiff + float(j)*2.0f*rdiff/float(m_nx);
			float r = radius + rw*cos(beta*float(i));
			VEC3 pos(r*cos(alpha*float(i)), r*sin(alpha*float(i)), rw*sin(beta*float(i)));
			unsigned int em = m_positions.insert(pos);
			Dart d = m_tableVertDarts[i*(m_nx+1)+j];
Pierre Kraemer's avatar
Pierre Kraemer committed
1117
			m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
1118
1119
1120
1121
1122
		}
	}
}

template <typename PFP>
Pierre Kraemer's avatar
Pierre Kraemer committed
1123
void Polyhedron<PFP>::embedHelicoid(float radius_min, float radius_max, float maxHeight, float nbTurn, int orient)
Pierre Kraemer's avatar
Pierre Kraemer committed
1124
1125
1126
1127
1128
1129
1130
1131
1132
{
	typedef typename PFP::VEC3 VEC3 ;

	float alpha = float(2.0*M_PI/m_nx)*nbTurn;
	float hS = maxHeight/m_nx;

// 	float radius = (radius_max + radius_min)/2.0f;
// 	float rdiff = (radius_max - radius_min)/2.0f;

Pierre Kraemer's avatar
Pierre Kraemer committed
1133
	for(unsigned int i = 0; i <= m_ny; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
1134
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
1135
		for(unsigned int j = 0; j <= m_nx; ++j)
Pierre Kraemer's avatar
Pierre Kraemer committed
1136
1137
1138
		{
// 			float r = radius_max + radius_min*cos(beta*float(j));
			float r,x,y;
Thomas's avatar
Thomas committed
1139
1140
1141
1142
// 			if(i==1) {
// 				r = radius_max;
// 			}
// 			else {
Pierre Kraemer's avatar
Pierre Kraemer committed
1143
				r = radius_min+(radius_max-radius_min)*float(i)/float(m_ny);
Thomas's avatar
Thomas committed
1144
1145
1146
// 			}
			x = orient*r*sin(alpha*float(j));
			y = orient*r*cos(alpha*float(j));
Pierre Kraemer's avatar
Pierre Kraemer committed
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173

			VEC3 pos(x, y, j*hS);
			Dart d = m_tableVertDarts[i*(m_nx+1)+j];
			m_positions[d]=pos;
		}
	}
}

// template <typename PFP>
// void onlyTriangles(typename PFP::MAP& the_map, Dart primd)
// {
// 	DartMarker m(the_map);
// 
// 	// list of faces to process and processed(before pos iterator)
// 	std::list<Dart> ld;
// 	ld.push_back(primd);
// 	// current position in list
// 	typename std::list<Dart>::iterator pos = ld.begin();
// 	do
// 	{
// 		Dart d = *pos;
// 		
// 		// cut the face of first dart of list
// 		Dart d1 = the_map.phi1(d);
// 		Dart e = the_map.phi1(d1);
// 		Dart e1 = the_map.phi1(e);
// 		Dart f = the_map.phi1(e1);
1174
// 		m.markOrbit(FACE, d);
Pierre Kraemer's avatar
Pierre Kraemer committed
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
// 		if (f==d) // quad
// 		{
// 			Dart n = the_map.cutFace(d,e);
// 			Dart nn = the_map.phi2(n);
// 			// mark the face
// 			m.mark(n);
// 			m.mark(nn);
// 		}
// 
// 		// and store neighbours faces in the list
// 		d = the_map.phi2(d);
// 		e = the_map.phi2(e);
// 		d1 = the_map.phi1(the_map.phi2(d1));
// 		e1 = the_map.phi1(the_map.phi2(e1));
// 
// 		if (!m.isMarked(d))
// 			ld.push_back(d);
// 		if (!m.isMarked(e))
// 			ld.push_back(e);
// 		if (!m.isMarked(d1))
// 			ld.push_back(d1);
// 		if ((f==d) && (!m.isMarked(e1)))
// 			ld.push_back(e1);
// 		pos++;
// 	}while (pos!=ld.end()); // stop when no more face to process
// }

// template <typename PFP>
// Dart triangleFan_topo(typename PFP::MAP& the_map, int n)
// {
1205
// 	Dart d = the_map.newFace(3,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
1206
1207
1208
// 	Dart e = the_map.phi1(d);
// 	for(int i=1;i<n;++i)
// 	{
1209
// 		Dart f = the_map.newFace(3,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
1210
1211
1212
1213
1214
1215
1216
// 		the_map.sewFaces(the_map.phi_1(f),e);
// 		e = the_map.phi1(f);
// 	}
// 	the_map.sewFaces(the_map.phi_1(d),e);
// 	return d;
// }

Pierre Kraemer's avatar
Pierre Kraemer committed
1217
} // namespace Modelisation
Pierre Kraemer's avatar
Pierre Kraemer committed
1218

Pierre Kraemer's avatar
Pierre Kraemer committed
1219
} // namespace Algo
Pierre Kraemer's avatar
Pierre Kraemer committed
1220

Pierre Kraemer's avatar
Pierre Kraemer committed
1221
} // namespace CGoGN