subdivision3.hpp 47 KB
Newer Older
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           *
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/                                           *
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
{

untereiner's avatar
untereiner committed
38

39
40
41
42
43
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") ;
44
	assert(!map.isBoundaryMarked(d) || !"Trying to subdivide a dart marked boundary");
45
46
47
48
49
50
51
52
53
54
55
56
57
58

	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) ;
59
60
	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) ;
61

62

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

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

68

69
70
71
72
	map.setCurrentLevel(cur) ;
}

template <typename PFP>
73
void subdivideFace(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position, SubdivideType sType)
74
75
76
{
	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") ;
77
	assert(!map.isBoundaryMarked(d) || !"Trying to subdivide a dart marked boundary");
78
79
80
81
82
83
84

	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

untereiner's avatar
untereiner committed
85

86
87
	unsigned int degree = 0 ;
	typename PFP::VEC3 p ;
untereiner's avatar
untereiner committed
88
89
90
	Traversor2FE<typename PFP::MAP>  travE(map, old);

	for(Dart it = travE.begin(); it != travE.end() ; it = travE.next())
91
92
93
	{
		++degree;
		p += position[it] ;
untereiner's avatar
untereiner committed
94

95
		if(!map.edgeIsSubdivided(it))							// first cut the edges (if they are not already)
untereiner's avatar
untereiner committed
96
			Algo::IHM::subdivideEdge<PFP>(map, it, position) ;	// and compute the degree of the face
untereiner's avatar
untereiner committed
97
	}
98
99
	p /= typename PFP::REAL(degree) ;

untereiner's avatar
untereiner committed
100

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

103
	Dart res;
104

105
	if(degree == 3 && sType == Algo::IHM::S_TRI)	//subdiviser une face triangulaire
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
	{
		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
	{
137
138
139
140
141
		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);
142

143
144
		map.cutEdge(ne) ;
		unsigned int id = map.getNewEdgeId() ;
145
		map.setEdgeId(ne, id, EDGE) ;
146
		id = map.getNewEdgeId() ;
147
		map.setEdgeId(ne2, id, EDGE) ;
148

untereiner's avatar
untereiner committed
149
		position[map.phi1(ne)] = p ;
150

151
152
153
154
155
156
		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)) ;
157

158
			id = map.getNewEdgeId() ;
159
			map.setEdgeId(nne, id, EDGE) ;
160
161
162
163
164

			dd = next ;
		}

		unsigned int idface = map.getFaceId(old);
165
		//Dart e = dd;
166
167
		do
		{
168
169
			map.setFaceId(dd, idface, DART) ;
			map.setFaceId(map.phi2(dd), idface, DART) ;
170
171
172
			dd = map.phi2(map.phi1(dd));
		}
		while(dd != ne);
173
	}
174
175

	map.setCurrentLevel(cur) ;
176
177
}

untereiner's avatar
untereiner committed
178
179
180
181
182
template <typename PFP>
Dart subdivideVolumeClassic(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.volumeIsSubdivided(d) || !"Trying to subdivide an already subdivided volume") ;
183
	assert(!map.isBoundaryMarked(d) || !"Trying to subdivide a dart marked boundary");
untereiner's avatar
untereiner committed
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214

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

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


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

	DartMarkerStore mf(map);		// Lock a face marker to save one dart per face
	DartMarkerStore mv(map);

	typename PFP::VEC3 volCenter;
	unsigned count = 0 ;

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

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

	mf.markOrbit(FACE, old) ;

215
	for(unsigned int i = 0; i < visitedFaces.size(); ++i)
untereiner's avatar
untereiner committed
216
	{
217
		Dart e = visitedFaces[i] ;
untereiner's avatar
untereiner committed
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
		do
		{
			//add one old edge per vertex to the old edge list
			//compute volume centroid
			if(!mv.isMarked(e))
			{
				mv.markOrbit(VERTEX, e);
				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) ;
				mf.markOrbit(FACE, ee) ;
			}

			e = map.phi1(e) ;
239
		} while(e != visitedFaces[i]) ;
