subdivision3.hpp 48.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
{

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
406
407
408
409
410
411
412
413
414
415
416
417
418
	/*
	 * 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_QUAD);

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

untereiner's avatar
untereiner committed
419
		unsigned int fLevel = map.faceLevel(dit) + 1; //puisque dans tous les cas, la face est subdivisee
untereiner's avatar
untereiner committed
420
421
422
		map.setCurrentLevel(fLevel) ;

		//le brin est forcement du niveau cur
untereiner's avatar
untereiner committed
423
		Dart cf = map.phi2(map.phi1(dit));
untereiner's avatar
untereiner committed
424
		Dart e = cf;
untereiner's avatar
untereiner committed
425

untereiner's avatar
untereiner committed
426
427
428
		do
		{
			subdividedfaces.push_back(std::pair<Dart,Dart>(e,map.phi2(e)));
untereiner's avatar
untereiner committed
429
			e = map.phi2(map.phi_1(e));
untereiner's avatar
untereiner committed
430
431
432
433
434
		}while (e != cf);

		map.setCurrentLevel(cur);
	}

untereiner's avatar
untereiner committed
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
	unsigned int fLevel = map.faceLevel(old) + 1; //puisque dans tous les cas, la face est subdivisee
	map.setCurrentLevel(fLevel) ;

	for (std::vector<std::pair<Dart,Dart> >::iterator it = subdividedfaces.begin(); it != subdividedfaces.end(); ++it)
	{
		Dart f1 = (*it).first;

		if(!map.Map2::isBoundaryEdge(f1))
		{
			Dart f2 = map.phi2(f1);

			map.unsewFaces(f1);

			map.copyDartEmbedding(VERTEX, map.phi2(f2), f1);
			map.copyDartEmbedding(VERTEX, map.phi2(f1), f2);

		}
	}
	map.setCurrentLevel(cur);

untereiner's avatar
untereiner committed
455
456
457
458
459
460
461
	/*
	 * Create inside volumes
	 */
	std::vector<Dart> newEdges;	//save darts from inner edges
	newEdges.reserve(50);
	Dart centralDart = NIL;

untereiner's avatar
untereiner committed
462
463
	//unsigned int degree = 0 ;
	//typename PFP::VEC3 volCenter ;
untereiner's avatar
untereiner committed
464

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

untereiner's avatar
untereiner committed
467
468
469
470
	for(Dart dit = traV.begin(); dit != traV.end(); dit = traV.next())
	{
		//volCenter += position[d];
		//++degree;
untereiner's avatar
untereiner committed
471

untereiner's avatar
untereiner committed
472
		Dart old = map.phi2(map.phi1(dit));
untereiner's avatar
untereiner committed
473
474
		map.Map2::fillHole(old);

untereiner's avatar
untereiner committed
475
476
477
478
479
480
481
482
483
484
		Dart dd = map.phi1(map.phi1(old)) ;
		map.splitFace(old,dd) ;

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

		Dart ne = map.phi1(map.phi1(old)) ;

		map.cutEdge(ne);
		centralDart = map.phi1(ne);
untereiner's avatar
untereiner committed
485
		position[centralDart] = volCenter;
untereiner's avatar
untereiner committed
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
		newEdges.push_back(ne);
		newEdges.push_back(map.phi1(ne));

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

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

			map.splitFace(ne, dd) ;
			unsigned int idface = map.getNewFaceId();
			map.setFaceId(dd,idface, FACE);

			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
508
509

	}
untereiner's avatar
untereiner committed
510

untereiner's avatar
untereiner committed
511

untereiner's avatar
untereiner committed
512
513
514
515
516
517
518
519
520
521
522
523
524
525
	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)))
		{
			map.sewVolumes(map.phi2(f1), map.phi2(f2));
		}
	}

	//volCenter /= double(degree);


