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

35
36
37
namespace Volume
{

untereiner's avatar
untereiner committed
38
namespace IHM
39
40
{

untereiner's avatar
untereiner committed
41

42
template <typename PFP>
43
void subdivideEdge(typename PFP::MAP& map, Dart d, AttributeHandler<typename PFP::VEC3, VERTEX>& position)
44
45
46
{
	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") ;
Thery Sylvain's avatar
Thery Sylvain committed
47
	assert(!map.isBoundaryMarked3(d) || !"Trying to subdivide a dart marked boundary");
48
49
50
51
52
53
54
55
56
57
58
59
60
61

	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) ;
62
63
	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) ;
64

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

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

71
72
73
74
	map.setCurrentLevel(cur) ;
}

template <typename PFP>
75
void subdivideFace(typename PFP::MAP& map, Dart d, AttributeHandler<typename PFP::VEC3, VERTEX>& position, SubdivideType sType)
76
77
78
{
	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") ;
Thery Sylvain's avatar
Thery Sylvain committed
79
	assert(!map.isBoundaryMarked3(d) || !"Trying to subdivide a dart marked boundary");
80
81
82
83
84
85
86

	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
87
88
	unsigned int vLevel = map.volumeLevel(old);
	//one level of subdivision in the neighbordhood
89
90
91
92
//	Traversor3VW<typename PFP::MAP> trav3EW(map, old);
//	for(Dart dit = trav3EW.begin() ; dit != trav3EW.end() ; dit = trav3EW.next())
//	{
//		Dart oldit = map.volumeOldestDart(dit);
untereiner's avatar
untereiner committed
93
//
untereiner's avatar
untereiner committed
94
95
96
//		//std::cout << "vLevel courant = " << map.volumeLevel(oldit) << std::endl;
//
//		if(((vLevel+1) - map.volumeLevel(oldit)) > 1)
97
//				IHM::subdivideVolumeClassic<PFP>(map, oldit, position);
98
//	}
untereiner's avatar
untereiner committed
99

100
101
	unsigned int degree = 0 ;
	typename PFP::VEC3 p ;
untereiner's avatar
untereiner committed
102
103
104
	Traversor2FE<typename PFP::MAP>  travE(map, old);

	for(Dart it = travE.begin(); it != travE.end() ; it = travE.next())
105
106
107
	{
		++degree;
		p += position[it] ;
untereiner's avatar
untereiner committed
108

109
		if(!map.edgeIsSubdivided(it))							// first cut the edges (if they are not already)
110
			IHM::subdivideEdge<PFP>(map, it, position) ;	// and compute the degree of the face
untereiner's avatar
untereiner committed
111
	}
112
113
	p /= typename PFP::REAL(degree) ;

untereiner's avatar
untereiner committed
114

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

117
	Dart res;
118

119
	if(degree == 3 && sType == IHM::S_TRI)	//subdiviser une face triangulaire
120
121
122
123
	{
		Dart dd = map.phi1(old) ;
		Dart e = map.phi1(map.phi1(dd)) ;
		map.splitFace(dd, e) ;					// insert a new edge
124
125
		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
126
127
128
129
130
131
132
133

		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) ;
134
135
		id = map.getNewEdgeId() ;
		map.setEdgeId(map.phi_1(dd), id, EDGE) ;
136
137
138
139
140
141
142

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

		dd = e ;
		e = map.phi1(map.phi1(dd)) ;
		map.splitFace(dd, e) ;
143
144
		id = map.getNewEdgeId() ;
		map.setEdgeId(map.phi_1(dd), id, EDGE) ;
145
146
147

		map.setFaceId(dd, idface, FACE) ;
		map.setFaceId(e, idface, FACE) ;
untereiner's avatar
untereiner committed
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189

		Dart stop = map.phi2(map.phi1(old));
		Dart dit = stop;
		do
		{
			unsigned int dId = map.getEdgeId(map.phi_1(map.phi2(dit)));
			unsigned int eId = map.getEdgeId(map.phi1(map.phi2(dit)));

			unsigned int t = dId + eId;

			if(t == 0)
			{
				map.setEdgeId(dit, 1, EDGE) ;
				map.setEdgeId(map.phi2(dit), 1, EDGE) ;
			}
			else if(t == 1)
			{
				map.setEdgeId(dit, 2, EDGE) ;
				map.setEdgeId(map.phi2(dit), 2, EDGE) ;
			}
			else if(t == 2)
			{
				if(dId == eId)
				{
					map.setEdgeId(dit, 0, EDGE) ;
					map.setEdgeId(map.phi2(dit), 0, EDGE) ;
				}
				else
				{
					map.setEdgeId(dit, 1, EDGE) ;
					map.setEdgeId(map.phi2(dit), 1, EDGE) ;
				}
			}
			else if(t == 3)
			{
				map.setEdgeId(dit, 0, EDGE) ;
				map.setEdgeId(map.phi2(dit), 0, EDGE) ;
			}

			dit = map.phi1(dit);
		}while(dit != stop);

190
191
192
	}
	else
	{
193
194
195
196
197
		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);
