subdivision3.hpp 51.1 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

	position[map.phi1(d)] = (p1 + p2) * typename PFP::REAL(0.5) ;
69
	//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
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
	{
		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
	{
151
152
153
154
155
		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);
156

157
158
		map.cutEdge(ne) ;
		unsigned int id = map.getNewEdgeId() ;
159
		map.setEdgeId(ne, id, EDGE) ;
160
		id = map.getNewEdgeId() ;
161
		map.setEdgeId(ne2, id, EDGE) ;
162

untereiner's avatar
untereiner committed
163
		position[map.phi1(ne)] = p ;
164
		//map.computeFaceVertexFunctor(map.phi1(ne));
165

166
167
168
169
170
171
		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)) ;
172

173
			id = map.getNewEdgeId() ;
174
			map.setEdgeId(nne, id, EDGE) ;
175
176
177
178
179

			dd = next ;
		}

		unsigned int idface = map.getFaceId(old);
180
		//Dart e = dd;
181
182
		do
		{
183
184
			map.setFaceId(dd, idface, DART) ;
			map.setFaceId(map.phi2(dd), idface, DART) ;
185
186
187
			dd = map.phi2(map.phi1(dd));
		}
		while(dd != ne);
188
	}
189
190

	map.setCurrentLevel(cur) ;
191
192
}