untereiner's avatar
untereiner committed
526
527
528
529
530
531
//	//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
532
//
untereiner's avatar
untereiner committed
533
534
//		if(map.isBoundaryFace(map.phi2(f1)) && map.isBoundaryFace(map.phi2(f2)))
//		{
untereiner's avatar
untereiner committed
535
//			std::cout << "boundary" << std::endl;
untereiner's avatar
untereiner committed
536
537
//			//id pour toutes les faces interieures
//			map.sewVolumes(map.phi2(f1), map.phi2(f2));
untereiner's avatar
untereiner committed
538
539
540
541
542
//			break;
////
////			//Fais a la couture !!!!!
////			unsigned int idface = map.getNewFaceId();
////			map.setFaceId(map.phi2(f1),idface, FACE);
untereiner's avatar
untereiner committed
543
//		}
untereiner's avatar
untereiner committed
544
545
546
547
548
549
////
////		//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
550
//	}
untereiner's avatar
untereiner committed
551

untereiner's avatar
untereiner committed
552
553
554
555
556
557
558
559
560
561
562
563
//	//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
564
565
566


	//plonger a la fin de la boucle ????
untereiner's avatar
untereiner committed
567
568
569
570

	map.setCurrentLevel(cur) ;

	return subdividedfaces.begin()->first;
untereiner's avatar
untereiner committed
571

untereiner's avatar
untereiner committed
572
573
}

untereiner's avatar
untereiner committed
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
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
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;

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

		//if is not a tetrahedron
		unsigned int vdeg = map.vertexDegree(dit);
		if(vdeg > 3)
		{
			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);
			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) ;

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

				ne = map.phi2(map.phi_1(ne));
				dd = map.phi1(dd);
			}
			while(dd != stop);
		}
//		else
//		{
//			unsigned int idface = map.getNewFaceId();
//			map.setFaceId(map.phi2(f1),idface, FACE);
//		}
	}

	//switch inner faces
	if(isNotTet)
	{
		unsigned int i = 0;

		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);
				Dart tmp =  map.phi_1(map.phi2(map.phi_1(map.phi2(map.phi_1(f3))))); //future voisin par phi2

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

				map.copyDartEmbedding(VERTEX, map.phi2(f3), tmp);
				map.copyDartEmbedding(VERTEX, map.phi2(tmp), f3);

//				map.embedOrbit(VERTEX, f3, map.getEmbedding(VERTEX, f3)) ;
//				map.embedOrbit(VERTEX, tmp, map.getEmbedding(VERTEX, tmp)) ;

//				unsigned int idface = map.getNewFaceId();
//				map.setFaceId(map.phi2(f3),idface, FACE);
				f = map.phi2(map.phi_1(f));
			}while(f != x);

		}
	}

	position[centralDart] = volCenter;


//		//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;
//
//			//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);
//			}
//		}
//
//
//		map.setCurrentLevel(cur) ;
}