untereiner's avatar
untereiner committed
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
278
279
280
281
282
283
284
	}

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

	/*
	 * Subdivision
	 */

	//Store the darts from quadrangulated faces
	std::vector<std::pair<Dart,Dart> > subdividedfaces;
	subdividedfaces.reserve(25);

	//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;

		//if needed subdivide face
		if(!map.faceIsSubdivided(d))
			Algo::IHM::subdivideFace<PFP>(map, d, position, Algo::IHM::S_QUAD);

		//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) ;

		//le brin est forcement du niveau cur
		Dart cf = map.phi1(d);
		Dart e = cf;
		do
		{
			subdividedfaces.push_back(std::pair<Dart,Dart>(e,map.phi2(e)));
			e = map.phi2(map.phi1(e));
		}while (e != cf);

		map.setCurrentLevel(cur);
	}

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

	std::vector<Dart> newEdges;	//save darts from inner edges
	newEdges.reserve(50);

untereiner's avatar
untereiner committed
285

untereiner's avatar
untereiner committed
286
287
288
289
	//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)
	{

untereiner's avatar
untereiner committed
290
291
292
293
		Dart e = *edge;
		std::vector<Dart> v ;

		do
untereiner's avatar
untereiner committed
294
		{
untereiner's avatar
untereiner committed
295
296
			v.push_back(map.phi1(map.phi1(e)));
			v.push_back(map.phi1(e));
untereiner's avatar
untereiner committed
297

untereiner's avatar
untereiner committed
298
299
300
			e = map.phi2(map.phi_1(e));
		}
		while(e != *edge);
untereiner's avatar
untereiner committed
301

untereiner's avatar
untereiner committed
302
		map.splitVolume(v) ;
untereiner's avatar
untereiner committed
303

untereiner's avatar
untereiner committed
304
		Dart old = map.phi2(map.phi1(*edge));
untereiner's avatar
untereiner committed
305
306
307
		Dart dd = map.phi1(map.phi1(old)) ;
		map.splitFace(old,dd) ;

308
309
310
		unsigned int idface = map.getNewFaceId();
		map.setFaceId(dd,idface, FACE);

untereiner's avatar
untereiner committed
311
312
313
314
315
316
317
		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));

318
319
320
		unsigned int id = map.getNewEdgeId() ;
		map.setEdgeId(ne, id, EDGE) ;

untereiner's avatar
untereiner committed
321
322
323
324
325
326
327
		Dart stop = map.phi2(map.phi1(ne));
		ne = map.phi2(ne);
		do
		{
			dd = map.phi1(map.phi1(map.phi1(ne)));

			map.splitFace(ne, dd) ;
328
329
			unsigned int idface = map.getNewFaceId();
			map.setFaceId(dd,idface, FACE);
untereiner's avatar
untereiner committed
330
331
332
333
334
335
336

			newEdges.push_back(map.phi1(dd));

			ne = map.phi2(map.phi_1(ne));
			dd = map.phi1(map.phi1(dd));
		}
		while(dd != stop);
untereiner's avatar
untereiner committed
337

338
339
	}

untereiner's avatar
untereiner committed
340
	map.deleteVolume(map.phi3(map.phi2(map.phi1(oldEdges.front()))));
untereiner's avatar
untereiner committed
341

untereiner's avatar
untereiner committed
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
	//Third step : 3-sew internal faces
	for (std::vector<std::pair<Dart,Dart> >::iterator it = subdividedfaces.begin(); it != subdividedfaces.end(); ++it)
	{
		Dart f1 = (*it).first;
		Dart f2 = (*it).second;

		if(map.isBoundaryFace(map.phi2(f1)) && map.isBoundaryFace(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);
		}

		//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(unsigned int i = 0; i < newEdges.size(); ++i)
	{
		if(!mne.isMarked(newEdges[i]))
		{
			unsigned int idedge = map.getNewEdgeId();
			map.setEdgeId(newEdges[i], idedge, EDGE);
			mne.markOrbit(EDGE, newEdges[i]);
		}
	}
untereiner's avatar
untereiner committed
377
378
379
380
381
382

	map.setCurrentLevel(cur) ;

	return subdividedfaces.begin()->first;
}

untereiner's avatar
untereiner committed
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
template <typename PFP>
Dart subdivideVolumeClassic2(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.volumeIsSubdivided(d) || !"Trying to subdivide an already subdivided volume") ;
	assert(!map.isBoundaryMarked(d) || !"Trying to subdivide a dart marked boundary");

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

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

	/*
	 * Compute volume centroid
	 */
	typename PFP::VEC3 volCenter =  Algo::Geometry::volumeCentroid<PFP>(map, old, position);

untereiner's avatar
untereiner committed
401
402
	Traversor3WV<typename PFP::MAP> traV(map, old);

untereiner's avatar
untereiner committed
403
404
405
	/*
	 * Subdivide Faces
	 */