198

199
200
		map.cutEdge(ne) ;
		unsigned int id = map.getNewEdgeId() ;
201
		map.setEdgeId(ne, id, EDGE) ;
202
		id = map.getNewEdgeId() ;
203
		map.setEdgeId(ne2, id, EDGE) ;
204

205
		//position[map.phi1(ne)] = p ;
206

207
208
209
210
211
212
		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)) ;
213

214
			id = map.getNewEdgeId() ;
215
			map.setEdgeId(nne, id, EDGE) ;
216
217
218
219
220

			dd = next ;
		}

		unsigned int idface = map.getFaceId(old);
221
		//Dart e = dd;
222
223
		do
		{
224
225
			map.setFaceId(dd, idface, DART) ;
			map.setFaceId(map.phi2(dd), idface, DART) ;
226
227
228
			dd = map.phi2(map.phi1(dd));
		}
		while(dd != ne);
229
230
231

		map.computeFaceVertexFunctor(map.phi1(ne));
		//position[map.phi1(ne)] = p ;
232
	}
233
234

	map.setCurrentLevel(cur) ;
235
236
}

untereiner's avatar
untereiner committed
237
template <typename PFP>
238
Dart subdivideVolumeClassic(typename PFP::MAP& map, Dart d, AttributeHandler<typename PFP::VEC3, VERTEX>& position)
untereiner's avatar
untereiner committed
239
240
241
{
	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") ;
Thery Sylvain's avatar
Thery Sylvain committed
242
	assert(!map.isBoundaryMarked3(d) || !"Trying to subdivide a dart marked boundary");
untereiner's avatar
untereiner committed
243
244
245
246
247
248
249

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

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

untereiner's avatar
untereiner committed
250
251
252
253
254
255
	//	//one level of subdivision in the neighbordhood
	//	Traversor3VW<typename PFP::MAP> trav3EW(map, old);
	//	for(Dart dit = trav3EW.begin() ; dit != trav3EW.end() ; dit = trav3EW.next())
	//	{
	//		Dart oldit = map.volumeOldestDart(dit);
	//		if(((vLevel+1) - map.volumeLevel(oldit)) > 1)
256
	//			IHM::subdivideVolumeClassic<PFP>(map, oldit, position);
untereiner's avatar
untereiner committed
257
	//	}
untereiner's avatar
untereiner committed
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279

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

Pierre Kraemer's avatar
Pierre Kraemer committed
280
	mf.markOrbit<FACE>(old) ;
untereiner's avatar
untereiner committed
281

282
	for(unsigned int i = 0; i < visitedFaces.size(); ++i)
untereiner's avatar
untereiner committed
283
	{
284
		Dart e = visitedFaces[i] ;
untereiner's avatar
untereiner committed
285
286
287
288
289
290
		do
		{
			//add one old edge per vertex to the old edge list
			//compute volume centroid
			if(!mv.isMarked(e))
			{
Pierre Kraemer's avatar
Pierre Kraemer committed
291
				mv.markOrbit<VERTEX>(e);
untereiner's avatar
untereiner committed
292
293
294
295
296
297
298
299
300
301
				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) ;
Pierre Kraemer's avatar
Pierre Kraemer committed
302
				mf.markOrbit<FACE>(ee) ;
untereiner's avatar
untereiner committed
303
304
305
			}

			e = map.phi1(e) ;
306
		} while(e != visitedFaces[i]) ;
untereiner's avatar
untereiner committed
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
	}

	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))