untereiner's avatar
untereiner committed
193
template <typename PFP>
194
Dart subdivideVolumeClassic(typename PFP::MAP& map, Dart d, AttributeHandler<typename PFP::VEC3, VERTEX>& position)
untereiner's avatar
untereiner committed
195
196
197
{
	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
198
	assert(!map.isBoundaryMarked3(d) || !"Trying to subdivide a dart marked boundary");
untereiner's avatar
untereiner committed
199
200
201
202
203
204
205

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

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

untereiner's avatar
untereiner committed
206
207
208
209
210
211
	//	//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)
212
	//			IHM::subdivideVolumeClassic<PFP>(map, oldit, position);
untereiner's avatar
untereiner committed
213
	//	}
untereiner's avatar
untereiner committed
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235

	/*
	 * 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
236
	mf.markOrbit<FACE>(old) ;
untereiner's avatar
untereiner committed
237

238
	for(unsigned int i = 0; i < visitedFaces.size(); ++i)
untereiner's avatar
untereiner committed
239
	{
240
		Dart e = visitedFaces[i] ;
untereiner's avatar
untereiner committed
241
242
243
244
245
246
		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
247
				mv.markOrbit<VERTEX>(e);
untereiner's avatar
untereiner committed
248
249
250
251
252
253
254
255
256
257
				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
258
				mf.markOrbit<FACE>(ee) ;
untereiner's avatar
untereiner committed
259
260
261
			}

			e = map.phi1(e) ;
262
		} while(e != visitedFaces[i]) ;
untereiner's avatar
untereiner committed
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
	}

	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))
283
			IHM::subdivideFace<PFP>(map, d, position, IHM::S_QUAD);
untereiner's avatar
untereiner committed
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307

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

308
309
	Dart centralDart = NIL;

untereiner's avatar
untereiner committed
310

untereiner's avatar
untereiner committed
311
312
313
314
	//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
315
316
317
318
		Dart e = *edge;
		std::vector<Dart> v ;

		do
untereiner's avatar
untereiner committed
319
		{
untereiner's avatar
untereiner committed
320
321
			v.push_back(map.phi1(map.phi1(e)));
			v.push_back(map.phi1(e));
untereiner's avatar
untereiner committed
322

untereiner's avatar
untereiner committed
323
324
325
			e = map.phi2(map.phi_1(e));
		}
		while(e != *edge);
untereiner's avatar
untereiner committed
326

untereiner's avatar
untereiner committed
327
		map.splitVolume(v) ;
untereiner's avatar
untereiner committed
328

untereiner's avatar
untereiner committed
329
		Dart old = map.phi2(map.phi1(*edge));
untereiner's avatar
untereiner committed
330
331
332
		Dart dd = map.phi1(map.phi1(old)) ;
		map.splitFace(old,dd) ;

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

untereiner's avatar
untereiner committed
336
337
338
339
		Dart ne = map.phi1(map.phi1(old)) ;

		map.cutEdge(ne);
		position[map.phi1(ne)] = volCenter; //plonger a la fin de la boucle ????
340
		centralDart = map.phi1(ne);
untereiner's avatar
untereiner committed
341
342
343
		newEdges.push_back(ne);
		newEdges.push_back(map.phi1(ne));

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

untereiner's avatar
untereiner committed
347
348
349
350
351
352
353
		Dart stop = map.phi2(map.phi1(ne));
		ne = map.phi2(ne);
		do
		{
			dd = map.phi1(map.phi1(map.phi1(ne)));

			map.splitFace(ne, dd) ;
354
355
			unsigned int idface = map.getNewFaceId();
			map.setFaceId(dd,idface, FACE);
untereiner's avatar
untereiner committed
356
357
358
359
360
361
362

			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
363

364
365
	}

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

untereiner's avatar
untereiner committed
368
369
	//map.computerVolumeVertexFunctor(oldEdges.front());

untereiner's avatar
untereiner committed
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
	//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
395
	DartMarkerStore mne(map);
untereiner's avatar
untereiner committed
396
397
398
399
400
401
	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
402
			mne.markOrbit<EDGE>(newEdges[i]);
untereiner's avatar
untereiner committed
403
404
		}
	}
untereiner's avatar
untereiner committed
405
406
407

	map.setCurrentLevel(cur) ;

408
	return centralDart; //subdividedfaces.begin()->first;
untereiner's avatar
untereiner committed
409
410
}

411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432

/************************************************************************************************
 * 									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") ;
433
	assert(map.faceCanBeCoarsened(d) || !"Trying to coarsen a non-subdivided face or a more than once subdivided face") ;
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476

	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))
477
			IHM::coarsenEdge<PFP>(map, fit, position) ;
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
		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
501
	Traversor3WF<typename PFP::MAP> trav3WF(map, d, true);
502
503
504
	for(Dart dit = trav3WF.begin() ; dit != trav3WF.end() ; dit = trav3WF.next())
	{
		if(map.faceCanBeCoarsened(dit))
505
			IHM::coarsenFace<PFP>(map, dit, position, IHM::S_QUAD);
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
	}
}




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










untereiner's avatar
untereiner committed
525
template <typename PFP>
526
Dart subdivideVolumeClassic2(typename PFP::MAP& map, Dart d, AttributeHandler<typename PFP::VEC3, VERTEX>& position)
untereiner's avatar
untereiner committed
527
528
529
{
	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
530
	assert(!map.isBoundaryMarked3(d) || !"Trying to subdivide a dart marked boundary");
untereiner's avatar
untereiner committed
531
532
533
534
535
536
537
538
539
540

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

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

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

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

untereiner's avatar
untereiner committed
545
546
547
	/*
	 * Subdivide Faces
	 */
548
549
	std::vector<std::pair<Dart,Dart> > subdividedFaces;
	subdividedFaces.reserve(128);
untereiner's avatar
untereiner committed
550
551
552
553
554
555

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

558
		//save darts from the central vertex of each subdivided face
untereiner's avatar
untereiner committed
559
		unsigned int cur = map.getCurrentLevel() ;
560
561
562
		unsigned int fLevel = map.faceLevel(dit);
		map.setCurrentLevel(fLevel + 1) ;
		map.saveRelationsAroundVertex(map.phi2(map.phi1(dit)), subdividedFaces);
untereiner's avatar
untereiner committed
563
564
565
		map.setCurrentLevel(cur);
	}

566
567
568
569
	cur = map.getCurrentLevel() ;
	unsigned int fLevel = map.faceLevel(old);
	map.setCurrentLevel(fLevel + 1) ;
	map.unsewAroundVertex(subdividedFaces);
untereiner's avatar
untereiner committed
570
571
	map.setCurrentLevel(cur);

untereiner's avatar
untereiner committed
572
573
574
575
576
577
578
	/*
	 * Create inside volumes
	 */
	std::vector<Dart> newEdges;	//save darts from inner edges
	newEdges.reserve(50);
	Dart centralDart = NIL;