406
407
	std::vector<std::pair<Dart,Dart> > subdividedFaces;
	subdividedFaces.reserve(128);
untereiner's avatar
untereiner committed
408
409
410
411
412
413
414
415

	Traversor3WF<typename PFP::MAP> traF(map, old);
	for(Dart dit = traF.begin(); dit != traF.end(); dit = traF.next())
	{
		//if needed subdivide face
		if(!map.faceIsSubdivided(dit))
			Algo::IHM::subdivideFace<PFP>(map, dit, position, Algo::IHM::S_QUAD);

416
		//save darts from the central vertex of each subdivided face
untereiner's avatar
untereiner committed
417
		unsigned int cur = map.getCurrentLevel() ;
418
419
420
		unsigned int fLevel = map.faceLevel(dit);
		map.setCurrentLevel(fLevel + 1) ;
		map.saveRelationsAroundVertex(map.phi2(map.phi1(dit)), subdividedFaces);
untereiner's avatar
untereiner committed
421
422
423
		map.setCurrentLevel(cur);
	}

424
425
426
427
	cur = map.getCurrentLevel() ;
	unsigned int fLevel = map.faceLevel(old);
	map.setCurrentLevel(fLevel + 1) ;
	map.unsewAroundVertex(subdividedFaces);
untereiner's avatar
untereiner committed
428
429
	map.setCurrentLevel(cur);

untereiner's avatar
untereiner committed
430
431
432
433
434
435
436
	/*
	 * Create inside volumes
	 */
	std::vector<Dart> newEdges;	//save darts from inner edges
	newEdges.reserve(50);
	Dart centralDart = NIL;

untereiner's avatar
untereiner committed
437
438
	//unsigned int degree = 0 ;
	//typename PFP::VEC3 volCenter ;
untereiner's avatar
untereiner committed
439

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

untereiner's avatar
untereiner committed
442
443
444
445
	for(Dart dit = traV.begin(); dit != traV.end(); dit = traV.next())
	{
		//volCenter += position[d];
		//++degree;
untereiner's avatar
untereiner committed
446

447
		centralDart = map.quadranguleFace(dit);
untereiner's avatar
untereiner committed
448
		position[centralDart] = volCenter;
untereiner's avatar
untereiner committed
449
	}
450
	//volCenter /= double(degree);
untereiner's avatar
untereiner committed
451

452
	for (std::vector<std::pair<Dart,Dart> >::iterator it = subdividedFaces.begin(); it != subdividedFaces.end(); ++it)
untereiner's avatar
untereiner committed
453
	{
454
455
		Dart f1 = map.phi2((*it).first);
		Dart f2 = map.phi2((*it).second);
untereiner's avatar
untereiner committed
456

457
		if(map.isBoundaryFace(f1) && map.isBoundaryFace(f2))
untereiner's avatar
untereiner committed
458
		{
459
460
			std::cout << "plop" << std::endl;
			map.sewVolumes(f1, f2, false);
untereiner's avatar
untereiner committed
461
462
463
		}
	}

464
465
466
	//position[centralDart] = volCenter;


untereiner's avatar
untereiner committed
467
468


untereiner's avatar
untereiner committed
469
470
471
472
473
474
//	//Third step : 3-sew internal faces
//	for (std::vector<std::pair<Dart,Dart> >::iterator it = subdividedfaces.begin(); it != subdividedfaces.end(); ++it)
//	{
//		Dart f1 = (*it).first;
//		Dart f2 = (*it).second;
//
untereiner's avatar
untereiner committed
475
//
untereiner's avatar
untereiner committed
476
477
//		if(map.isBoundaryFace(map.phi2(f1)) && map.isBoundaryFace(map.phi2(f2)))
//		{
untereiner's avatar
untereiner committed
478
//			std::cout << "boundary" << std::endl;
untereiner's avatar
untereiner committed
479
480
//			//id pour toutes les faces interieures
//			map.sewVolumes(map.phi2(f1), map.phi2(f2));
untereiner's avatar
untereiner committed
481
482
483
484
485
//			break;
////
////			//Fais a la couture !!!!!
////			unsigned int idface = map.getNewFaceId();
////			map.setFaceId(map.phi2(f1),idface, FACE);
untereiner's avatar
untereiner committed
486
//		}
untereiner's avatar
untereiner committed
487
488
489
490
491
492
////
////		//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);
untereiner's avatar
untereiner committed
493
//	}
untereiner's avatar
untereiner committed
494