327
			IHM::subdivideFace<PFP>(map, d, position, IHM::S_QUAD);
untereiner's avatar
untereiner committed
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351

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

352
353
	Dart centralDart = NIL;

untereiner's avatar
untereiner committed
354

untereiner's avatar
untereiner committed
355
356
357
	//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
358
		Dart e = *edge;
359

untereiner's avatar
untereiner committed
360
361
362
		std::vector<Dart> v ;

		do
untereiner's avatar
untereiner committed
363
		{
untereiner's avatar
untereiner committed
364
			v.push_back(map.phi1(e));
365
			v.push_back(map.phi1(map.phi1(e)));
untereiner's avatar
untereiner committed
366

untereiner's avatar
untereiner committed
367
368
369
			e = map.phi2(map.phi_1(e));
		}
		while(e != *edge);
untereiner's avatar
untereiner committed
370

untereiner's avatar
untereiner committed
371
		map.splitVolume(v) ;
untereiner's avatar
untereiner committed
372

untereiner's avatar
untereiner committed
373
		Dart old = map.phi2(map.phi1(*edge));
untereiner's avatar
untereiner committed
374
375
376
		Dart dd = map.phi1(map.phi1(old)) ;
		map.splitFace(old,dd) ;

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

untereiner's avatar
untereiner committed
380
381
382
		Dart ne = map.phi1(map.phi1(old)) ;

		map.cutEdge(ne);
383
		//position[map.phi1(ne)] = volCenter; //plonger a la fin de la boucle ????
384
		centralDart = map.phi1(ne);
untereiner's avatar
untereiner committed
385
386
387
		newEdges.push_back(ne);
		newEdges.push_back(map.phi1(ne));

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

untereiner's avatar
untereiner committed
391
392
393
394
395
396
397
		Dart stop = map.phi2(map.phi1(ne));
		ne = map.phi2(ne);
		do
		{
			dd = map.phi1(map.phi1(map.phi1(ne)));

			map.splitFace(ne, dd) ;
398
399
			unsigned int idface = map.getNewFaceId();
			map.setFaceId(dd,idface, FACE);
untereiner's avatar
untereiner committed
400
401
402
403
404
405
406

			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
407

408
		//map.computeVertexVertexFunctor(e);
409
410
	}

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

untereiner's avatar
untereiner committed
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
	//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)
untereiner's avatar
untereiner committed
438
	DartMarkerStore mne(map);
untereiner's avatar
untereiner committed
439
440
441
442
443
444
	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);
Pierre Kraemer's avatar
Pierre Kraemer committed
445
			mne.markOrbit<EDGE>(newEdges[i]);
untereiner's avatar
untereiner committed
446
447
		}
	}
untereiner's avatar
untereiner committed
448

449
450
451
452
453
454
455
456
457
458
459
460
461
462
//	std::cout << map.getCurrentLevel() << std::endl;
//	//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;
		//std::cout << "emb ? " << map.template getEmbedding<VERTEX>(e) << std::endl;
		//if(map.template getEmbedding<VERTEX>(e) == EMBNULL)
		map.computeVertexVertexFunctor(e);
		//std::cout << "emb = " << map.template getEmbedding<VERTEX>(e) << " / dartlevel = " <<  map.getDartLevel(e) << std::endl;
	}
	std::cout << std::endl;

	map.computerVolumeVertexFunctor(centralDart);

untereiner's avatar
untereiner committed
463
464
	map.setCurrentLevel(cur) ;

465
	return centralDart; //subdividedfaces.begin()->first;
untereiner's avatar
untereiner committed
466
467
}

468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489

/************************************************************************************************
 * 									Simplification												*
 ************************************************************************************************/


template <typename PFP>
void coarsenEdge(typename PFP::MAP& map, Dart d, AttributeHandler<typename PFP::VEC3, VERTEX>& position)
{
	assert(map.getDartLevel(d) <= map.getCurrentLevel() || !"Access to a dart introduced after current level") ;
	assert(map.edgeCanBeCoarsened(d) || !"Trying to coarsen an edge that can not be coarsened") ;

	unsigned int cur = map.getCurrentLevel() ;
	map.setCurrentLevel(cur + 1) ;
	map.uncutEdge(d) ;
	map.setCurrentLevel(cur) ;
}