762
template <typename PFP>
763
Dart subdivideVolume(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position)
764
765
766
{
	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") ;
767
	assert(!map.neighborhoodLevelDiffersByOne(d) || !"Trying to subdivide a volume with neighborhood Level difference greater than 1");
768

untereiner's avatar
ihm3    
untereiner committed
769
770
	unsigned int vLevel = map.volumeLevel(d);
	Dart old = map.volumeOldestDart(d);
771

untereiner's avatar
ihm3    
untereiner committed
772
773
	unsigned int cur = map.getCurrentLevel();
	map.setCurrentLevel(vLevel);
774
775

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

781
	DartMarkerStore mf(map);		// Lock a face marker to save one dart per face
untereiner's avatar
untereiner committed
782
	CellMarker mv(map, VERTEX);
783
784
785

	typename PFP::VEC3 volCenter;
	unsigned count = 0 ;
786
787
788

	//Store faces that are traversed and start with the face of d
	std::vector<Dart> visitedFaces;
789
	visitedFaces.reserve(512);
790
791
792
793
	visitedFaces.push_back(old);

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

796
	mf.markOrbit(FACE, old) ;
797

798
	for(unsigned int i = 0; i < visitedFaces.size(); ++i)
799
	{
800
		Dart e = visitedFaces[i] ;
801
		do
802
		{
untereiner's avatar
untereiner committed
803
			//add one old edge per vertex to the old edge list
804
805
806
			//compute volume centroid
			if(!mv.isMarked(e))
			{
untereiner's avatar
untereiner committed
807
				mv.mark(e);
808
809
810
811
				volCenter += position[e];
				++count;
				oldEdges.push_back(e);
			}
untereiner's avatar
untereiner committed
812

untereiner's avatar
untereiner committed
813
			// add all face neighbours to the table
814
815
816
817
			Dart ee = map.phi2(e) ;
			if(!mf.isMarked(ee)) // not already marked
			{
				visitedFaces.push_back(ee) ;
818
				mf.markOrbit(FACE, ee) ;
819
			}
820

821
			e = map.phi1(e) ;
822
		} while(e != visitedFaces[i]) ;
823
824
	}

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

untereiner's avatar
untereiner committed
827
	/*
828
	 * Subdivision
untereiner's avatar
untereiner committed
829
	 */
830
831
832
	//type 'q' : quad et plus
	//type 't' : tri
	std::vector<std::pair<char, std::pair<Dart,Dart> > > subdividedfaces;
833
834
835
836
837
838
839

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

840
		//if needed subdivide face
untereiner's avatar
untereiner committed
841
		if(!map.faceIsSubdivided(d))
untereiner's avatar
untereiner committed
842
			Algo::IHM::subdivideFace<PFP>(map, d, position);
843

844

845
846
		//save a dart from the subdivided face
		unsigned int cur = map.getCurrentLevel() ;
untereiner's avatar
untereiner committed
847

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

851
852
		//test si la face est triangulaire ou non
		if(map.phi1(map.phi1(map.phi1(d))) == d)
853
		{
untereiner's avatar
untereiner committed
854
			//std::cout << "trian" << std::endl;
855
856
857
858
			Dart cf = map.phi2(map.phi1(d));
			Dart e = cf;
			do
			{
859
860
				std::pair<Dart,Dart> pd(e,map.phi2(e));
				subdividedfaces.push_back(std::pair<char, std::pair<Dart,Dart> > ('t',pd));
861
862
863
864
865
				e = map.phi1(e);
			}while (e != cf);
		}
		else
		{
untereiner's avatar
untereiner committed
866
			//std::cout << "quad" << std::endl;
867
868
869
870
			Dart cf = map.phi1(d);
			Dart e = cf;
			do
			{
871
872
				std::pair<Dart,Dart> pd(e,map.phi2(e));
				subdividedfaces.push_back(std::pair<char, std::pair<Dart,Dart> >('q',pd));
873
874
875
876
877
				e = map.phi2(map.phi1(e));
			}while (e != cf);


		}
untereiner's avatar
untereiner committed
878

879
		map.setCurrentLevel(cur);
880

881
	}
untereiner's avatar
untereiner committed
882

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

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

888
889
890
	bool istet = true;
	bool ishex = false;

untereiner's avatar
untereiner committed
891
892
893
894
	//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;
895
		std::vector<Dart> v ;
untereiner's avatar
untereiner committed
896

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