untereiner's avatar
untereiner committed
495
496
497
498
499
500
501
502
503
504
505
506
//	//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(unsigned int i = 0; i < newEdges.size(); ++i)
//	{
//		if(!mne.isMarked(newEdges[i]))
//		{
//			unsigned int idedge = map.getNewEdgeId();
//			map.setEdgeId(newEdges[i], idedge, EDGE);
//			mne.markOrbit(EDGE, newEdges[i]);
//		}
//	}
untereiner's avatar
untereiner committed
507
508
509


	//plonger a la fin de la boucle ????
untereiner's avatar
untereiner committed
510
511
512

	map.setCurrentLevel(cur) ;

513
	return subdividedFaces.front().first;
untereiner's avatar
untereiner committed
514

untereiner's avatar
untereiner committed
515
516
}

untereiner's avatar
untereiner committed
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
template <typename PFP>
void subdivideLoop(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.volumeIsSubdivided(d) || !"Trying to subdivide an already subdivided volume") ;
	assert(!map.isBoundaryMarked(d) || !"Trying to subdivide a dart marked boundary");

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

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

	/*
	 * Compute volume centroid
	 */
	typename PFP::VEC3 volCenter =  Algo::Geometry::volumeCentroid<PFP>(map, old, position);

	/*
	 * Subdivide Faces
	 */
	std::vector<std::pair<Dart,Dart> > subdividedfaces;
	subdividedfaces.reserve(25);

	Traversor3WF<typename PFP::MAP> traF(map, old);
	for(Dart dit = traF.begin(); dit != traF.end(); dit = traF.next())
	{
		//if needed subdivide face
		if(!map.faceIsSubdivided(dit))
			Algo::IHM::subdivideFace<PFP>(map, dit, position, Algo::IHM::S_TRI);

		//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) ;

		//le brin est forcement du niveau cur
		Dart cf = map.phi1(d);
		Dart e = cf;
		do
		{
			subdividedfaces.push_back(std::pair<Dart,Dart>(e,map.phi2(e)));
			e = map.phi2(map.phi1(e));
		}while (e != cf);

		map.setCurrentLevel(cur);
	}

	/*
	 * Create inside volumes
	 */
	std::vector<Dart> newEdges;	//save darts from inner edges
	newEdges.reserve(50);
	Dart centralDart = NIL;

	//unsigned int degree = 0 ;
	//typename PFP::VEC3 volCenter ;
	Traversor3WV<typename PFP::MAP> traV(map, old);

	bool isNotTet = false;

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

	for(Dart dit = traV.begin(); dit != traV.end(); dit = traV.next())
	{
		//volCenter += position[d];
		//++degree;
585
		Dart f1 = map.phi1(dit);
untereiner's avatar
untereiner committed
586
587
588
589
590
591
592
593
594
595
596
597
		Dart e = dit;
		std::vector<Dart> v ;

		do
		{
			v.push_back(map.phi1(e));
			e = map.phi2(map.phi_1(e));
		}
		while(e != dit);

		map.splitVolume(v) ;

598
599
600
601
602
		for(std::vector<Dart>::iterator it = v.begin() ; it != v.end() ; ++it)
		{
			map.setEdgeId(*it,map.getEdgeId(*it), EDGE);
		}

untereiner's avatar
untereiner committed
603
		//if is not a tetrahedron
604
605
		unsigned int fdeg = map.faceDegree(map.phi2(f1));
		if(fdeg > 3)
untereiner's avatar
untereiner committed
606
607
608
609
610
611
612
613
614
615
616
		{
			isNotTet = true;
			Dart old = map.phi2(map.phi1(dit));
			Dart dd = map.phi1(old) ;
			map.splitFace(old,dd) ;

			Dart ne = map.phi1(old);

			map.cutEdge(ne);
			position[map.phi1(ne)] = volCenter; //plonger a la fin de la boucle ????
			centralDart = map.phi1(ne);
617
618
619
620

			unsigned int idFace = map.getNewFaceId();
			map.setFaceId(ne, idFace, FACE);

untereiner's avatar
untereiner committed
621
622
623
624
625
626
627
628
629
630
631
			newEdges.push_back(ne);
			newEdges.push_back(map.phi1(ne));

			Dart stop = map.phi2(map.phi1(ne));
			ne = map.phi2(ne);
			do
			{
				dd = map.phi1(map.phi1(ne));

				map.splitFace(ne, dd) ;

632
633
634
				unsigned int idFace = map.getNewFaceId();
				map.setFaceId(ne, idFace, FACE);

untereiner's avatar
untereiner committed
635
636
637
638
639
640
				newEdges.push_back(map.phi1(dd));

				ne = map.phi2(map.phi_1(ne));
				dd = map.phi1(dd);
			}
			while(dd != stop);
641
642
643
644

			idFace = map.getNewFaceId();
			map.setFaceId(stop, idFace, FACE);

untereiner's avatar
untereiner committed
645
		}
646
647
648
649
650
		else
		{
			unsigned int idface = map.getNewFaceId();
			map.setFaceId(map.phi2(v.front()),idface, FACE);
		}
untereiner's avatar
untereiner committed
651
652
653
654
655
	}

	//switch inner faces
	if(isNotTet)
	{
656
		DartMarker me(map);
untereiner's avatar
untereiner committed
657
658
659
660
661
662
663
664
665
666

		for(Dart dit = traV.begin(); dit != traV.end(); dit = traV.next())
		{
			Dart x = map.phi_1(map.phi2(map.phi1(dit)));
			Dart f = x;

			do
			{
				Dart f3 = map.phi3(f);

667
668
669
670
671
672
				if(!me.isMarked(f3))
				{
					Dart tmp =  map.phi_1(map.phi2(map.phi_1(map.phi2(map.phi_1(f3))))); //future voisin par phi2

					Dart f32 = map.phi2(f3);
					map.swapEdges(f3, tmp);
untereiner's avatar
untereiner committed
673

674
					unsigned int idface = map.getNewFaceId();
675
676
677
678
679
680
681
682
683
					map.setFaceId(f3,idface, FACE);
					idface = map.getNewFaceId();
					map.setFaceId(f32,idface, FACE);

					unsigned int idedge = map.getNewEdgeId();
					map.setEdgeId(f3, idedge, EDGE);

					map.setEdgeId(f3,map.getEdgeId(f3), EDGE);
					map.setEdgeId(f32,map.getEdgeId(f32), EDGE);
untereiner's avatar
untereiner committed
684

685
686
687
					me.markOrbit(EDGE, f3);
					me.markOrbit(EDGE, f32);
				}
untereiner's avatar
untereiner committed
688
689
690
691

				f = map.phi2(map.phi_1(f));
			}while(f != x);
		}
692

693
		map.embedOrbit(VERTEX, centralDart, map.getEmbedding(VERTEX, centralDart));
untereiner's avatar
untereiner committed
694

695
696
		//Third step : 3-sew internal faces
		for (std::vector<std::pair<Dart,Dart> >::iterator it = subdividedfaces.begin(); it != subdividedfaces.end(); ++it)
697
		{
698
699
700
701
702
703
			Dart f1 = (*it).first;
			Dart f2 = (*it).second;

			unsigned int idedge = map.getEdgeId(f1);
			map.setEdgeId(map.phi2(f1), idedge, EDGE);
			map.setEdgeId(map.phi2(f2), idedge, EDGE);
704
705
		}

706
	}