template <typename PFP>
void coarsenFace(typename PFP::MAP& map, Dart d, AttributeHandler<typename PFP::VEC3, VERTEX>& position, SubdivideType sType)
{
	assert(map.getDartLevel(d) <= map.getCurrentLevel() || !"Access to a dart introduced after current level") ;
490
	assert(map.faceCanBeCoarsened(d) || !"Trying to coarsen a non-subdivided face or a more than once subdivided face") ;
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

	unsigned int cur = map.getCurrentLevel() ;

	unsigned int degree = 0 ;
	Dart fit = d ;
	do
	{
		++degree ;
		fit = map.phi1(fit) ;
	} while(fit != d) ;

//	Dart d3 = map.phi3(d);

	if(degree == 3)
	{

	}
	else
	{
		map.setCurrentLevel(cur + 1) ;
		map.deleteVertexSubdividedFace(d);
		map.setCurrentLevel(cur) ;

//		Dart centralV = map.phi1(map.phi1(d));
//		map.Map2::deleteVertex(centralV);
//
//		//demarking faces from border to delete .... fucking shit
//		Dart it = d ;
//		do
//		{
//			if (map.boundaryUnmark(it))
//				return true ;
//			it = map.phi2(map.phi_1(it)) ;
//		} while (it != d) ;
//
//		map.Map2::deleteVertex(map.phi1(map.phi1(d3)));

	}

	fit = d ;
	do
	{
		if(map.edgeCanBeCoarsened(fit))
534
			IHM::coarsenEdge<PFP>(map, fit, position) ;
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
		fit = map.phi1(fit) ;
	} while(fit != d) ;
}

template <typename PFP>
void coarsenVolume(typename PFP::MAP& map, Dart d, AttributeHandler<typename PFP::VEC3, VERTEX>& position)
{
	assert(map.getDartLevel(d) <= map.getCurrentLevel() || !"Access to a dart introduced after current level") ;
	assert(map.volumeIsSubdividedOnce(d) || !"Trying to coarsen a non-subdivided volume or a more than once subdivided volume") ;

	unsigned int cur = map.getCurrentLevel() ;

	/*
	 * Deconnecter toutes les faces interieurs
	 */
	map.setCurrentLevel(cur + 1) ;
	Dart nf = map.phi_1(map.phi2(map.phi1(d)));
	map.deleteVertex(nf);
	map.setCurrentLevel(cur) ;

	/*
	 * simplifier les faces
	 */
untereiner's avatar
untereiner committed
558
	Traversor3WF<typename PFP::MAP> trav3WF(map, d, true);
559
560
561
	for(Dart dit = trav3WF.begin() ; dit != trav3WF.end() ; dit = trav3WF.next())
	{
		if(map.faceCanBeCoarsened(dit))
562
			IHM::coarsenFace<PFP>(map, dit, position, IHM::S_QUAD);
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
	}
}




/* **************************************************************************************
 *    							USE WITH CAUTION										*
 ****************************************************************************************/










untereiner's avatar
untereiner committed
582
template <typename PFP>
583
Dart subdivideVolumeClassic2(typename PFP::MAP& map, Dart d, AttributeHandler<typename PFP::VEC3, VERTEX>& position)
untereiner's avatar
untereiner committed
584
585
586
{
	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") ;
Thery Sylvain's avatar
Thery Sylvain committed
587
	assert(!map.isBoundaryMarked3(d) || !"Trying to subdivide a dart marked boundary");
untereiner's avatar
untereiner committed
588
589
590
591
592
593
594
595
596
597

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

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

	/*
	 * Compute volume centroid
	 */
598
	typename PFP::VEC3 volCenter =  Algo::Surface::Geometry::volumeCentroid<PFP>(map, old, position);
untereiner's avatar
untereiner committed
599

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

untereiner's avatar
untereiner committed
602
603
604
	/*
	 * Subdivide Faces
	 */
605
606
	std::vector<std::pair<Dart,Dart> > subdividedFaces;
	subdividedFaces.reserve(128);
untereiner's avatar
untereiner committed
607
608
609
610
611
612

	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))
613
			IHM::subdivideFace<PFP>(map, dit, position, IHM::S_QUAD);
