subdivision3.hpp 52.7 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
	Traversor2FE<typename PFP::MAP>  travE(map, old);
	for(Dart it = travE.begin(); it != travE.end() ; it = travE.next())
104
105
106
	{
		++degree;
		p += position[it] ;
untereiner's avatar
untereiner committed
107

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

untereiner's avatar
untereiner committed
113

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

116
	Dart res;
117

118
	if(degree == 3 && sType == IHM::S_TRI)	//subdiviser une face triangulaire
119
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
	{
		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) ;
untereiner's avatar
untereiner committed
147
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

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

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

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

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

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

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

			dd = next ;
		}

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

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

	map.setCurrentLevel(cur) ;
234
235
}

untereiner's avatar
untereiner committed
236
template <typename PFP>
237
238
//Dart subdivideVolumeClassic(typename PFP::MAP& map, Dart d, AttributeHandler<typename PFP::VEC3, VERTEX>& position)
Dart subdivideVolumeClassic(typename PFP::MAP& map, Dart d, Algo::Volume::IHM::AttributeHandler_IHM<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
	Dart centralDart = NIL;
untereiner's avatar
untereiner committed
353
354
355
	//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
356
		Dart e = *edge;
357

untereiner's avatar
untereiner committed
358
359
360
		std::vector<Dart> v ;

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

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

untereiner's avatar
untereiner committed
369
		map.splitVolume(v) ;
untereiner's avatar
untereiner committed
370

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

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

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

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

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

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

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

			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
405

406
		//map.computeVertexVertexFunctor(e);
407
408
	}

untereiner's avatar
untereiner committed
409

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

untereiner's avatar
untereiner committed
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
	//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
437
	DartMarkerStore mne(map);
untereiner's avatar
untereiner committed
438
439
440
441
442
443
	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
444
			mne.markOrbit<EDGE>(newEdges[i]);
untereiner's avatar
untereiner committed
445
446
		}
	}
untereiner's avatar
untereiner committed
447

448
449
450
451
452
//	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;
453
454
		if(e == 309)
			std::cout << "plop" << std::endl;
455
456
457
458
459
460
461
		//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;

462
	//map.computerVolumeVertexFunctor(centralDart);
463

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

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

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

/************************************************************************************************
 * 									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") ;
491
	assert(map.faceCanBeCoarsened(d) || !"Trying to coarsen a non-subdivided face or a more than once subdivided face") ;
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534

	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))
535
			IHM::coarsenEdge<PFP>(map, fit, position) ;
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
		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
559
	Traversor3WF<typename PFP::MAP> trav3WF(map, d, true);
560
561
562
	for(Dart dit = trav3WF.begin() ; dit != trav3WF.end() ; dit = trav3WF.next())
	{
		if(map.faceCanBeCoarsened(dit))
563
			IHM::coarsenFace<PFP>(map, dit, position, IHM::S_QUAD);
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
	}
}




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










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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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


untereiner's avatar
untereiner committed
667
668


669
670
671
672
673
//	//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
674
//
untereiner's avatar
untereiner committed
675
//
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
//		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
694
695
696
697
698
699
700
701
702
703

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


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

	map.setCurrentLevel(cur) ;

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

untereiner's avatar
untereiner committed
715
716
}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

906
	}
907

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


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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

994

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

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

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

1027
		map.setCurrentLevel(cur);
1028

1029
	}
untereiner's avatar
untereiner committed
1030

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

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

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

	Dart centralDart = NIL;
1042

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

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

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

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

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

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

1065
1066
		//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
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
1192
		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);
		}
1193

1194
		break;
1195
1196
	}

1197
1198


1199
1200
1201
	if(ishex)
	{
		map.deleteVolume(map.phi3(map.phi2(map.phi1(oldEdges.front()))));
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
1244

		//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);
			}
		}
1245
1246
1247

	}

1248
	if(isocta)
1249
	{
1250
1251
1252

		DartMarker me(map);

1253
1254
1255
1256
1257
1258
1259
1260
1261
		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);

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

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

1274
1275
1276
1277
1278
1279
1280
1281
1282
					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);
				}
1283
1284
1285

				f = map.phi2(map.phi_1(f));
			}while(f != x);
untereiner's avatar