707

708
	map.setCurrentLevel(cur) ;
untereiner's avatar
untereiner committed
709
710
711
}


712
template <typename PFP>
713
Dart subdivideVolume(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position)
714
715
716
{
	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") ;
717
	assert(!map.neighborhoodLevelDiffersByOne(d) || !"Trying to subdivide a volume with neighborhood Level difference greater than 1");
718

untereiner's avatar
ihm3    
untereiner committed
719
720
	unsigned int vLevel = map.volumeLevel(d);
	Dart old = map.volumeOldestDart(d);
721

untereiner's avatar
ihm3    
untereiner committed
722
723
	unsigned int cur = map.getCurrentLevel();
	map.setCurrentLevel(vLevel);
724
725

	/*
726
	 * au niveau du volume courant i
727
	 * stockage d'un brin de chaque face de celui-ci
728
	 * avec calcul du centroid
729
730
	 */

731
	DartMarkerStore mf(map);		// Lock a face marker to save one dart per face
untereiner's avatar
untereiner committed
732
	CellMarker mv(map, VERTEX);
733
734
735

	typename PFP::VEC3 volCenter;
	unsigned count = 0 ;
736
737
738

	//Store faces that are traversed and start with the face of d
	std::vector<Dart> visitedFaces;
739
	visitedFaces.reserve(512);
740
741
742
743
	visitedFaces.push_back(old);

	//Store the edges before the cutEdge
	std::vector<Dart> oldEdges;
744
	oldEdges.reserve(20);
745

746
	mf.markOrbit(FACE, old) ;
747

748
	for(unsigned int i = 0; i < visitedFaces.size(); ++i)
749
	{
750
		Dart e = visitedFaces[i] ;
751
		do
752
		{
untereiner's avatar
untereiner committed
753
			//add one old edge per vertex to the old edge list
754
755
756
			//compute volume centroid
			if(!mv.isMarked(e))
			{
untereiner's avatar
untereiner committed
757
				mv.mark(e);
758
759
760
761
				volCenter += position[e];
				++count;
				oldEdges.push_back(e);
			}
untereiner's avatar
untereiner committed
762

untereiner's avatar
untereiner committed
763
			// add all face neighbours to the table
764
765
766
767
			Dart ee = map.phi2(e) ;
			if(!mf.isMarked(ee)) // not already marked
			{
				visitedFaces.push_back(ee) ;
768
				mf.markOrbit(FACE, ee) ;
769
			}
770

771
			e = map.phi1(e) ;
772
		} while(e != visitedFaces[i]) ;
773
774
	}

775
776
	volCenter /= typename PFP::REAL(count) ;

untereiner's avatar
untereiner committed
777
	/*
778
	 * Subdivision
untereiner's avatar
untereiner committed
779
	 */
780
781
782
	//type 'q' : quad et plus
	//type 't' : tri
	std::vector<std::pair<char, std::pair<Dart,Dart> > > subdividedfaces;
783
784
785
786
787
788
789

	//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;

790
		//if needed subdivide face
untereiner's avatar
untereiner committed
791
		if(!map.faceIsSubdivided(d))
untereiner's avatar
untereiner committed
792
			Algo::IHM::subdivideFace<PFP>(map, d, position);
793

794

795
796
		//save a dart from the subdivided face
		unsigned int cur = map.getCurrentLevel() ;
untereiner's avatar
untereiner committed
797

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

801
802
		//test si la face est triangulaire ou non
		if(map.phi1(map.phi1(map.phi1(d))) == d)
803
		{
untereiner's avatar
untereiner committed
804
			//std::cout << "trian" << std::endl;
805
806
807
808
			Dart cf = map.phi2(map.phi1(d));
			Dart e = cf;
			do
			{
809
810
				std::pair<Dart,Dart> pd(e,map.phi2(e));
				subdividedfaces.push_back(std::pair<char, std::pair<Dart,Dart> > ('t',pd));
811
812
813
814
815
				e = map.phi1(e);
			}while (e != cf);
		}
		else
		{
untereiner's avatar
untereiner committed
816
			//std::cout << "quad" << std::endl;
817
818
819
820
			Dart cf = map.phi1(d);
			Dart e = cf;
			do
			{
821
822
				std::pair<Dart,Dart> pd(e,map.phi2(e));
				subdividedfaces.push_back(std::pair<char, std::pair<Dart,Dart> >('q',pd));
823
824
825
826
827
				e = map.phi2(map.phi1(e));
			}while (e != cf);


		}
untereiner's avatar
untereiner committed
828

829
		map.setCurrentLevel(cur);
830

831
	}