untereiner's avatar
untereiner committed
614

615
		//save darts from the central vertex of each subdivided face
untereiner's avatar
untereiner committed
616
		unsigned int cur = map.getCurrentLevel() ;
617
618
619
		unsigned int fLevel = map.faceLevel(dit);
		map.setCurrentLevel(fLevel + 1) ;
		map.saveRelationsAroundVertex(map.phi2(map.phi1(dit)), subdividedFaces);
untereiner's avatar
untereiner committed
620
621
622
		map.setCurrentLevel(cur);
	}

623
624
625
626
	cur = map.getCurrentLevel() ;
	unsigned int fLevel = map.faceLevel(old);
	map.setCurrentLevel(fLevel + 1) ;
	map.unsewAroundVertex(subdividedFaces);
untereiner's avatar
untereiner committed
627
628
	map.setCurrentLevel(cur);

untereiner's avatar
untereiner committed
629
630
631
632
633
634
635
	/*
	 * Create inside volumes
	 */
	std::vector<Dart> newEdges;	//save darts from inner edges
	newEdges.reserve(50);
	Dart centralDart = NIL;

untereiner's avatar
untereiner committed
636
637
	//unsigned int degree = 0 ;
	//typename PFP::VEC3 volCenter ;
untereiner's avatar
untereiner committed
638

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

untereiner's avatar
untereiner committed
641
642
643
644
	for(Dart dit = traV.begin(); dit != traV.end(); dit = traV.next())
	{
		//volCenter += position[d];
		//++degree;
untereiner's avatar
untereiner committed
645

646
		centralDart = map.quadranguleFace(dit);
untereiner's avatar
untereiner committed
647
		position[centralDart] = volCenter;
untereiner's avatar
untereiner committed
648
	}
649
	//volCenter /= double(degree);
untereiner's avatar
untereiner committed
650

651
	for (std::vector<std::pair<Dart,Dart> >::iterator it = subdividedFaces.begin(); it != subdividedFaces.end(); ++it)
untereiner's avatar
untereiner committed
652
	{
653
654
		Dart f1 = map.phi2((*it).first);
		Dart f2 = map.phi2((*it).second);
untereiner's avatar
untereiner committed
655

656
		if(map.isBoundaryFace(f1) && map.isBoundaryFace(f2))
untereiner's avatar
untereiner committed
657
		{
658
659
			std::cout << "plop" << std::endl;
			map.sewVolumes(f1, f2, false);
untereiner's avatar
untereiner committed
660
661
662
		}
	}

untereiner's avatar
untereiner committed
663
	position[centralDart] = volCenter;
664
665


untereiner's avatar
untereiner committed
666
667


668
669
670
671
672
//	//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
673
//
untereiner's avatar
untereiner committed
674
//
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
//		if(map.isBoundaryFace(map.phi2(f1)) && map.isBoundaryFace(map.phi2(f2)))
//		{
//			std::cout << "boundary" << std::endl;
//			//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);
//	}
untereiner's avatar
untereiner committed
693
694
695
696
697
698
699
700
701
702

	//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);
Pierre Kraemer's avatar
Pierre Kraemer committed
703
			mne.markOrbit<EDGE>(newEdges[i]);
untereiner's avatar
untereiner committed
704
705
		}
	}
untereiner's avatar
untereiner committed
706
707
708


	//plonger a la fin de la boucle ????
untereiner's avatar
untereiner committed
709
710
711

	map.setCurrentLevel(cur) ;

712
	return subdividedFaces.front().first;
untereiner's avatar
untereiner committed
713

untereiner's avatar
untereiner committed
714
715
}