untereiner's avatar
untereiner committed
579
580
	//unsigned int degree = 0 ;
	//typename PFP::VEC3 volCenter ;
untereiner's avatar
untereiner committed
581

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

untereiner's avatar
untereiner committed
584
585
586
587
	for(Dart dit = traV.begin(); dit != traV.end(); dit = traV.next())
	{
		//volCenter += position[d];
		//++degree;
untereiner's avatar
untereiner committed
588

589
		centralDart = map.quadranguleFace(dit);
untereiner's avatar
untereiner committed
590
		position[centralDart] = volCenter;
untereiner's avatar
untereiner committed
591
	}
592
	//volCenter /= double(degree);
untereiner's avatar
untereiner committed
593

594
	for (std::vector<std::pair<Dart,Dart> >::iterator it = subdividedFaces.begin(); it != subdividedFaces.end(); ++it)
untereiner's avatar
untereiner committed
595
	{
596
597
		Dart f1 = map.phi2((*it).first);
		Dart f2 = map.phi2((*it).second);
untereiner's avatar
untereiner committed
598

599
		if(map.isBoundaryFace(f1) && map.isBoundaryFace(f2))
untereiner's avatar
untereiner committed
600
		{
601
602
			std::cout << "plop" << std::endl;
			map.sewVolumes(f1, f2, false);
untereiner's avatar
untereiner committed
603
604
605
		}
	}

untereiner's avatar
untereiner committed
606
	position[centralDart] = volCenter;
607
608


untereiner's avatar
untereiner committed
609
610


611
612
613
614
615
//	//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
616
//
untereiner's avatar
untereiner committed
617
//
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
//		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
636
637
638
639
640
641
642
643
644
645

	//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
646
			mne.markOrbit<EDGE>(newEdges[i]);
untereiner's avatar
untereiner committed
647
648
		}
	}
untereiner's avatar
untereiner committed
649
650
651


	//plonger a la fin de la boucle ????
untereiner's avatar
untereiner committed
652
653
654

	map.setCurrentLevel(cur) ;

655
	return subdividedFaces.front().first;
untereiner's avatar
untereiner committed
656

untereiner's avatar
untereiner committed
657
658
}