untereiner's avatar
untereiner committed
832

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

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

838
839
840
	bool istet = true;
	bool ishex = false;

untereiner's avatar
untereiner committed
841
842
843
844
	//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;
845
		std::vector<Dart> v ;
untereiner's avatar
untereiner committed
846

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

untereiner's avatar
untereiner committed
850
851
852
		do
		{
			if(map.phi1(map.phi1(map.phi1(e))) != e)
853
				v.push_back(map.phi1(map.phi1(e)));
untereiner's avatar
untereiner committed
854

855
			v.push_back(map.phi1(e));
untereiner's avatar
untereiner committed
856
857
858
859
860

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

861
		map.splitVolume(v) ;
untereiner's avatar
untereiner committed
862
863


864
865
//		//fonction qui calcule le degree max des faces atour d'un sommet
//		unsigned int fdeg = map.faceDegree(map.phi2(f1));
866
//
867
868
869
//		if(fdeg > 4)
//		{
//			std::cout << "> 4" << std::endl;
870
//
871
//			ishex = true;
872
//
873
874
875
//			Dart old = map.phi2(map.phi1(e));
//			Dart dd = map.phi1(map.phi1(old)) ;
//			map.splitFace(old,dd) ;
876
//
877
//			Dart ne = map.phi1(map.phi1(old)) ;
878
//
879
880
881
882
//			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));
883
884
//
//
885
886
887
888
889
//			Dart stop = map.phi2(map.phi1(ne));
//			ne = map.phi2(ne);
//			do
//			{
//				dd = map.phi1(map.phi1(map.phi1(ne)));
890
//
891
892
//				//A Verifier !!
//				map.splitFace(ne, dd) ;
893
//
894
//				newEdges.push_back(map.phi1(dd));
895
//
896
897
//				ne = map.phi2(map.phi_1(ne));
//				dd = map.phi1(map.phi1(dd));
898
//			}
899
900
901
//			while(dd != stop);
//		}
//		else if(fdeg > 3)
902
//		{
903
//			std::cout << "> 3" << std::endl;
904
//
905
906
907
//			//map.closeHole(f2);
//			//map.sewVolumes(map.phi2(f1),map.phi2(f2));
//			istet = false;
908
//
909
910
911
//			Dart old = map.phi2(map.phi1(*edge));
//			Dart dd = map.phi1(old) ;
//			map.splitFace(old,dd) ;
912
//
913
//			Dart ne = map.phi1(old);
914
//
915
916
917
918
//			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));
919
//
920
921
922
923
924
//			Dart stop = map.phi2(map.phi1(ne));
//			ne = map.phi2(ne);
//			do
//			{
//				dd = map.phi1(map.phi1(ne));
925
//
926
//				map.splitFace(ne, dd) ;
927
//
928
929
930
931
//				newEdges.push_back(map.phi1(dd));
//
//				ne = map.phi2(map.phi_1(ne));
//				dd = map.phi1(dd);
932
//			}
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
//			while(dd != stop);
//		}
//		else
//		{
//			//map.closeHole(f2);
//			//map.sewVolumes(map.phi2(f1),map.phi2(f2));
//
//			unsigned int idface = map.getNewFaceId();
//			map.setFaceId(map.phi2(f1),idface, FACE);
//		}

	}

	if(ishex)
	{
		map.deleteVolume(map.phi3(map.phi2(map.phi1(oldEdges.front()))));
949
//
950
951
952
953
954
//		//Third step : 3-sew internal faces
//		for (std::vector<std::pair<Dart,Dart> >::iterator it = subdividedfaces.begin(); it != subdividedfaces.end(); ++it)
//		{
//			Dart f1 = (*it).first;
//			Dart f2 = (*it).second;
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
//
//			//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);
//			}
//		}
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011

	}

	if(!istet)
	{
		for (std::vector<Dart>::iterator edge = oldEdges.begin(); edge != oldEdges.end(); ++edge)
		{
			//Dart e = *edge;

			Dart x = map.phi_1(map.phi2(map.phi1(*edge)));
			Dart f = x;

			do
			{
				Dart f3 = map.phi3(f);
				Dart tmp =  map.phi_1(map.phi2(map.phi_1(map.phi2(map.phi_1(f3)))));

				map.unsewFaces(f3);
				map.unsewFaces(tmp);
				map.sewFaces(f3, tmp);

				unsigned int idface = map.getNewFaceId();
				map.setFaceId(map.phi2(f3),idface, FACE);


				f = map.phi2(map.phi_1(f));
			}while(f != x);

		}

	}





