subdivision3.hpp 37.2 KB
Newer Older
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           *
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/                                         *
21
22
23
24
25
26
* Contact information: cgogn@unistra.fr                                        *
*                                                                              *
*******************************************************************************/

#include "Algo/Geometry/centroid.h"
#include "Algo/Modelisation/subdivision.h"
27
#include "Algo/Modelisation/extrusion.h"
28
29
30
31
32
33
34

namespace CGoGN
{

namespace Algo
{

untereiner's avatar
untereiner committed
35
namespace IHM
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
{

template <typename PFP>
void subdivideEdge(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position)
{
	assert(map.getDartLevel(d) <= map.getCurrentLevel() || !"Access to a dart introduced after current level") ;
	assert(!map.edgeIsSubdivided(d) || !"Trying to subdivide an already subdivided edge") ;

	unsigned int eLevel = map.edgeLevel(d) ;

	unsigned int cur = map.getCurrentLevel() ;
	map.setCurrentLevel(eLevel) ;

	Dart dd = map.phi2(d) ;
	typename PFP::VEC3 p1 = position[d] ;
	typename PFP::VEC3 p2 = position[map.phi1(d)] ;

	map.setCurrentLevel(eLevel + 1) ;

	map.cutEdge(d) ;
	unsigned int eId = map.getEdgeId(d) ;
57
58
	map.setEdgeId(map.phi1(d), eId, EDGE) ; //mise a jour de l'id d'arrete sur chaque moitie d'arete
	map.setEdgeId(map.phi1(dd), eId, EDGE) ;
59

60

61
62
	map.setFaceId(EDGE, d) ; //mise a jour de l'id de face sur chaque brin de chaque moitie d'arete
	map.setFaceId(EDGE, dd) ;
63
64
65

	position[map.phi1(d)] = (p1 + p2) * typename PFP::REAL(0.5) ;

66

67
68
69
70
	map.setCurrentLevel(cur) ;
}

template <typename PFP>
71
void subdivideFace(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position, SubdivideType sType)
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
{
	assert(map.getDartLevel(d) <= map.getCurrentLevel() || !"Access to a dart introduced after current level") ;
	assert(!map.faceIsSubdivided(d) || !"Trying to subdivide an already subdivided face") ;

	unsigned int fLevel = map.faceLevel(d) ;
	Dart old = map.faceOldestDart(d) ;

	unsigned int cur = map.getCurrentLevel() ;
	map.setCurrentLevel(fLevel) ;		// go to the level of the face to subdivide its edges

	unsigned int degree = 0 ;
	typename PFP::VEC3 p ;
	Dart it = old ;
	do
	{
		++degree;
		p += position[it] ;
		if(!map.edgeIsSubdivided(it))							// first cut the edges (if they are not already)
untereiner's avatar
untereiner committed
90
			Algo::IHM::subdivideEdge<PFP>(map, it, position) ;	// and compute the degree of the face
91
92
93
94
95
96
		it = map.phi1(it) ;
	} while(it != old) ;
	p /= typename PFP::REAL(degree) ;

	map.setCurrentLevel(fLevel + 1) ;			// go to the next level to perform face subdivision

97
	Dart res;
98

99
	if(degree == 3 && sType == Algo::IHM::S_TRI)	//subdiviser une face triangulaire
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
	{
		Dart dd = map.phi1(old) ;
		Dart e = map.phi1(map.phi1(dd)) ;
		map.splitFace(dd, e) ;					// insert a new edge
		unsigned int id = map.getNewEdgeId() ;
		map.setEdgeId(map.phi_1(dd), id, EDGE) ;		// set the edge id of the inserted edge to the next available id

		unsigned int idface = map.getFaceId(old);
		map.setFaceId(dd, idface, FACE) ;
		map.setFaceId(e, idface, FACE) ;

		dd = e ;
		e = map.phi1(map.phi1(dd)) ;
		map.splitFace(dd, e) ;
		id = map.getNewEdgeId() ;
		map.setEdgeId(map.phi_1(dd), id, EDGE) ;

		map.setFaceId(dd, idface, FACE) ;
		map.setFaceId(e, idface, FACE) ;

		dd = e ;
		e = map.phi1(map.phi1(dd)) ;
		map.splitFace(dd, e) ;
		id = map.getNewEdgeId() ;
		map.setEdgeId(map.phi_1(dd), id, EDGE) ;

		map.setFaceId(dd, idface, FACE) ;
		map.setFaceId(e, idface, FACE) ;
	}
	else
	{
131
132
133
134
135
		Dart dd = map.phi1(old) ;
		map.splitFace(dd, map.phi1(map.phi1(dd))) ;

		Dart ne = map.phi2(map.phi_1(dd));
		Dart ne2 = map.phi2(ne);
136

137
138
		map.cutEdge(ne) ;
		unsigned int id = map.getNewEdgeId() ;
139
		map.setEdgeId(ne, id, EDGE) ;
140
		id = map.getNewEdgeId() ;
141
		map.setEdgeId(ne2, id, EDGE) ;
142

143
		position[map.phi2(ne)] = p ;
144

145
146
147
148
149
150
		dd = map.phi1(map.phi1(map.phi1(map.phi1(ne)))) ;
		while(dd != ne)
		{
			Dart next = map.phi1(map.phi1(dd)) ;
			map.splitFace(map.phi1(ne), dd) ;
			Dart nne = map.phi2(map.phi_1(dd)) ;
151

152
			id = map.getNewEdgeId() ;
153
			map.setEdgeId(nne, id, EDGE) ;
154
155
156
157
158

			dd = next ;
		}

		unsigned int idface = map.getFaceId(old);
159
		//Dart e = dd;
160
161
		do
		{
162
163
			map.setFaceId(dd, idface, DART) ;
			map.setFaceId(map.phi2(dd), idface, DART) ;
164
165
166
			dd = map.phi2(map.phi1(dd));
		}
		while(dd != ne);
167
	}
168
169

	map.setCurrentLevel(cur) ;
170
171
172
}

template <typename PFP>
173
Dart subdivideVolumeGen(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position)
174
175
176
177
{
	assert(map.getDartLevel(d) <= map.getCurrentLevel() || !"Access to a dart introduced after current level") ;
	assert(!map.volumeIsSubdivided(d) || !"Trying to subdivide an already subdivided volume") ;

untereiner's avatar
ihm3    
untereiner committed
178
179
	unsigned int vLevel = map.volumeLevel(d);
	Dart old = map.volumeOldestDart(d);
180

untereiner's avatar
ihm3    
untereiner committed
181
182
	unsigned int cur = map.getCurrentLevel();
	map.setCurrentLevel(vLevel);
183
184

	/*
185
	 * au niveau du volume courant i
186
	 * stockage d'un brin de chaque face de celui-ci
187
	 * avec calcul du centroid
188
189
	 */

190
	DartMarkerStore mf(map);		// Lock a face marker to save one dart per face
untereiner's avatar
untereiner committed
191
	CellMarker mv(map, VERTEX);
192
193
194

	typename PFP::VEC3 volCenter;
	unsigned count = 0 ;
195
196
197

	//Store faces that are traversed and start with the face of d
	std::vector<Dart> visitedFaces;
198
	visitedFaces.reserve(512);
199
200
201
202
	visitedFaces.push_back(old);

	//Store the edges before the cutEdge
	std::vector<Dart> oldEdges;
203
	oldEdges.reserve(512);
204

205
	mf.markOrbit(FACE, old) ;
206

207
208
209
	for(std::vector<Dart>::iterator face = visitedFaces.begin(); face != visitedFaces.end(); ++face)
	{
		Dart e = *face ;
210
		do
211
		{
untereiner's avatar
untereiner committed
212
			//add one old edge per vertex to the old edge list
213
214
215
			//compute volume centroid
			if(!mv.isMarked(e))
			{
untereiner's avatar
untereiner committed
216
				mv.mark(e);
217
218
219
220
				volCenter += position[e];
				++count;
				oldEdges.push_back(e);
			}
untereiner's avatar
untereiner committed
221

untereiner's avatar
untereiner committed
222
			// add all face neighbours to the table
223
224
225
226
			Dart ee = map.phi2(e) ;
			if(!mf.isMarked(ee)) // not already marked
			{
				visitedFaces.push_back(ee) ;
227
				mf.markOrbit(FACE, ee) ;
228
			}
229

230
231
232
233
			e = map.phi1(e) ;
		} while(e != *face) ;
	}

234
235
	volCenter /= typename PFP::REAL(count) ;

untereiner's avatar
untereiner committed
236
	/*
237
	 * Subdivision
untereiner's avatar
untereiner committed
238
239
	 */
	//Store the darts from quadrangulated faces
240
241
242
243
244
245
	std::vector<std::pair<Dart,Dart> > subdividedfacesQ;
	subdividedfacesQ.reserve(25);

	std::vector<std::pair<Dart,Dart> > subdividedfacesT;
	subdividedfacesT.reserve(25);

246
247
248
249
250
251
252

	//First step : subdivide edges and faces
	//creates a i+1 edge level and i+1 face level
	for (std::vector<Dart>::iterator face = visitedFaces.begin(); face != visitedFaces.end(); ++face)
	{
		Dart d = *face;

253
		//if needed subdivide face
untereiner's avatar
untereiner committed
254
		if(!map.faceIsSubdivided(d))
untereiner's avatar
untereiner committed
255
			Algo::IHM::subdivideFace<PFP>(map, d, position);
256

257

258
259
		//save a dart from the subdivided face
		unsigned int cur = map.getCurrentLevel() ;
untereiner's avatar
untereiner committed
260

261
		unsigned int fLevel = map.faceLevel(d) + 1; //puisque dans tous les cas, la face est subdivisee
262
		map.setCurrentLevel(fLevel) ;
untereiner's avatar
untereiner committed
263

untereiner's avatar
untereiner committed
264

265
266
267

		//test si la face est triangulaire ou non
		if(map.phi1(map.phi1(map.phi1(d))) == d)
268
		{
untereiner's avatar
untereiner committed
269
			//std::cout << "trian" << std::endl;
270
271
272
273
274
275
276
277
278
279
			Dart cf = map.phi2(map.phi1(d));
			Dart e = cf;
			do
			{
				subdividedfacesT.push_back(std::pair<Dart,Dart>(e,map.phi2(e)));
				e = map.phi1(e);
			}while (e != cf);
		}
		else
		{
untereiner's avatar
untereiner committed
280
			//std::cout << "quad" << std::endl;
281
282
283
284
285
286
287
288
289
290
			Dart cf = map.phi1(d);
			Dart e = cf;
			do
			{
				subdividedfacesQ.push_back(std::pair<Dart,Dart>(e,map.phi2(e)));
				e = map.phi2(map.phi1(e));
			}while (e != cf);


		}
untereiner's avatar
untereiner committed
291

292
293
		map.setCurrentLevel(cur);
	}
untereiner's avatar
untereiner committed
294

295
	map.setCurrentLevel(vLevel + 1) ; // go to the next level to perform volume subdivision
untereiner's avatar
untereiner committed
296

297
	std::vector<Dart> newEdges;	//save darts from inner edges
untereiner's avatar
untereiner committed
298
	newEdges.reserve(50);
299

untereiner's avatar
untereiner committed
300
301
302
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
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
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
487
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
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
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
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
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
	//Second step : deconnect each corner, close each hole, subdivide each new face into 3
	for (std::vector<Dart>::iterator edge = oldEdges.begin(); edge != oldEdges.end(); ++edge)
	{
		//std::vector<Dart>::iterator edge = oldEdges.begin();
		Dart e = *edge;

		Dart f1 = map.phi1(*edge);
		//Dart f2 = map.phi2(f1);

		do
		{
			if(map.phi1(map.phi1(map.phi1(e))) != e)
			{
				map.unsewFaces(map.phi1(map.phi1(e))); //remplacer par une boucle qui découd toute la face et non juste une face carre (jusqu'a phi_1(e))
			}

			map.unsewFaces(map.phi1(e));


			e = map.phi2(map.phi_1(e));
		}
		while(e != *edge);

		map.closeHole(f1);

		//degree du sommet exterieur
		unsigned int cornerDegree = map.Map2::vertexDegree(*edge);

		//tourner autour du sommet pour connaitre le brin d'un sommet de valence < cornerDegree
		bool found = false;
		Dart stop = e;
		do
		{

			if(map.Map2::vertexDegree(map.phi2(map.phi1(e))) < cornerDegree)
			{
				stop = map.phi2(map.phi1(e));
				found = true;
			}

			e = map.phi2(map.phi_1(e));
		}
		while(!found && e != *edge);

		//si il existe un sommet de degre inferieur au degree du coin
		if(found)
		{
			//chercher le brin de faible degree suivant
			bool found2 = false;
			Dart dd = map.phi1(stop);

			do
			{
				if(map.Map2::vertexDegree(dd) < cornerDegree)
					found2 = true;
				else
					dd = map.phi1(dd);
			}
			while(!found2);

			//cas de la pyramide
			if(dd == stop)
			{
				//std::cout << "pyramide" << std::endl;
				map.splitFace(dd, map.phi1(map.phi1(dd)));
			}
			else
			{
				map.splitFace(dd, stop);

				//calcul de la taille des faces de chaque cote de stop
				if(!( (map.Map2::faceDegree(map.phi_1(stop)) == 3 && map.Map2::faceDegree(map.phi2(map.phi_1(stop))) == 4) ||
						(map.Map2::faceDegree(map.phi_1(stop)) == 4 && map.Map2::faceDegree(map.phi2(map.phi_1(stop))) == 3) ))
				{
					//std::cout << "octaedre ou hexaedre" << std::endl;

					Dart ne = map.phi_1(stop) ;
					map.cutEdge(ne);
					position[map.phi1(ne)] = volCenter;
					stop = map.phi2(map.phi1(ne));

					bool finished = false;
					Dart it = map.phi2(ne);

					do
					{
						//chercher le brin de faible degree suivant
						bool found2 = false;
						Dart dd = map.phi1(it);

						do
						{
							if(dd == stop)
								finished = true;
							else if(map.Map2::vertexDegree(dd) < cornerDegree)
								found2 = true;
							else
								dd = map.phi1(dd);
						}
						while(!found2 & !finished);

						if(found2)
						{
							map.splitFace(it,dd);
						}

						it = map.phi_1(dd);

						if(it == stop)
							finished = true;

					}
					while(!finished);

				}
				else
				{
					//std::cout << "prisme" << std::endl;
					//tester si besoin de fermer f2 (par exemple pas besoin pour hexa... mais pour tet, octa, prisme oui)
					//map.closeHole(f2);
				}

			}

		}
		//sinon cas du tetraedre
		else
		{
			//std::cout << "tetraedre" << std::endl;
			//tester si besoin de fermer f2 (par exemple pas besoin pour hexa... mais pour tet, octa, prisme oui)
			//map.closeHole(f2);
		}

	}

	//std::cout << "1ere etape finished" << std::endl;

	CellMarker mtf(map, FACE);

	//Etape 2
	for (std::vector<std::pair<Dart,Dart> >::iterator edges = subdividedfacesT.begin(); edges != subdividedfacesT.end(); ++edges)
	{
		Dart f1 = (*edges).first;
		Dart f2 = (*edges).second;

//Fonction isTetrahedron ??
//		//if(Algo::Modelisation::Tetrahedron::isTetrahedron<PFP>(map,f2))
		if(  (map.Map2::faceDegree(f2) == 3 && map.Map2::faceDegree(map.phi2(f2)) == 3 &&
				map.Map2::faceDegree(map.phi2(map.phi_1(f2))) == 3) && map.Map2::vertexDegree(f2) == 3)
		{ //cas du tetrahedre

			//std::cout << "ajout d'une face" << std::endl;

			if(map.phi3(map.phi2(f2)) == map.phi2(f2))
			{
				Dart nf = map.newFace(3);
				map.sewVolumes(map.phi2(f2),nf);
			}

			if(map.phi2(map.phi3(map.phi2(f2))) == map.phi3(map.phi2(f2)))
			{
				map.sewFaces(map.phi3(map.phi2(f2)), f1);
			}
		}
		else
		{
			if(!mtf.isMarked(f1))
			{
				mtf.mark(f1);

				map.closeHole(f1);

				if(map.Map2::faceDegree(map.phi2(f2)) == 3)
				{
					//std::cout << "ajout d'un tetraedre" << std::endl;
					Dart x = Algo::Modelisation::trianguleFace<PFP>(map, map.phi2(f1));
					position[x] = volCenter;
				}
				else
				{
					//std::cout << "ajout d'un prisme" << std::endl;
					//Dart x = Algo::Modelisation::extrudeFace<PFP>(map,position,map.phi2(f1),5.0);
					Dart c = Algo::Modelisation::trianguleFace<PFP>(map, map.phi2(f1));

					Dart cc = c;
					// cut edges
					do
					{

						typename PFP::VEC3 p1 = position[cc] ;
						typename PFP::VEC3 p2 = position[map.phi1(cc)] ;

						map.cutEdge(cc);

						position[map.phi1(cc)] = (p1 + p2) * typename PFP::REAL(0.5) ;

						cc = map.phi2(map.phi_1(cc));
					}while (cc != c);

					// cut faces
					do
					{
						Dart d1 = map.phi1(cc);
						Dart d2 = map.phi_1(cc);
						map.splitFace(d1,d2);
						cc = map.phi2(map.phi_1(cc));//map.Map2::alpha1(cc);
					}while (cc != c);

					//merge central faces by removing edges
					bool notFinished=true;
					do
					{
						Dart d1 = map.Map2::alpha1(cc);
						if (d1 == cc)			// last edge is pending edge inside of face
							notFinished = false;
						map.deleteFace(cc);
						cc = d1;
					} while (notFinished);


					map.closeHole(map.phi1(map.phi1(map.phi2(f1))));

				}
			}
		}

	}

	//std::cout << "2e etape finished" << std::endl;


	{
		//Third step : 3-sew internal faces
		for (std::vector<std::pair<Dart,Dart> >::iterator it = subdividedfacesT.begin(); it != subdividedfacesT.end(); ++it)
		{
			Dart f1 = (*it).first;
			Dart f2 = (*it).second;



			if(map.phi3(map.phi2(f1)) == map.phi2(f1) && map.phi3(map.phi2(f2)) == map.phi2(f2))
			{
				if(map.getEmbedding(VERTEX, map.phi_1(map.phi2(f2))) == map.getEmbedding(VERTEX, map.phi_1(map.phi2(f1))))
				{
					map.Map3::sewVolumes(map.phi2(f2), map.phi2(f1));
				}
				else
				{

				//id pour toutes les faces interieures
				map.sewVolumes(map.phi2(f2), map.phi2(f1));


				}

				//Fais a la couture !!!!!
				unsigned int idface = map.getNewFaceId();
				map.setFaceId(map.phi2(f1),idface, FACE);
			}


			//FAIS a la couture !!!!!!!
			//id pour toutes les aretes exterieurs des faces quadrangulees
			unsigned int idedge = map.getEdgeId(f1);
			map.setEdgeId(map.phi2(f1), idedge, DART);
			map.setEdgeId( map.phi2(f2), idedge, DART);

		}

		//LA copie de L'id est a gerer avec le sewVolumes normalement !!!!!!
		//id pour les aretes interieurs : (i.e. 16 pour un octa)
		DartMarker mne(map);
		for(std::vector<Dart>::iterator it = newEdges.begin() ; it != newEdges.end() ; ++it)
		{
			if(!mne.isMarked(*it))
			{
				unsigned int idedge = map.getNewEdgeId();
				map.setEdgeId(*it, idedge, EDGE);
				mne.markOrbit(EDGE,*it);
			}
		}
	}

	{
		//Third step : 3-sew internal faces
		for (std::vector<std::pair<Dart,Dart> >::iterator it = subdividedfacesQ.begin(); it != subdividedfacesQ.end(); ++it)
		{
			Dart f1 = (*it).first;
			Dart f2 = (*it).second;

			if(map.phi3(map.phi2(f1)) == map.phi2(f1) && map.phi3(map.phi2(f2)) == map.phi2(f2))
			{
				//id pour toutes les faces interieures
				map.sewVolumes(map.phi2(f2), map.phi2(f1));

				//Fais a la couture !!!!!
				unsigned int idface = map.getNewFaceId();
				map.setFaceId(map.phi2(f1),idface, FACE);
			}

			//FAIS a la couture !!!!!!!
			//id pour toutes les aretes exterieurs des faces quadrangulees
			unsigned int idedge = map.getEdgeId(f1);
			map.setEdgeId(map.phi2(f1), idedge, DART);
			map.setEdgeId( map.phi2(f2), idedge, DART);
		}
		//LA copie de L'id est a gerer avec le sewVolumes normalement !!!!!!
		//id pour les aretes interieurs : (i.e. 16 pour un octa)
		DartMarker mne(map);
		for(std::vector<Dart>::iterator it = newEdges.begin() ; it != newEdges.end() ; ++it)
		{
			if(!mne.isMarked(*it))
			{
				unsigned int idedge = map.getNewEdgeId();
				map.setEdgeId(*it, idedge, EDGE);
				mne.markOrbit(EDGE,*it);
			}
		}
	}


	//cas tordu pour le prisme
	for (std::vector<std::pair<Dart,Dart> >::iterator it = subdividedfacesT.begin(); it != subdividedfacesT.end(); ++it)
	{
		Dart f1 = (*it).first;
		Dart f2 = (*it).second;

		if(  !(map.Map2::faceDegree(f2) == 3 && map.Map2::faceDegree(map.phi2(f2)) == 3 &&
				map.Map2::faceDegree(map.phi2(map.phi1(f2))) == 3 && map.Map2::faceDegree(map.phi2(map.phi_1(f2))) == 3))
		{


			if(map.phi2(map.phi1(map.phi1(map.phi2(f1)))) == map.phi3(map.phi2(map.phi1(map.phi1(map.phi2(f1))))) &&
					map.phi2(map.phi3(map.phi2(map.phi3(map.phi2(map.phi3(map.phi2(map.phi2(map.phi1(map.phi1(map.phi2(f1))))))))))) ==
							map.phi3(map.phi2(map.phi3(map.phi2(map.phi3(map.phi2(map.phi3(map.phi2(map.phi2(map.phi1(map.phi1(map.phi2(f1))))))))))))
			)
			{
				map.sewVolumes(map.phi2(map.phi1(map.phi1(map.phi2(f1)))),
						map.phi2(map.phi3(map.phi2(map.phi3(map.phi2(map.phi3(map.phi1(map.phi1(map.phi2(f1))))))))));
			}

		}

	}


	map.setCurrentLevel(cur) ;

648
	return subdividedfacesQ.begin()->first;
649
}
untereiner's avatar
untereiner committed
650

untereiner's avatar
untereiner committed
651

652

653
template <typename PFP>
654
Dart subdivideVolume(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position)
655
{
untereiner's avatar
untereiner committed
656
657
	assert(map.getDartLevel(d) <= map.getCurrentLevel() || !"Access to a dart introduced after current level") ;
	assert(!map.volumeIsSubdivided(d) || !"Trying to subdivide an already subdivided volume") ;
658
	assert(!map.neighborhoodLevelDiffersByOne(d) || !"Trying to subdivide a volume with neighborhood Level difference greater than 1");
untereiner's avatar
untereiner committed
659

660
661
	unsigned int vLevel = map.volumeLevel(d);
	Dart old = map.volumeOldestDart(d);
untereiner's avatar
untereiner committed
662

663
664
	unsigned int cur = map.getCurrentLevel();
	map.setCurrentLevel(vLevel);
untereiner's avatar
untereiner committed
665

untereiner's avatar
untereiner committed
666
667
668
669
670
	/*
	 * au niveau du volume courant i
	 * stockage d'un brin de chaque face de celui-ci
	 * avec calcul du centroid
	 */
untereiner's avatar
untereiner committed
671

untereiner's avatar
untereiner committed
672
	DartMarkerStore mf(map);		// Lock a face marker to save one dart per face
673
	CellMarker mv(map, VERTEX);
untereiner's avatar
untereiner committed
674

untereiner's avatar
untereiner committed
675
676
	typename PFP::VEC3 volCenter;
	unsigned count = 0 ;
untereiner's avatar
untereiner committed
677

untereiner's avatar
untereiner committed
678
679
	//Store faces that are traversed and start with the face of d
	std::vector<Dart> visitedFaces;
680
	visitedFaces.reserve(512);
untereiner's avatar
untereiner committed
681
	visitedFaces.push_back(old);
untereiner's avatar
untereiner committed
682

untereiner's avatar
untereiner committed
683
684
685
	//Store the edges before the cutEdge
	std::vector<Dart> oldEdges;
	oldEdges.reserve(20);
untereiner's avatar
untereiner committed
686

687
	mf.markOrbit(FACE, old) ;
untereiner's avatar
untereiner committed
688

untereiner's avatar
untereiner committed
689
	for(std::vector<Dart>::iterator face = visitedFaces.begin(); face != visitedFaces.end(); ++face)
690
	{
untereiner's avatar
untereiner committed
691
692
693
694
695
696
697
		Dart e = *face ;
		do
		{
			//add one old edge per vertex to the old edge list
			//compute volume centroid
			if(!mv.isMarked(e))
			{
698
				mv.mark(e);
untereiner's avatar
untereiner committed
699
700
701
702
703
704
705
706
707
708
				volCenter += position[e];
				++count;
				oldEdges.push_back(e);
			}

			// add all face neighbours to the table
			Dart ee = map.phi2(e) ;
			if(!mf.isMarked(ee)) // not already marked
			{
				visitedFaces.push_back(ee) ;
709
				mf.markOrbit(FACE, ee) ;
untereiner's avatar
untereiner committed
710
711
712
713
			}

			e = map.phi1(e) ;
		} while(e != *face) ;
714
715
	}

716
	volCenter /= typename PFP::REAL(count) ;
717

untereiner's avatar
untereiner committed
718
719
720
721
	/*
	 * Subdivision
	 */
	//Store the darts from quadrangulated faces
722
723
	std::vector<std::pair<Dart,Dart> > subdividedfacesQ;
	subdividedfacesQ.reserve(25);
724

725
726
	std::vector<std::pair<Dart,Dart> > subdividedfacesT;
	subdividedfacesT.reserve(25);
untereiner's avatar
untereiner committed
727
728


729
730
731
732
733
	//First step : subdivide edges and faces
	//creates a i+1 edge level and i+1 face level
	for (std::vector<Dart>::iterator face = visitedFaces.begin(); face != visitedFaces.end(); ++face)
	{
		Dart d = *face;
untereiner's avatar
untereiner committed
734

735
736
737
		//if needed subdivide face
		if(!map.faceIsSubdivided(d))
			Algo::IHM::subdivideFace<PFP>(map, d, position);
untereiner's avatar
untereiner committed
738

739
740
741
742
743
744
745
746
747
748
749
750

		//save a dart from the subdivided face
		unsigned int cur = map.getCurrentLevel() ;

		unsigned int fLevel = map.faceLevel(d) + 1; //puisque dans tous les cas, la face est subdivisee
		map.setCurrentLevel(fLevel) ;



		//test si la face est triangulaire ou non
		if(map.phi1(map.phi1(map.phi1(d))) == d)
		{
751
			//std::cout << "trian" << std::endl;
untereiner's avatar
untereiner committed
752
753
754
755
			Dart cf = map.phi2(map.phi1(d));
			Dart e = cf;
			do
			{
756
				subdividedfacesT.push_back(std::pair<Dart,Dart>(e,map.phi2(e)));
untereiner's avatar
untereiner committed
757
758
				e = map.phi1(e);
			}while (e != cf);
759
760
761
		}
		else
		{
762
			//std::cout << "quad" << std::endl;
763
764
765
766
767
768
769
770
			Dart cf = map.phi1(d);
			Dart e = cf;
			do
			{
				subdividedfacesQ.push_back(std::pair<Dart,Dart>(e,map.phi2(e)));
				e = map.phi2(map.phi1(e));
			}while (e != cf);

untereiner's avatar
untereiner committed
771
772
773

		}

774
		map.setCurrentLevel(cur);
untereiner's avatar
untereiner committed
775

776
	}
untereiner's avatar
untereiner committed
777

778
	map.setCurrentLevel(vLevel + 1) ; // go to the next level to perform volume subdivision
untereiner's avatar
untereiner committed
779

780
781
782
783
784
785
786
787
788
789
790
791
792
793
	std::vector<Dart> newEdges;	//save darts from inner edges
	newEdges.reserve(50);

	bool istet = true;

	//Second step : deconnect each corner, close each hole, subdivide each new face into 3
	for (std::vector<Dart>::iterator edge = oldEdges.begin(); edge != oldEdges.end(); ++edge)
	{
		Dart e = *edge;

		Dart f1 = map.phi1(*edge);
		Dart f2 = map.phi2(f1);

		do
untereiner's avatar
untereiner committed
794
		{
795
796
797
798
799
800
801
802
803
804
805
806
			if(map.phi1(map.phi1(map.phi1(e))) != e)
				map.unsewFaces(map.phi1(map.phi1(e)));

			map.unsewFaces(map.phi1(e));


			e = map.phi2(map.phi_1(e));
		}
		while(e != *edge);

		map.closeHole(f1);

untereiner's avatar
untereiner committed
807

808
		//fonction qui calcule le degree max des faces atour d'un sommet
809
810
811
812
813
814
815
816
		unsigned int fdeg = map.faceDegree(map.phi2(f1));


		if(fdeg > 4)
		{
			Dart old = map.phi2(map.phi1(e));
			Dart dd = map.phi1(map.phi1(old)) ;
			map.splitFace(old,dd) ;
untereiner's avatar
untereiner committed
817

818
819
820
821
822
823
824
825
826
827
			Dart ne = map.phi1(map.phi1(old)) ;

			map.cutEdge(ne);
			position[map.phi1(ne)] = volCenter; //plonger a la fin de la boucle ????
			newEdges.push_back(ne);
			newEdges.push_back(map.phi1(ne));


			Dart stop = map.phi2(map.phi1(ne));
			ne = map.phi2(ne);
untereiner's avatar
untereiner committed
828
829
			do
			{
830
				dd = map.phi1(map.phi1(map.phi1(ne)));
untereiner's avatar
untereiner committed
831

832
833
				//A Verifier !!
				map.splitFace(ne, dd) ;
untereiner's avatar
untereiner committed
834

835
				newEdges.push_back(map.phi1(dd));
untereiner's avatar
untereiner committed
836

837
838
839
840
841
842
843
				ne = map.phi2(map.phi_1(ne));
				dd = map.phi1(map.phi1(dd));
			}
			while(dd != stop);
		}
		else if(fdeg > 3)
		{
untereiner's avatar
untereiner committed
844
845
846
			map.closeHole(f2);
			map.sewVolumes(map.phi2(f1),map.phi2(f2));

847
848
849
850
			istet = false;
			Dart old = map.phi2(map.phi1(*edge));
			Dart dd = map.phi1(old) ;
			map.splitFace(old,dd) ;
untereiner's avatar
untereiner committed
851

852
			Dart ne = map.phi1(old);
untereiner's avatar
untereiner committed
853

854
855
856
857
			map.cutEdge(ne);
			position[map.phi1(ne)] = volCenter; //plonger a la fin de la boucle ????
			newEdges.push_back(ne);
			newEdges.push_back(map.phi1(ne));
untereiner's avatar
untereiner committed
858

859
860
861
862
863
			Dart stop = map.phi2(map.phi1(ne));
			ne = map.phi2(ne);
			do
			{
				dd = map.phi1(map.phi1(ne));
untereiner's avatar
untereiner committed
864

865
				map.splitFace(ne, dd) ;
untereiner's avatar
untereiner committed
866

867
				newEdges.push_back(map.phi1(dd));
untereiner's avatar
untereiner committed
868

869
870
				ne = map.phi2(map.phi_1(ne));
				dd = map.phi1(dd);
untereiner's avatar
untereiner committed
871
			}
872
873
874
875
876
			while(dd != stop);
		}
		else
		{
			map.closeHole(f2);
877
			map.sewVolumes(map.phi2(f1),map.phi2(f2));
untereiner's avatar
untereiner committed
878

879
880
			unsigned int idface = map.getNewFaceId();
			map.setFaceId(map.phi2(f1),idface, FACE);
untereiner's avatar
untereiner committed
881
882
		}

883
884
885
886
887
	}

	if(!istet)
	{
		for (std::vector<Dart>::iterator edge = oldEdges.begin(); edge != oldEdges.end(); ++edge)
untereiner's avatar
untereiner committed
888
		{
889
			Dart e = *edge;
untereiner's avatar
untereiner committed
890

891
892
			Dart x = map.phi_1(map.phi2(map.phi1(*edge)));
			Dart f = x;
untereiner's avatar
untereiner committed
893

894
895
896
897
			do
			{
				Dart f3 = map.phi3(f);
				Dart tmp =  map.phi_1(map.phi2(map.phi_1(map.phi2(map.phi_1(f3)))));
untereiner's avatar
untereiner committed
898

899
900
901
				map.unsewFaces(f3);
				map.unsewFaces(tmp);
				map.sewFaces(f3, tmp);
untereiner's avatar
untereiner committed
902

903
904
				unsigned int idface = map.getNewFaceId();
				map.setFaceId(map.phi2(f3),idface, FACE);
untereiner's avatar
untereiner committed
905
906


907
908
				f = map.phi2(map.phi_1(f));
			}while(f != x);
untereiner's avatar
untereiner committed
909
910
911

		}

912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
	}

	{
	//Third step : 3-sew internal faces
	for (std::vector<std::pair<Dart,Dart> >::iterator it = subdividedfacesT.begin(); it != subdividedfacesT.end(); ++it)
	{
		Dart f1 = (*it).first;
		Dart f2 = (*it).second;

		//FAIS a la couture !!!!!!!
		//id pour toutes les aretes exterieurs des faces quadrangulees
		unsigned int idedge = map.getEdgeId(f1);
		map.setEdgeId(map.phi2(f1), idedge, DART);
		map.setEdgeId( map.phi2(f2), idedge, DART);

	}

	//LA copie de L'id est a gerer avec le sewVolumes normalement !!!!!!
	//id pour les aretes interieurs : (i.e. 16 pour un octa)
	DartMarker mne(map);
	for(std::vector<Dart>::iterator it = newEdges.begin() ; it != newEdges.end() ; ++it)
	{
		if(!mne.isMarked(*it))
untereiner's avatar
untereiner committed
935
		{
936
937
938
939
940
941
			unsigned int idedge = map.getNewEdgeId();
			map.setEdgeId(*it, idedge, EDGE);
			mne.markOrbit(EDGE,*it);
		}
	}
	}
untereiner's avatar
untereiner committed
942

943
944
945
946
947
948
	{
	//Third step : 3-sew internal faces
	for (std::vector<std::pair<Dart,Dart> >::iterator it = subdividedfacesQ.begin(); it != subdividedfacesQ.end(); ++it)
	{
		Dart f1 = (*it).first;
		Dart f2 = (*it).second;
untereiner's avatar
untereiner committed
949

950
951
952
953
954
955
956
957
		if(map.phi3(map.phi2(f1)) == map.phi2(f1) && map.phi3(map.phi2(f2)) == map.phi2(f2))
		{
			//id pour toutes les faces interieures
			map.sewVolumes(map.phi2(f1), map.phi2(f2));

			//Fais a la couture !!!!!
			unsigned int idface = map.getNewFaceId();
			map.setFaceId(map.phi2(f1),idface, FACE);
untereiner's avatar
untereiner committed
958
959
		}

960
961
962
963
964
965
966
967
968
969
970
971
972
		//FAIS a la couture !!!!!!!
		//id pour toutes les aretes exterieurs des faces quadrangulees
		unsigned int idedge = map.getEdgeId(f1);
		map.setEdgeId(map.phi2(f1), idedge, DART);
		map.setEdgeId( map.phi2(f2), idedge, DART);
	}

	//LA copie de L'id est a gerer avec le sewVolumes normalement !!!!!!
	//id pour les aretes interieurs : (i.e. 6 pour un hexa)
	DartMarker mne(map);
	for(std::vector<Dart>::iterator it = newEdges.begin() ; it != newEdges.end() ; ++it)
	{
		if(!mne.isMarked(*it))
untereiner's avatar
untereiner committed
973
		{
974
975
976
			unsigned int idedge = map.getNewEdgeId();
			map.setEdgeId(*it, idedge, EDGE);
			mne.markOrbit(EDGE,*it);
untereiner's avatar
untereiner committed
977
		}
978
979
	}
	}
untereiner's avatar
untereiner committed
980

981
	map.setCurrentLevel(cur) ;
untereiner's avatar
untereiner committed
982

983
	return subdividedfacesQ.begin()->first;
984
985
}

untereiner's avatar
untereiner committed
986

987
template <typename PFP>
988
Dart subdivideVolumeClassic(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position)
989
990
991
992
993
994
995
996
997
998
999
1000
{
	assert(map.getDartLevel(d) <= map.getCurrentLevel() || !"Access to a dart introduced after current level") ;
	assert(!map.volumeIsSubdivided(d) || !"Trying to subdivide an already subdivided volume") ;

	unsigned int vLevel = map.volumeLevel(d);
	Dart old = map.volumeOldestDart(d);

	unsigned int cur = map.getCurrentLevel();
	map.setCurrentLevel(vLevel);


	/*