untereiner's avatar
untereiner committed
659
template <typename PFP>
660
void subdivideLoop(typename PFP::MAP& map, Dart d, AttributeHandler<typename PFP::VEC3, VERTEX>& position)
untereiner's avatar
untereiner committed
661
662
663
{
	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
664
	assert(!map.isBoundaryMarked3(d) || !"Trying to subdivide a dart marked boundary");
untereiner's avatar
untereiner committed
665
666
667
668
669
670
671
672
673
674

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

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

	/*
	 * Compute volume centroid
	 */
675
	typename PFP::VEC3 volCenter =  Algo::Surface::Geometry::volumeCentroid<PFP>(map, old, position);
untereiner's avatar
untereiner committed
676
677
678
679
680
681
682
683
684
685
686
687

	/*
	 * 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))
688
			IHM::subdivideFace<PFP>(map, dit, position, IHM::S_TRI);
untereiner's avatar
untereiner committed
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

		//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;
727
		Dart f1 = map.phi1(dit);
untereiner's avatar
untereiner committed
728
729
730
731
732
733
734
735
736
737
738
739
		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) ;

740
741
742
743
744
		for(std::vector<Dart>::iterator it = v.begin() ; it != v.end() ; ++it)
		{
			map.setEdgeId(*it,map.getEdgeId(*it), EDGE);
		}

untereiner's avatar
untereiner committed
745
		//if is not a tetrahedron
746
747
		unsigned int fdeg = map.faceDegree(map.phi2(f1));
		if(fdeg > 3)
untereiner's avatar
untereiner committed
748
749
750
751
752
753
754
755
756
757
758
		{
			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);
759
760
761
762

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

untereiner's avatar
untereiner committed
763
764
765
766
767
768
769
770
771
772
773
			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) ;

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

untereiner's avatar
untereiner committed
777
778
779
780
781
782
				newEdges.push_back(map.phi1(dd));

				ne = map.phi2(map.phi_1(ne));
				dd = map.phi1(dd);
			}
			while(dd != stop);
783
784
785
786

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

untereiner's avatar
untereiner committed
787
		}
788
789
790
791
792
		else
		{
			unsigned int idface = map.getNewFaceId();
			map.setFaceId(map.phi2(v.front()),idface, FACE);
		}
untereiner's avatar
untereiner committed
793
794
795
796
797
	}

	//switch inner faces
	if(isNotTet)
	{
798
		DartMarker me(map);
untereiner's avatar
untereiner committed
799
800
801
802
803
804
805
806
807
808

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

809
810
811
812
813
814
				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
815

816
					unsigned int idface = map.getNewFaceId();
817
818
819
820
821
822
823
824
825
					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
826

Pierre Kraemer's avatar
Pierre Kraemer committed
827
828
					me.markOrbit<EDGE>(f3);
					me.markOrbit<EDGE>(f32);
829
				}
untereiner's avatar
untereiner committed
830
831
832
833

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

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

837
838
		//Third step : 3-sew internal faces
		for (std::vector<std::pair<Dart,Dart> >::iterator it = subdividedfaces.begin(); it != subdividedfaces.end(); ++it)
839
		{
840
841
842
843
844
845
			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);
846
847
		}

848
	}
849

850
	map.setCurrentLevel(cur) ;
untereiner's avatar
untereiner committed
851
852
853
}


854
template <typename PFP>
855
Dart subdivideVolume(typename PFP::MAP& map, Dart d, AttributeHandler<typename PFP::VEC3, VERTEX>& position)
856
857
858
{
	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") ;
859
	//assert(!map.neighborhoodLevelDiffersByOne(d) || !"Trying to subdivide a volume with neighborhood Level difference greater than 1");
860

untereiner's avatar
ihm3    
untereiner committed
861
862
	unsigned int vLevel = map.volumeLevel(d);
	Dart old = map.volumeOldestDart(d);
863

untereiner's avatar
ihm3    
untereiner committed
864
865
	unsigned int cur = map.getCurrentLevel();
	map.setCurrentLevel(vLevel);
866
867

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

873
	DartMarkerStore mf(map);		// Lock a face marker to save one dart per face
874
	CellMarker<VERTEX> mv(map);
875
876
877

	typename PFP::VEC3 volCenter;
	unsigned count = 0 ;
878
879
880

	//Store faces that are traversed and start with the face of d
	std::vector<Dart> visitedFaces;
881
	visitedFaces.reserve(512);
882
883
884
885
	visitedFaces.push_back(old);

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

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

890
	for(unsigned int i = 0; i < visitedFaces.size(); ++i)
891
	{
892
		Dart e = visitedFaces[i] ;
893
		do
894
		{
untereiner's avatar
untereiner committed
895
			//add one old edge per vertex to the old edge list
896
897
898
			//compute volume centroid
			if(!mv.isMarked(e))
			{
untereiner's avatar
untereiner committed
899
				mv.mark(e);
900
901
902
903
				volCenter += position[e];
				++count;
				oldEdges.push_back(e);
			}
untereiner's avatar
untereiner committed
904

untereiner's avatar
untereiner committed
905
			// add all face neighbours to the table
906
907
908
909
			Dart ee = map.phi2(e) ;
			if(!mf.isMarked(ee)) // not already marked
			{
				visitedFaces.push_back(ee) ;
Pierre Kraemer's avatar
Pierre Kraemer committed
910
				mf.markOrbit<FACE>(ee) ;
911
			}
912

913
			e = map.phi1(e) ;
914
		} while(e != visitedFaces[i]) ;
915
916
	}

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

untereiner's avatar
untereiner committed
919
	/*
920
	 * Subdivision
untereiner's avatar
untereiner committed
921
	 */
922
923
924
	//type 'q' : quad et plus
	//type 't' : tri
	std::vector<std::pair<char, std::pair<Dart,Dart> > > subdividedfaces;
925
926
927
928
929
930
931

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

932
		//if needed subdivide face
untereiner's avatar
untereiner committed
933
		if(!map.faceIsSubdivided(d))
934
			IHM::subdivideFace<PFP>(map, d, position);
935

936

937
938
		//save a dart from the subdivided face
		unsigned int cur = map.getCurrentLevel() ;
untereiner's avatar
untereiner committed
939

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

943
944
		//test si la face est triangulaire ou non
		if(map.phi1(map.phi1(map.phi1(d))) == d)
945
		{
untereiner's avatar
untereiner committed
946
			//std::cout << "trian" << std::endl;
947
948
949
950
			Dart cf = map.phi2(map.phi1(d));
			Dart e = cf;
			do
			{
951
952
				std::pair<Dart,Dart> pd(e,map.phi2(e));
				subdividedfaces.push_back(std::pair<char, std::pair<Dart,Dart> > ('t',pd));
953
954
955
956
957
				e = map.phi1(e);
			}while (e != cf);
		}
		else
		{
untereiner's avatar
untereiner committed
958
			//std::cout << "quad" << std::endl;
959
960
961
962
			Dart cf = map.phi1(d);
			Dart e = cf;
			do
			{
963
964
				std::pair<Dart,Dart> pd(e,map.phi2(e));
				subdividedfaces.push_back(std::pair<char, std::pair<Dart,Dart> >('q',pd));
965
966
967
				e = map.phi2(map.phi1(e));
			}while (e != cf);
		}
untereiner's avatar
untereiner committed
968

969
		map.setCurrentLevel(cur);
970

971
	}