1012
//	{
1013
1014
1015
1016
1017
//	//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;
1018
//
1019
1020
1021
1022
1023
//		//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);
1024
//
1025
//	}
1026
//
1027
1028
1029
1030
1031
1032
//	//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))
1033
//		{
1034
1035
1036
//			unsigned int idedge = map.getNewEdgeId();
//			map.setEdgeId(*it, idedge, EDGE);
//			mne.markOrbit(EDGE, *it);
1037
1038
//		}
//	}
1039
//	}
1040
//
1041
1042
1043
//	{
//	//Third step : 3-sew internal faces
//	for (std::vector<std::pair<Dart,Dart> >::iterator it = subdividedfacesQ.begin(); it != subdividedfacesQ.end(); ++it)
1044
1045
1046
1047
//	{
//		Dart f1 = (*it).first;
//		Dart f2 = (*it).second;
//
1048
//		if(map.phi3(map.phi2(f1)) == map.phi2(f1) && map.phi3(map.phi2(f2)) == map.phi2(f2))
1049
//		{
1050
1051
//			//id pour toutes les faces interieures
//			map.sewVolumes(map.phi2(f1), map.phi2(f2));
1052
//
1053
1054
1055
1056
//			//Fais a la couture !!!!!
//			unsigned int idface = map.getNewFaceId();
//			map.setFaceId(map.phi2(f1),idface, FACE);
//		}
1057
//
1058
1059
1060
1061
1062
1063
//		//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);
//	}
1064
//
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
//	//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))
//		{
//			unsigned int idedge = map.getNewEdgeId();
//			map.setEdgeId(*it, idedge, EDGE);
//			mne.markOrbit(EDGE, *it);
1075
//		}
1076
//	}
1077
//	}
untereiner's avatar
untereiner committed
1078
1079
1080

	map.setCurrentLevel(cur) ;