untereiner's avatar
untereiner committed
900
901
902
		do
		{
			if(map.phi1(map.phi1(map.phi1(e))) != e)
903
				v.push_back(map.phi1(map.phi1(e)));
untereiner's avatar
untereiner committed
904

905
			v.push_back(map.phi1(e));
untereiner's avatar
untereiner committed
906
907
908
909
910

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

911
		map.splitVolume(v) ;
untereiner's avatar
untereiner committed
912
913


914
915
//		//fonction qui calcule le degree max des faces atour d'un sommet
//		unsigned int fdeg = map.faceDegree(map.phi2(f1));
916
//
917
918
919
//		if(fdeg > 4)
//		{
//			std::cout << "> 4" << std::endl;
920
//
921
//			ishex = true;
922
//
923
924
925
//			Dart old = map.phi2(map.phi1(e));
//			Dart dd = map.phi1(map.phi1(old)) ;
//			map.splitFace(old,dd) ;
926
//
927
//			Dart ne = map.phi1(map.phi1(old)) ;
928
//
929
930
931
932
//			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));
933
934
//
//
935
936
937
938
939
//			Dart stop = map.phi2(map.phi1(ne));
//			ne = map.phi2(ne);
//			do
//			{
//				dd = map.phi1(map.phi1(map.phi1(ne)));
940
//
941
942
//				//A Verifier !!
//				map.splitFace(ne, dd) ;
943
//
944
//				newEdges.push_back(map.phi1(dd));
945
//
946
947
//				ne = map.phi2(map.phi_1(ne));
//				dd = map.phi1(map.phi1(dd));
948
//			}
949
950
951
//			while(dd != stop);
//		}
//		else if(fdeg > 3)
952
//		{
953
//			std::cout << "> 3" << std::endl;
954
//
955
956
957
//			//map.closeHole(f2);
//			//map.sewVolumes(map.phi2(f1),map.phi2(f2));
//			istet = false;
958
//
959
960
961
//			Dart old = map.phi2(map.phi1(*edge));
//			Dart dd = map.phi1(old) ;
//			map.splitFace(old,dd) ;
962
//
963
//			Dart ne = map.phi1(old);
964
//
965
966
967
968
//			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));
969
//
970
971
972
973
974
//			Dart stop = map.phi2(map.phi1(ne));
//			ne = map.phi2(ne);
//			do
//			{
//				dd = map.phi1(map.phi1(ne));
975
//
976
//				map.splitFace(ne, dd) ;
977
//
978
979
980
981
//				newEdges.push_back(map.phi1(dd));
//
//				ne = map.phi2(map.phi_1(ne));
//				dd = map.phi1(dd);
982
//			}
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
//			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()))));
999
//
1000
1001
1002
1003
1004
//		//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;
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
//
//			//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);
//			}
//		}
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061

	}

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

		}

	}





1062
//	{
1063
1064
1065
1066
1067
//	//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;
1068
//
1069
1070
1071
1072
1073
//		//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);
1074
//
1075
//	}
1076
//
1077
1078
1079
1080
1081
1082
//	//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))
1083
//		{
1084
1085
1086
//			unsigned int idedge = map.getNewEdgeId();
//			map.setEdgeId(*it, idedge, EDGE);
//			mne.markOrbit(EDGE, *it);
1087
1088
//		}
//	}
1089
//	}
1090
//
1091
1092
1093
//	{
//	//Third step : 3-sew internal faces
//	for (std::vector<std::pair<Dart,Dart> >::iterator it = subdividedfacesQ.begin(); it != subdividedfacesQ.end(); ++it)
1094
1095
1096
1097
//	{
//		Dart f1 = (*it).first;
//		Dart f2 = (*it).second;
//
1098
//		if(map.phi3(map.phi2(f1)) == map.phi2(f1) && map.phi3(map.phi2(f2)) == map.phi2(f2))
1099
//		{
1100
1101
//			//id pour toutes les faces interieures
//			map.sewVolumes(map.phi2(f1), map.phi2(f2));
1102
//
1103
1104
1105
1106
//			//Fais a la couture !!!!!
//			unsigned int idface = map.getNewFaceId();
//			map.setFaceId(map.phi2(f1),idface, FACE);
//		}
1107
//
1108
1109
1110
1111
1112
1113
//		//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);
//	}
1114
//
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
//	//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);
1125
//		}
1126
//	}
1127
//	}
untereiner's avatar
untereiner committed
1128
1129
1130

	map.setCurrentLevel(cur) ;

1131
1132
//	return subdividedfacesQ.begin()->first;
	return NIL;
1133
}
untereiner's avatar
untereiner committed
1134

untereiner's avatar
untereiner committed
1135