untereiner's avatar
untereiner committed
716
template <typename PFP>
717
void subdivideLoop(typename PFP::MAP& map, Dart d, AttributeHandler<typename PFP::VEC3, VERTEX>& position)
untereiner's avatar
untereiner committed
718
719
720
{
	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") ;
Thery Sylvain's avatar
Thery Sylvain committed
721
	assert(!map.isBoundaryMarked3(d) || !"Trying to subdivide a dart marked boundary");
untereiner's avatar
untereiner committed
722
723
724
725
726
727
728
729
730
731

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

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

	/*
	 * Compute volume centroid
	 */
732
	typename PFP::VEC3 volCenter =  Algo::Surface::Geometry::volumeCentroid<PFP>(map, old, position);
untereiner's avatar
untereiner committed
733
734
735
736
737
738
739
740
741
742
743
744

	/*
	 * 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))
745
			IHM::subdivideFace<PFP>(map, dit, position, IHM::S_TRI);
untereiner's avatar
untereiner committed
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783

		//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;
784
		Dart f1 = map.phi1(dit);
untereiner's avatar
untereiner committed
785
786
787
788
789
790
791
792
793
794
795
796
		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) ;

797
798
799
800
801
		for(std::vector<Dart>::iterator it = v.begin() ; it != v.end() ; ++it)
		{
			map.setEdgeId(*it,map.getEdgeId(*it), EDGE);
		}

untereiner's avatar
untereiner committed
802
		//if is not a tetrahedron
803
804
		unsigned int fdeg = map.faceDegree(map.phi2(f1));
		if(fdeg > 3)
untereiner's avatar
untereiner committed
805
806
807
808
809
810
811
812
813
814
815
		{
			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);
816
817
818
819

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

untereiner's avatar
untereiner committed
820
821
822
823
824
825
826
827
828
829
830
			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) ;

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

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

				ne = map.phi2(map.phi_1(ne));
				dd = map.phi1(dd);
			}
			while(dd != stop);
840
841
842
843

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

untereiner's avatar
untereiner committed
844
		}
845
846
847
848
849
		else
		{
			unsigned int idface = map.getNewFaceId();
			map.setFaceId(map.phi2(v.front()),idface, FACE);
		}
untereiner's avatar
untereiner committed
850
851
852
853
854
	}

	//switch inner faces
	if(isNotTet)
	{
855
		DartMarker me(map);
untereiner's avatar
untereiner committed
856
857
858
859
860
861
862
863
864
865

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

866
867
868
869
870
871
				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
872

873
					unsigned int idface = map.getNewFaceId();
874
875
876
877
878
879
880
881
882
					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
883

Pierre Kraemer's avatar
Pierre Kraemer committed
884
885
					me.markOrbit<EDGE>(f3);
					me.markOrbit<EDGE>(f32);
886
				}
untereiner's avatar
untereiner committed
887
888
889
890

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

892
		map.template setOrbitEmbedding<VERTEX>(centralDart, map.template getEmbedding<VERTEX>(centralDart));
untereiner's avatar
untereiner committed
893

894
895
		//Third step : 3-sew internal faces
		for (std::vector<std::pair<Dart,Dart> >::iterator it = subdividedfaces.begin(); it != subdividedfaces.end(); ++it)
896
		{
897
898
899
900
901
902
			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);
903
904
		}

905
	}
906

907
	map.setCurrentLevel(cur) ;
untereiner's avatar
untereiner committed
908
909
910
}


911
template <typename PFP>
912
Dart subdivideVolume(typename PFP::MAP& map, Dart d, AttributeHandler<typename PFP::VEC3, VERTEX>& position)
913
914
915
{
	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") ;
916
	//assert(!map.neighborhoodLevelDiffersByOne(d) || !"Trying to subdivide a volume with neighborhood Level difference greater than 1");
917

untereiner's avatar
ihm3    
untereiner committed
918
919
	unsigned int vLevel = map.volumeLevel(d);
	Dart old = map.volumeOldestDart(d);
920

untereiner's avatar
ihm3    
untereiner committed
921
922
	unsigned int cur = map.getCurrentLevel();
	map.setCurrentLevel(vLevel);
923
924

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

930
	DartMarkerStore mf(map);		// Lock a face marker to save one dart per face
931
	CellMarker<VERTEX> mv(map);
932
933
934

	typename PFP::VEC3 volCenter;
	unsigned count = 0 ;
935
936
937

	//Store faces that are traversed and start with the face of d
	std::vector<Dart> visitedFaces;
938
	visitedFaces.reserve(512);
939
940
941
942
	visitedFaces.push_back(old);

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

Pierre Kraemer's avatar
Pierre Kraemer committed
945
	mf.markOrbit<FACE>(old) ;
946

947
	for(unsigned int i = 0; i < visitedFaces.size(); ++i)
948
	{
949
		Dart e = visitedFaces[i] ;
950
		do
951
		{
untereiner's avatar
untereiner committed
952
			//add one old edge per vertex to the old edge list
953
954
955
			//compute volume centroid
			if(!mv.isMarked(e))
			{
untereiner's avatar
untereiner committed
956
				mv.mark(e);
957
958
959
960
				volCenter += position[e];
				++count;
				oldEdges.push_back(e);
			}
untereiner's avatar
untereiner committed
961

untereiner's avatar
untereiner committed
962
			// add all face neighbours to the table
963
964
965
966
			Dart ee = map.phi2(e) ;
			if(!mf.isMarked(ee)) // not already marked
			{
				visitedFaces.push_back(ee) ;
Pierre Kraemer's avatar
Pierre Kraemer committed
967
				mf.markOrbit<FACE>(ee) ;
968
			}
969

970
			e = map.phi1(e) ;
971
		} while(e != visitedFaces[i]) ;
972
973
	}

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

untereiner's avatar
untereiner committed
976
	/*
977
	 * Subdivision
untereiner's avatar
untereiner committed
978
	 */
979
980
981
	//type 'q' : quad et plus
	//type 't' : tri
	std::vector<std::pair<char, std::pair<Dart,Dart> > > subdividedfaces;
982
983
984
985
986
987
988

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

989
		//if needed subdivide face
untereiner's avatar
untereiner committed
990
		if(!map.faceIsSubdivided(d))
991
			IHM::subdivideFace<PFP>(map, d, position);
992

993

994
995
		//save a dart from the subdivided face
		unsigned int cur = map.getCurrentLevel() ;
untereiner's avatar
untereiner committed
996

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

1000
1001
		//test si la face est triangulaire ou non
		if(map.phi1(map.phi1(map.phi1(d))) == d)
1002
		{
untereiner's avatar
untereiner committed
1003
			//std::cout << "trian" << std::endl;
1004
1005
1006
1007
			Dart cf = map.phi2(map.phi1(d));
			Dart e = cf;
			do
			{
1008
1009
				std::pair<Dart,Dart> pd(e,map.phi2(e));
				subdividedfaces.push_back(std::pair<char, std::pair<Dart,Dart> > ('t',pd));
1010
1011
1012
1013
1014
				e = map.phi1(e);
			}while (e != cf);
		}
		else
		{
untereiner's avatar
untereiner committed
1015
			//std::cout << "quad" << std::endl;
1016
1017
1018
1019
			Dart cf = map.phi1(d);
			Dart e = cf;
			do
			{
1020
1021
				std::pair<Dart,Dart> pd(e,map.phi2(e));
				subdividedfaces.push_back(std::pair<char, std::pair<Dart,Dart> >('q',pd));
1022
1023
1024
				e = map.phi2(map.phi1(e));
			}while (e != cf);
		}
untereiner's avatar
untereiner committed
1025

1026
		map.setCurrentLevel(cur);
1027

1028
	}