1081
1082
//	return subdividedfacesQ.begin()->first;
	return NIL;
1083
}
untereiner's avatar
untereiner committed
1084

untereiner's avatar
untereiner committed
1085

1086
template <typename PFP>
1087
Dart subdivideVolumeGen(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position)
1088
{
untereiner's avatar
untereiner committed
1089
1090
	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
untereiner committed
1091

1092
1093
	unsigned int vLevel = map.volumeLevel(d);
	Dart old = map.volumeOldestDart(d);
untereiner's avatar
untereiner committed
1094

1095
1096
	unsigned int cur = map.getCurrentLevel();
	map.setCurrentLevel(vLevel);
untereiner's avatar
untereiner committed
1097

untereiner's avatar
untereiner committed
1098
1099
1100
1101
1102
	/*
	 * 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
1103

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

untereiner's avatar
untereiner committed
1107
1108
	typename PFP::VEC3 volCenter;
	unsigned count = 0 ;
untereiner's avatar
untereiner committed
1109

untereiner's avatar
untereiner committed
1110
1111
	//Store faces that are traversed and start with the face of d
	std::vector<Dart> visitedFaces;
1112
	visitedFaces.reserve(512);
untereiner's avatar
untereiner committed
1113
	visitedFaces.push_back(old);
untereiner's avatar
untereiner committed
1114

untereiner's avatar
untereiner committed
1115
1116
	//Store the edges before the cutEdge
	std::vector<Dart> oldEdges;
1117
	oldEdges.reserve(512);
untereiner's avatar
untereiner committed
1118

1119
	mf.markOrbit(FACE, old) ;
untereiner's avatar
untereiner committed
1120

1121
	for(unsigned int i = 0; i < visitedFaces.size(); ++i)
1122
	{
1123
		Dart e = visitedFaces[i] ;
untereiner's avatar
untereiner committed
1124
1125
1126
1127
1128
1129
		do
		{
			//add one old edge per vertex to the old edge list
			//compute volume centroid
			if(!mv.isMarked(e))
			{
1130
				mv.mark(e);
untereiner's avatar
untereiner committed
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
				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) ;
1141
				mf.markOrbit(FACE, ee) ;
untereiner's avatar
untereiner committed
1142
1143
1144
			}

			e = map.phi1(e) ;
1145
		} while(e != visitedFaces[i]) ;
1146
1147
	}

1148
	volCenter /= typename PFP::REAL(count) ;
1149

untereiner's avatar
untereiner committed
1150
1151
1152
1153
	/*
	 * Subdivision
	 */
	//Store the darts from quadrangulated faces
1154
1155
	std::vector<std::pair<Dart,Dart> > subdividedfacesQ;
	subdividedfacesQ.reserve(25);
1156

1157
1158
	std::vector<std::pair<Dart,Dart> > subdividedfacesT;
	subdividedfacesT.reserve(25);
untereiner's avatar
untereiner committed
1159
1160


1161
1162
1163
1164
1165
	//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
1166

1167
1168
1169
		//if needed subdivide face
		if(!map.faceIsSubdivided(d))
			Algo::IHM::subdivideFace<PFP>(map, d, position);
untereiner's avatar
untereiner committed
1170

1171
1172
1173
1174
1175
1176
1177
1178
1179
1180

		//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)
		{
1181
			//std::cout << "trian" << std::endl;
untereiner's avatar
untereiner committed
1182
1183
1184
1185
			Dart cf = map.phi2(map.phi1(d));
			Dart e = cf;
			do
			{
1186
				subdividedfacesT.push_back(std::pair<Dart,Dart>(e,map.phi2(e)));
untereiner's avatar
untereiner committed
1187
1188
				e =