untereiner's avatar
untereiner committed
972

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

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

978
	bool isocta = false;
979
	bool ishex = false;
980
981
982
983
	bool isprism = false;
	bool ispyra = false;

	Dart centralDart = NIL;
984

untereiner's avatar
untereiner committed
985
986
987
988
	//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;
989
		std::vector<Dart> v ;
untereiner's avatar
untereiner committed
990

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

untereiner's avatar
untereiner committed
994
995
996
		do
		{
			if(map.phi1(map.phi1(map.phi1(e))) != e)
997
				v.push_back(map.phi1(map.phi1(e)));
untereiner's avatar
untereiner committed
998

999
			v.push_back(map.phi1(e));
untereiner's avatar
untereiner committed
1000
1001
1002
1003
1004

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

1005
		map.splitVolume(v) ;
untereiner's avatar
untereiner committed
1006

1007
1008
		//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
1009

1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
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
1062
1063
1064
1065
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
		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);
		}
1135

1136
		break;
1137
1138
	}

1139
1140


1141
1142
1143
	if(ishex)
	{
		map.deleteVolume(map.phi3(map.phi2(map.phi1(oldEdges.front()))));
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

		//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);
			}
		}
1187
1188
1189

	}

1190
	if(isocta)
1191
	{
1192
1193
1194

		DartMarker me(map);

1195
1196
1197
1198
1199
1200
1201
1202
1203
		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);

1204
1205
1206
1207
1208
1209
				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);
1210

1211
1212
1213
1214
					unsigned int idface = map.getNewFaceId();
					map.setFaceId(f3,idface, FACE);
					idface = map.getNewFaceId();
					map.setFaceId(f32,idface, FACE);
1215

1216
1217
1218
1219
1220
1221
1222
1223
1224
					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);
				}
1225
1226
1227

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

1230
		map.template setOrbitEmbedding<VERTEX>(centralDart, map.template getEmbedding<VERTEX>(centralDart));
1231

1232
1233
1234
1235
1236
1237
1238
1239
		//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 );
			unsigned int idedge = map.getEdgeId(f1);
			map.setEdgeId(f1, idedge, EDGE);
			map.setEdgeId(f2, idedge, EDGE);
1240
1241
1242
1243
1244
		}

	}


1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
	if(isprism)
	{
		//map.deleteVolume(map.phi3(map.phi2(map.phi1(oldEdges.front()))));
//		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(ispyra)
	{
1257

1258
	}
1259
1260


1261
//	{
1262
1263
1264
1265
1266
//	//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;
1267
//
1268
1269
1270
1271
1272
//		//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);
1273
//
1274
//	}