untereiner's avatar
untereiner committed
1029

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

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

1035
	bool isocta = false;
1036
	bool ishex = false;
1037
1038
1039
1040
	bool isprism = false;
	bool ispyra = false;

	Dart centralDart = NIL;
1041

untereiner's avatar
untereiner committed
1042
1043
1044
1045
	//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;
1046
		std::vector<Dart> v ;
untereiner's avatar
untereiner committed
1047

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

untereiner's avatar
untereiner committed
1051
1052
1053
		do
		{
			if(map.phi1(map.phi1(map.phi1(e))) != e)
1054
				v.push_back(map.phi1(map.phi1(e)));
untereiner's avatar
untereiner committed
1055

1056
			v.push_back(map.phi1(e));
untereiner's avatar
untereiner committed
1057
1058
1059
1060
1061

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

1062
		map.splitVolume(v) ;
untereiner's avatar
untereiner committed
1063

1064
1065
		//fonction qui calcule le degree max des faces atour d'un sommet
		unsigned int fdeg = map.faceDegree(map.phi2(f1));
untereiner's avatar
untereiner committed
1066

1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
		if(fdeg == 3)
		{
			unsigned int idface = map.getNewFaceId();
			map.setFaceId(map.phi2(f1),idface, FACE);
		}
		else if(fdeg == 4)
		{
			std::cout << "== 4" << std::endl;

			if(map.PFP::MAP::ParentMap::vertexDegree(*edge) == 3)
			{
				isocta = false;
				ispyra = true;

				std::cout << "pyra" << std::endl;

				Dart it = *edge;
				if((map.faceDegree(it) == 3) && (map.faceDegree(map.phi2(it))) == 3)
				{
					it = map.phi2(map.phi_1(it));
				}
				else if((map.faceDegree(it) == 3) && (map.faceDegree(map.phi2(it)) == 4))
				{
					it = map.phi1(map.phi2(it));
				}

				Dart old = map.phi2(map.phi1(it));
				Dart dd = map.phi1(map.phi1(old));

				map.splitFace(old,dd) ;
				centralDart = old;

				newEdges.push_back(map.phi_1(old));
			}
			else
			{
				isocta = true;

				std::cout << "octa" << std::endl;

				Dart old = map.phi2(map.phi1(*edge));
				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 if(fdeg == 5)
		{
			std::cout << "== 5" << std::endl;

			isprism = true;

			Dart it = *edge;
			if(map.faceDegree(it) == 3)
			{
				it = map.phi2(map.phi_1(it));
			}
			else if(map.faceDegree(map.phi2(map.phi_1(*edge))) == 3)
			{
				it = map.phi2(map.phi_1(map.phi2(map.phi_1(it))));
			}

			Dart old = map.phi2(map.phi1(it));
			Dart dd = map.phi_1(map.phi_1(old));

			map.splitFace(old,dd) ;

			newEdges.push_back(map.phi_1(dd));
		}
		else if(fdeg == 6)
		{
			std::cout << "== 6" << std::endl;

			ishex = true;

			Dart old = map.phi2(map.phi1(e));
			Dart dd = map.phi1(map.phi1(old)) ;
			map.splitFace(old,dd) ;

			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);
			do
			{
				dd = map.phi1(map.phi1(map.phi1(ne)));

				//A Verifier !!
				map.splitFace(ne, dd) ;

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

				ne = map.phi2(map.phi_1(ne));
				dd = map.phi1(map.phi1(dd));
			}
			while(dd != stop);
		}
1192

1193
		break;
1194
1195
	}

1196
1197


1198
1199
1200
	if(ishex)
	{
		map.deleteVolume(map.phi3(map.phi2(map.phi1(oldEdges.front()))));
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243

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


			//if(map.phi3(map.phi2(f1)) == map.phi2(f1) && map.phi3(map.phi2(f2)) == map.phi2(f2))
			//if(map.phi3(f1) == f1 && map.phi3(f2) == f2)
			if(map.isBoundaryFace(f1) && map.isBoundaryFace(f2))
			{
				std::cout << "sewvolumes" << std::endl;

				map.sewVolumes(f1, 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(f1,idface, FACE);
			}

			//FAIS a la couture !!!!!!!
			//id pour toutes les aretes exterieurs des faces quadrangulees
			unsigned int idedge = map.getEdgeId(map.phi2(f1));
			map.setEdgeId(f1, idedge, DART);
			map.setEdgeId(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);
			}
		}
1244
1245
1246

	}

1247
	if(isocta)
1248
	{
1249
1250
1251

		DartMarker me(map);

1252
1253
1254
1255
1256
1257
1258
1259
1260
		for (std::vector<Dart>::iterator edge = oldEdges.begin(); edge != oldEdges.end(); ++edge)
		{
			Dart x = map.phi_1(map.phi2(map.phi1(*edge)));
			Dart f = x;

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

1261
1262
1263
1264
1265
1266
				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);
1267

1268
1269
1270
1271
					unsigned int idface = map.getNewFaceId();
					map.setFaceId(f3,idface, FACE);
					idface = map.getNewFaceId();
					map.setFaceId(f32,idface, FACE);
1272

1273
1274
1275
1276
1277
1278
1279
1280
1281
					unsigned int idedge = map.getNewEdgeId();
					map.setEdgeId(f3, idedge, EDGE);

					map.setEdgeId(f3,map.getEdgeId(f3), EDGE);
					map.setEdgeId(f32,map.getEdgeId(f32), EDGE);

					me.markOrbit<EDGE>(f3);
					me.markOrbit<EDGE>(f32);
				}