1136
template <typename PFP>
1137
Dart subdivideVolumeGen(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position)
1138
{
untereiner's avatar
untereiner committed
1139
1140
	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
1141

1142
1143
	unsigned int vLevel = map.volumeLevel(d);
	Dart old = map.volumeOldestDart(d);
untereiner's avatar
untereiner committed
1144

1145
1146
	unsigned int cur = map.getCurrentLevel();
	map.setCurrentLevel(vLevel);
untereiner's avatar
untereiner committed
1147

untereiner's avatar
untereiner committed
1148
1149
1150
1151
1152
	/*
	 * 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
1153

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

untereiner's avatar
untereiner committed
1157
1158
	typename PFP::VEC3 volCenter;
	unsigned count = 0 ;
untereiner's avatar
untereiner committed
1159

untereiner's avatar
untereiner committed
1160
1161
	//Store faces that are traversed and start with the face of d
	std::vector<Dart> visitedFaces;
1162
	visitedFaces.reserve(512);
untereiner's avatar
untereiner committed
1163
	visitedFaces.push_back(old);
untereiner's avatar
untereiner committed
1164

untereiner's avatar
untereiner committed
1165
1166
	//Store the edges before the cutEdge
	std::vector<Dart> oldEdges;
1167
	oldEdges.reserve(512);
untereiner's avatar
untereiner committed
1168

1169
	mf.markOrbit(FACE, old) ;
untereiner's avatar
untereiner committed
1170

1171
	for(unsigned int i = 0; i < visitedFaces.size(); ++i)
1172
	{
1173
		Dart e = visitedFaces[i] ;
untereiner's avatar
untereiner committed
1174
1175
1176
1177
1178
1179
		do
		{
			//add one old edge per vertex to the old edge list
			//compute volume centroid
			if(!mv.isMarked(e))
			{
1180
				mv.mark(e);
untereiner's avatar
untereiner committed
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
				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) ;
1191
				mf.markOrbit(FACE, ee) ;
untereiner's avatar
untereiner committed
1192
1193
1194
			}

			e = map.phi1(e) ;
1195
		} while(e != visitedFaces[i]) ;
1196
1197
	}

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

untereiner's avatar
untereiner committed
1200
1201
1202
1203
	/*
	 * Subdivision
	 */
	//Store the darts from quadrangulated faces
1204
1205
	std::vector<std::pair<Dart,Dart> > subdividedfacesQ;
	subdividedfacesQ.reserve(25);
1206

1207
1208
	std::vector<std::pair<Dart,Dart> > subdividedfacesT;
	subdividedfacesT.reserve(25);
untereiner's avatar
untereiner committed
1209
1210


1211
1212
1213
1214
1215
	//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
1216

1217
1218
1219
		//if needed subdivide face
		if(!map.faceIsSubdivided(d))
			Algo::IHM::subdivideFace<PFP>(map, d, position);
untereiner's avatar
untereiner committed
1220

1221
1222
1223
1224
1225
1226
1227
1228
1229
1230

		//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)
		{
1231
			//std::cout << "trian" << std::endl;
untereiner's avatar
untereiner committed
1232
1233
1234
1235
			Dart cf = map.phi2(map.phi1(d));
			Dart e = cf;
			do
			{
1236
				subdividedfacesT.push_back(std::pair<Dart,Dart>(e,map.phi2(e)));
untereiner's avatar
untereiner committed
1237
1238
				e = map.phi1(e);
			}while (e != cf);
1239
1240
1241
		}
		else
		{
1242
			//std::cout << "quad" << std::endl;
1243
1244
1245
1246
1247
1248
1249
1250
			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
1251
1252
1253

		}

1254
1255
		map.setCurrentLevel(cur);
	}
untereiner's avatar
untereiner committed
1256

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

1259
1260
1261
1262
1263
1264
1265
1266
	std::vector<Dart> newEdges;	//save darts from inner edges
	newEdges.reserve(50);

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

1267
		std::vector<Dart> v ;
1268
1269

		do
untereiner's avatar
untereiner committed
1270
		{
1271
			if(map.phi1(map.phi1(map.phi1(e))) != e)
1272
				v.push_back(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))
1273

1274
			v.push_back(map.phi1(e));
1275
1276
1277
1278
1279

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

1280
		map.splitVolume(v) ;
1281

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