subdivision3.hpp 37.9 KB
Newer Older
1 2 3
/*******************************************************************************
* CGoGN: Combinatorial and Geometric modeling with Generic N-dimensional Maps  *
* version 0.1                                                                  *
4
* Copyright (C) 2009-2011, IGG Team, LSIIT, University of Strasbourg           *
5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
*                                                                              *
* This library is free software; you can redistribute it and/or modify it      *
* under the terms of the GNU Lesser General Public License as published by the *
* Free Software Foundation; either version 2.1 of the License, or (at your     *
* option) any later version.                                                   *
*                                                                              *
* This library is distributed in the hope that it will be useful, but WITHOUT  *
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or        *
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License  *
* for more details.                                                            *
*                                                                              *
* You should have received a copy of the GNU Lesser General Public License     *
* along with this library; if not, write to the Free Software Foundation,      *
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.           *
*                                                                              *
20
* Web site: http://cgogn.u-strasbg.fr/                                         *
21 22 23 24 25 26
* Contact information: cgogn@unistra.fr                                        *
*                                                                              *
*******************************************************************************/

#include "Algo/Geometry/centroid.h"
#include "Algo/Modelisation/subdivision.h"
27
#include "Algo/Modelisation/extrusion.h"
28 29 30 31 32 33 34

namespace CGoGN
{

namespace Algo
{

untereiner's avatar
untereiner committed
35
namespace IHM
36 37
{

untereiner's avatar
untereiner committed
38

39 40 41 42 43
template <typename PFP>
void subdivideEdge(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position)
{
	assert(map.getDartLevel(d) <= map.getCurrentLevel() || !"Access to a dart introduced after current level") ;
	assert(!map.edgeIsSubdivided(d) || !"Trying to subdivide an already subdivided edge") ;
44
	assert(!map.isBoundaryMarked(d) || !"Trying to subdivide a dart marked boundary");
45 46 47 48 49 50 51 52 53 54 55 56 57 58

	unsigned int eLevel = map.edgeLevel(d) ;

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

	Dart dd = map.phi2(d) ;
	typename PFP::VEC3 p1 = position[d] ;
	typename PFP::VEC3 p2 = position[map.phi1(d)] ;

	map.setCurrentLevel(eLevel + 1) ;

	map.cutEdge(d) ;
	unsigned int eId = map.getEdgeId(d) ;
59 60
	map.setEdgeId(map.phi1(d), eId, EDGE) ; //mise a jour de l'id d'arrete sur chaque moitie d'arete
	map.setEdgeId(map.phi1(dd), eId, EDGE) ;
61

62

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

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

68

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

template <typename PFP>
73
void subdivideFace(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position, SubdivideType sType)
74 75 76
{
	assert(map.getDartLevel(d) <= map.getCurrentLevel() || !"Access to a dart introduced after current level") ;
	assert(!map.faceIsSubdivided(d) || !"Trying to subdivide an already subdivided face") ;
77
	assert(!map.isBoundaryMarked(d) || !"Trying to subdivide a dart marked boundary");
78 79 80 81 82 83 84 85 86 87 88 89 90 91 92

	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

	unsigned int degree = 0 ;
	typename PFP::VEC3 p ;
	Dart it = old ;
	do
	{
		++degree;
		p += position[it] ;
		if(!map.edgeIsSubdivided(it))							// first cut the edges (if they are not already)
untereiner's avatar
untereiner committed
93
			Algo::IHM::subdivideEdge<PFP>(map, it, position) ;	// and compute the degree of the face
94 95 96 97 98 99
		it = map.phi1(it) ;
	} while(it != old) ;
	p /= typename PFP::REAL(degree) ;

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

100
	Dart res;
101

102
	if(degree == 3 && sType == Algo::IHM::S_TRI)	//subdiviser une face triangulaire
103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133
	{
		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
	{
134 135 136 137 138
		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);
139

140 141
		map.cutEdge(ne) ;
		unsigned int id = map.getNewEdgeId() ;
142
		map.setEdgeId(ne, id, EDGE) ;
143
		id = map.getNewEdgeId() ;
144
		map.setEdgeId(ne2, id, EDGE) ;
145

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

148 149 150 151 152 153
		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)) ;
154

155
			id = map.getNewEdgeId() ;
156
			map.setEdgeId(nne, id, EDGE) ;
157 158 159 160 161

			dd = next ;
		}

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

	map.setCurrentLevel(cur) ;
173 174
}

untereiner's avatar
untereiner committed
175 176 177 178 179
template <typename PFP>
Dart subdivideVolumeClassic(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position)
{
	assert(map.getDartLevel(d) <= map.getCurrentLevel() || !"Access to a dart introduced after current level") ;
	assert(!map.volumeIsSubdivided(d) || !"Trying to subdivide an already subdivided volume") ;
180
	assert(!map.isBoundaryMarked(d) || !"Trying to subdivide a dart marked boundary");
untereiner's avatar
untereiner committed
181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211

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

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


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

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

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

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

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

	mf.markOrbit(FACE, old) ;

212
	for(unsigned int i = 0; i < visitedFaces.size(); ++i)
untereiner's avatar
untereiner committed
213
	{
214
		Dart e = visitedFaces[i] ;
untereiner's avatar
untereiner committed
215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235
		do
		{
			//add one old edge per vertex to the old edge list
			//compute volume centroid
			if(!mv.isMarked(e))
			{
				mv.markOrbit(VERTEX, e);
				volCenter += position[e];
				++count;
				oldEdges.push_back(e);
			}

			// add all face neighbours to the table
			Dart ee = map.phi2(e) ;
			if(!mf.isMarked(ee)) // not already marked
			{
				visitedFaces.push_back(ee) ;
				mf.markOrbit(FACE, ee) ;
			}

			e = map.phi1(e) ;
236
		} while(e != visitedFaces[i]) ;
untereiner's avatar
untereiner committed
237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281
	}

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

	/*
	 * Subdivision
	 */

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

	//First step : subdivide edges and faces
	//creates a i+1 edge level and i+1 face level
	for (std::vector<Dart>::iterator face = visitedFaces.begin(); face != visitedFaces.end(); ++face)
	{
		Dart d = *face;

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

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

		unsigned int fLevel = map.faceLevel(d) + 1; //puisque dans tous les cas, la face est subdivisee
		map.setCurrentLevel(fLevel) ;

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

		map.setCurrentLevel(cur);
	}

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

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

untereiner's avatar
untereiner committed
282 283 284
//	DartMarker mSplitted(map);
//
//	int i = 0;
untereiner's avatar
untereiner committed
285

untereiner's avatar
untereiner committed
286 287 288
	//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
289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311
//		std::vector<Dart> v ;
//		Dart e = map.beginSplittingPath(*edge, mSplitted);
//
//		std::cout << "e = " << e << "plop" << std::endl;
//
//		//Tous les brins ont deja ete decousus, il n'y a pas de chemin d'arete a construire
//		if(e == NIL)
//		{
//			return NIL;
//		}
//		else
//		{
//			map.constructSplittingPath(e, v, mSplitted);
//		}
//
//		std::cout << std::endl;
//		for(std::vector<Dart>::iterator it = v.begin() ; it != v.end() ; ++it)
//			std::cout << *it << std::endl;
//		std::cout << std::endl;
//
//		i++;
//		if(i == 2)
//			return NIL;
untereiner's avatar
untereiner committed
312

untereiner's avatar
untereiner committed
313
		Dart e = *edge;
untereiner's avatar
untereiner committed
314

untereiner's avatar
untereiner committed
315 316 317
		std::vector<Dart> v ;

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

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

untereiner's avatar
untereiner committed
326 327 328 329
//		std::cout << "begin" << std::endl;
//		for(std::vector<Dart>::iterator it = v.begin() ; it != v.end() ; ++it)
//			std::cout << *it << std::endl;
//		std::cout << "finished" << std::endl;
untereiner's avatar
untereiner committed
330

untereiner's avatar
untereiner committed
331
		map.splitVolume(v) ;
untereiner's avatar
untereiner committed
332

untereiner's avatar
untereiner committed
333
		Dart old = map.phi2(map.phi1(*edge));
untereiner's avatar
untereiner committed
334 335 336
		Dart dd = map.phi1(map.phi1(old)) ;
		map.splitFace(old,dd) ;

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

untereiner's avatar
untereiner committed
340 341 342 343 344 345 346
		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));

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

untereiner's avatar
untereiner committed
350 351 352 353 354 355 356
		Dart stop = map.phi2(map.phi1(ne));
		ne = map.phi2(ne);
		do
		{
			dd = map.phi1(map.phi1(map.phi1(ne)));

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

			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
366

367 368
	}

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

untereiner's avatar
untereiner committed
371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405
	//Third step : 3-sew internal faces
	for (std::vector<std::pair<Dart,Dart> >::iterator it = subdividedfaces.begin(); it != subdividedfaces.end(); ++it)
	{
		Dart f1 = (*it).first;
		Dart f2 = (*it).second;

		if(map.isBoundaryFace(map.phi2(f1)) && map.isBoundaryFace(map.phi2(f2)))
		{
			//id pour toutes les faces interieures
			map.sewVolumes(map.phi2(f1), map.phi2(f2));

			//Fais a la couture !!!!!
			unsigned int idface = map.getNewFaceId();
			map.setFaceId(map.phi2(f1),idface, FACE);
		}

		//FAIS a la couture !!!!!!!
		//id pour toutes les aretes exterieurs des faces quadrangulees
		unsigned int idedge = map.getEdgeId(f1);
		map.setEdgeId(map.phi2(f1), idedge, DART);
		map.setEdgeId( map.phi2(f2), idedge, DART);
	}

	//LA copie de L'id est a gerer avec le sewVolumes normalement !!!!!!
	//id pour les aretes interieurs : (i.e. 6 pour un hexa)
	DartMarker mne(map);
	for(unsigned int i = 0; i < newEdges.size(); ++i)
	{
		if(!mne.isMarked(newEdges[i]))
		{
			unsigned int idedge = map.getNewEdgeId();
			map.setEdgeId(newEdges[i], idedge, EDGE);
			mne.markOrbit(EDGE, newEdges[i]);
		}
	}
untereiner's avatar
untereiner committed
406 407 408 409 410 411

	map.setCurrentLevel(cur) ;

	return subdividedfaces.begin()->first;
}

412
template <typename PFP>
413
Dart subdivideVolumeGen(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position)
414 415 416 417
{
	assert(map.getDartLevel(d) <= map.getCurrentLevel() || !"Access to a dart introduced after current level") ;
	assert(!map.volumeIsSubdivided(d) || !"Trying to subdivide an already subdivided volume") ;

untereiner's avatar
ihm3  
untereiner committed
418 419
	unsigned int vLevel = map.volumeLevel(d);
	Dart old = map.volumeOldestDart(d);
420

untereiner's avatar
ihm3  
untereiner committed
421 422
	unsigned int cur = map.getCurrentLevel();
	map.setCurrentLevel(vLevel);
423 424

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

430
	DartMarkerStore mf(map);		// Lock a face marker to save one dart per face
untereiner's avatar
untereiner committed
431
	CellMarker mv(map, VERTEX);
432 433 434

	typename PFP::VEC3 volCenter;
	unsigned count = 0 ;
435 436 437

	//Store faces that are traversed and start with the face of d
	std::vector<Dart> visitedFaces;
438
	visitedFaces.reserve(512);
439 440 441 442
	visitedFaces.push_back(old);

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

445
	mf.markOrbit(FACE, old) ;
446

447
	for(unsigned int i = 0; i < visitedFaces.size(); ++i)
448
	{
449
		Dart e = visitedFaces[i] ;
450
		do
451
		{
untereiner's avatar
untereiner committed
452
			//add one old edge per vertex to the old edge list
453 454 455
			//compute volume centroid
			if(!mv.isMarked(e))
			{
untereiner's avatar
untereiner committed
456
				mv.mark(e);
457 458 459 460
				volCenter += position[e];
				++count;
				oldEdges.push_back(e);
			}
untereiner's avatar
untereiner committed
461

untereiner's avatar
untereiner committed
462
			// add all face neighbours to the table
463 464 465 466
			Dart ee = map.phi2(e) ;
			if(!mf.isMarked(ee)) // not already marked
			{
				visitedFaces.push_back(ee) ;
467
				mf.markOrbit(FACE, ee) ;
468
			}
469

470
			e = map.phi1(e) ;
471
		} while(e != visitedFaces[i]) ;
472 473
	}

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

untereiner's avatar
untereiner committed
476
	/*
477
	 * Subdivision
untereiner's avatar
untereiner committed
478 479
	 */
	//Store the darts from quadrangulated faces
480 481 482 483 484 485
	std::vector<std::pair<Dart,Dart> > subdividedfacesQ;
	subdividedfacesQ.reserve(25);

	std::vector<std::pair<Dart,Dart> > subdividedfacesT;
	subdividedfacesT.reserve(25);

486 487 488 489 490 491 492

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

493
		//if needed subdivide face
untereiner's avatar
untereiner committed
494
		if(!map.faceIsSubdivided(d))
untereiner's avatar
untereiner committed
495
			Algo::IHM::subdivideFace<PFP>(map, d, position);
496

497

498 499
		//save a dart from the subdivided face
		unsigned int cur = map.getCurrentLevel() ;
untereiner's avatar
untereiner committed
500

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

untereiner's avatar
untereiner committed
504

505 506 507

		//test si la face est triangulaire ou non
		if(map.phi1(map.phi1(map.phi1(d))) == d)
508
		{
untereiner's avatar
untereiner committed
509
			//std::cout << "trian" << std::endl;
510 511 512 513 514 515 516 517 518 519
			Dart cf = map.phi2(map.phi1(d));
			Dart e = cf;
			do
			{
				subdividedfacesT.push_back(std::pair<Dart,Dart>(e,map.phi2(e)));
				e = map.phi1(e);
			}while (e != cf);
		}
		else
		{
untereiner's avatar
untereiner committed
520
			//std::cout << "quad" << std::endl;
521 522 523 524 525 526 527 528 529 530
			Dart cf = map.phi1(d);
			Dart e = cf;
			do
			{
				subdividedfacesQ.push_back(std::pair<Dart,Dart>(e,map.phi2(e)));
				e = map.phi2(map.phi1(e));
			}while (e != cf);


		}
untereiner's avatar
untereiner committed
531

532 533
		map.setCurrentLevel(cur);
	}
untereiner's avatar
untereiner committed
534

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

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

untereiner's avatar
untereiner committed
540 541 542 543 544
	//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;

545
		std::vector<Dart> v ;
untereiner's avatar
untereiner committed
546 547 548 549

		do
		{
			if(map.phi1(map.phi1(map.phi1(e))) != e)
550
				v.push_back(map.phi1(map.phi1(e))); //remplacer par une boucle qui découd toute la face et non juste une face carre (jusqu'a phi_1(e))
untereiner's avatar
untereiner committed
551

552
			v.push_back(map.phi1(e));
untereiner's avatar
untereiner committed
553 554 555 556 557

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

558
		map.splitVolume(v) ;
untereiner's avatar
untereiner committed
559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669

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

		//tourner autour du sommet pour connaitre le brin d'un sommet de valence < cornerDegree
		bool found = false;
		Dart stop = e;
		do
		{

			if(map.Map2::vertexDegree(map.phi2(map.phi1(e))) < cornerDegree)
			{
				stop = map.phi2(map.phi1(e));
				found = true;
			}

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

		//si il existe un sommet de degre inferieur au degree du coin
		if(found)
		{
			//chercher le brin de faible degree suivant
			bool found2 = false;
			Dart dd = map.phi1(stop);

			do
			{
				if(map.Map2::vertexDegree(dd) < cornerDegree)
					found2 = true;
				else
					dd = map.phi1(dd);
			}
			while(!found2);

			//cas de la pyramide
			if(dd == stop)
			{
				//std::cout << "pyramide" << std::endl;
				map.splitFace(dd, map.phi1(map.phi1(dd)));
			}
			else
			{
				map.splitFace(dd, stop);

				//calcul de la taille des faces de chaque cote de stop
				if(!( (map.Map2::faceDegree(map.phi_1(stop)) == 3 && map.Map2::faceDegree(map.phi2(map.phi_1(stop))) == 4) ||
						(map.Map2::faceDegree(map.phi_1(stop)) == 4 && map.Map2::faceDegree(map.phi2(map.phi_1(stop))) == 3) ))
				{
					//std::cout << "octaedre ou hexaedre" << std::endl;

					Dart ne = map.phi_1(stop) ;
					map.cutEdge(ne);
					position[map.phi1(ne)] = volCenter;
					stop = map.phi2(map.phi1(ne));

					bool finished = false;
					Dart it = map.phi2(ne);

					do
					{
						//chercher le brin de faible degree suivant
						bool found2 = false;
						Dart dd = map.phi1(it);

						do
						{
							if(dd == stop)
								finished = true;
							else if(map.Map2::vertexDegree(dd) < cornerDegree)
								found2 = true;
							else
								dd = map.phi1(dd);
						}
						while(!found2 & !finished);

						if(found2)
						{
							map.splitFace(it,dd);
						}

						it = map.phi_1(dd);

						if(it == stop)
							finished = true;

					}
					while(!finished);

				}
				else
				{
					//std::cout << "prisme" << std::endl;
					//tester si besoin de fermer f2 (par exemple pas besoin pour hexa... mais pour tet, octa, prisme oui)
					//map.closeHole(f2);
				}

			}

		}
		//sinon cas du tetraedre
		else
		{
			//std::cout << "tetraedre" << std::endl;
			//tester si besoin de fermer f2 (par exemple pas besoin pour hexa... mais pour tet, octa, prisme oui)
			//map.closeHole(f2);
		}

	}

670 671 672



untereiner's avatar
untereiner committed
673 674 675 676 677 678 679
	//std::cout << "1ere etape finished" << std::endl;

	CellMarker mtf(map, FACE);

	//Etape 2
	for (std::vector<std::pair<Dart,Dart> >::iterator edges = subdividedfacesT.begin(); edges != subdividedfacesT.end(); ++edges)
	{
untereiner's avatar
untereiner committed
680
//		Dart f1 = (*edges).first;
untereiner's avatar
untereiner committed
681 682
		Dart f2 = (*edges).second;

683 684 685
		//si ce n'est pas un tetrahedre
		if( !( (map.Map2::faceDegree(f2) == 3 && map.Map2::faceDegree(map.phi2(f2)) == 3 &&
				map.Map2::faceDegree(map.phi2(map.phi_1(f2))) == 3) && map.Map2::vertexDegree(f2) == 3))
untereiner's avatar
untereiner committed
686 687
		{

688
			//map.deleteVolume(map.phi3(map.phi2(map.phi1(oldEdges.front()))));
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 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747
//			if(!mtf.isMarked(f1))
//			{
//				mtf.mark(f1);
//
//				map.closeHole(f1);
//
//				if(map.Map2::faceDegree(map.phi2(f2)) == 3)
//				{
//					//std::cout << "ajout d'un tetraedre" << std::endl;
//					Dart x = Algo::Modelisation::trianguleFace<PFP>(map, map.phi2(f1));
//					position[x] = volCenter;
//				}
//				else
//				{
//					//std::cout << "ajout d'un prisme" << std::endl;
//					//Dart x = Algo::Modelisation::extrudeFace<PFP>(map,position,map.phi2(f1),5.0);
//					Dart c = Algo::Modelisation::trianguleFace<PFP>(map, map.phi2(f1));
//
//					Dart cc = c;
//					// cut edges
//					do
//					{
//
//						typename PFP::VEC3 p1 = position[cc] ;
//						typename PFP::VEC3 p2 = position[map.phi1(cc)] ;
//
//						map.cutEdge(cc);
//
//						position[map.phi1(cc)] = (p1 + p2) * typename PFP::REAL(0.5) ;
//
//						cc = map.phi2(map.phi_1(cc));
//					}while (cc != c);
//
//					// cut faces
//					do
//					{
//						Dart d1 = map.phi1(cc);
//						Dart d2 = map.phi_1(cc);
//						map.splitFace(d1,d2);
//						cc = map.phi2(map.phi_1(cc));//map.Map2::alpha1(cc);
//					}while (cc != c);
//
//					//merge central faces by removing edges
//					bool notFinished=true;
//					do
//					{
//						Dart d1 = map.Map2::alpha1(cc);
//						if (d1 == cc)			// last edge is pending edge inside of face
//							notFinished = false;
//						map.deleteFace(cc);
//						cc = d1;
//					} while (notFinished);
//
//
//					map.closeHole(map.phi1(map.phi1(map.phi2(f1))));
//
//				}
//			}
untereiner's avatar
untereiner committed
748 749 750 751 752 753 754

		}
	}

	//std::cout << "2e etape finished" << std::endl;


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 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865
//	{
//		//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;
//
//
//
//			if(map.phi3(map.phi2(f1)) == map.phi2(f1) && map.phi3(map.phi2(f2)) == map.phi2(f2))
//			{
//				if(map.getEmbedding(VERTEX, map.phi_1(map.phi2(f2))) == map.getEmbedding(VERTEX, map.phi_1(map.phi2(f1))))
//				{
//					map.Map3::sewVolumes(map.phi2(f2), map.phi2(f1));
//				}
//				else
//				{
//
//				//id pour toutes les faces interieures
//				map.sewVolumes(map.phi2(f2), map.phi2(f1));
//
//
//				}
//
//				//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. 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);
//			}
//		}
//	}
//
//	{
//		//Third step : 3-sew internal faces
//		for (std::vector<std::pair<Dart,Dart> >::iterator it = subdividedfacesQ.begin(); it != subdividedfacesQ.end(); ++it)
//		{
//			Dart f1 = (*it).first;
//			Dart f2 = (*it).second;
//
//			if(map.phi3(map.phi2(f1)) == map.phi2(f1) && map.phi3(map.phi2(f2)) == map.phi2(f2))
//			{
//				//id pour toutes les faces interieures
//				map.sewVolumes(map.phi2(f2), map.phi2(f1));
//
//				//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. 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);
//			}
//		}
//	}
//
//	//cas tordu pour le prisme
//	for (std::vector<std::pair<Dart,Dart> >::iterator it = subdividedfacesT.begin(); it != subdividedfacesT.end(); ++it)
//	{
//		Dart f1 = (*it).first;
//		Dart f2 = (*it).second;
//
//		if(  !(map.Map2::faceDegree(f2) == 3 && map.Map2::faceDegree(map.phi2(f2)) == 3 &&
//				map.Map2::faceDegree(map.phi2(map.phi1(f2))) == 3 && map.Map2::faceDegree(map.phi2(map.phi_1(f2))) == 3))
//		{
//
//
//			if(map.phi2(map.phi1(map.phi1(map.phi2(f1)))) == map.phi3(map.phi2(map.phi1(map.phi1(map.phi2(f1))))) &&
//					map.phi2(map.phi3(map.phi2(map.phi3(map.phi2(map.phi3(map.phi2(map.phi2(map.phi1(map.phi1(map.phi2(f1))))))))))) ==
//							map.phi3(map.phi2(map.phi3(map.phi2(map.phi3(map.phi2(map.phi3(map.phi2(map.phi2(map.phi1(map.phi1(map.phi2(f1))))))))))))
//			)
//			{
//				map.sewVolumes(map.phi2(map.phi1(map.phi1(map.phi2(f1)))),
//						map.phi2(map.phi3(map.phi2(map.phi3(map.phi2(map.phi3(map.phi1(map.phi1(map.phi2(f1))))))))));
//			}
//
//		}
//	}
untereiner's avatar
untereiner committed
866 867 868

	map.setCurrentLevel(cur) ;

869
	return subdividedfacesQ.begin()->first;
870
}
untereiner's avatar
untereiner committed
871

untereiner's avatar
untereiner committed
872

873

874
template <typename PFP>
875
Dart subdivideVolume(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position)
876
{
untereiner's avatar
untereiner committed
877 878
	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") ;
879
	assert(!map.neighborhoodLevelDiffersByOne(d) || !"Trying to subdivide a volume with neighborhood Level difference greater than 1");
untereiner's avatar
untereiner committed
880

881 882
	unsigned int vLevel = map.volumeLevel(d);
	Dart old = map.volumeOldestDart(d);
untereiner's avatar
untereiner committed
883

884 885
	unsigned int cur = map.getCurrentLevel();
	map.setCurrentLevel(vLevel);
untereiner's avatar
untereiner committed
886

untereiner's avatar
untereiner committed
887 888 889 890 891
	/*
	 * au niveau du volume courant i
	 * stockage d'un brin de chaque face de celui-ci
	 * avec calcul du centroid
	 */
untereiner's avatar
untereiner committed
892

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

untereiner's avatar
untereiner committed
896 897
	typename PFP::VEC3 volCenter;
	unsigned count = 0 ;
untereiner's avatar
untereiner committed
898

untereiner's avatar
untereiner committed
899 900
	//Store faces that are traversed and start with the face of d
	std::vector<Dart> visitedFaces;
901
	visitedFaces.reserve(512);
untereiner's avatar
untereiner committed
902
	visitedFaces.push_back(old);
untereiner's avatar
untereiner committed
903

untereiner's avatar
untereiner committed
904 905 906
	//Store the edges before the cutEdge
	std::vector<Dart> oldEdges;
	oldEdges.reserve(20);
untereiner's avatar
untereiner committed
907

908
	mf.markOrbit(FACE, old) ;
untereiner's avatar
untereiner committed
909

910
	for(unsigned int i = 0; i < visitedFaces.size(); ++i)
911
	{
912
		Dart e = visitedFaces[i] ;
untereiner's avatar
untereiner committed
913 914 915 916 917 918
		do
		{
			//add one old edge per vertex to the old edge list
			//compute volume centroid
			if(!mv.isMarked(e))
			{
919
				mv.mark(e);
untereiner's avatar
untereiner committed
920 921 922 923 924 925 926 927 928 929
				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) ;
930
				mf.markOrbit(FACE, ee) ;
untereiner's avatar
untereiner committed
931 932 933
			}

			e = map.phi1(e) ;
934
		} while(e != visitedFaces[i]) ;
935 936
	}

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

untereiner's avatar
untereiner committed
939 940 941 942
	/*
	 * Subdivision
	 */
	//Store the darts from quadrangulated faces
943 944
	std::vector<std::pair<Dart,Dart> > subdividedfacesQ;
	subdividedfacesQ.reserve(25);
945

946 947
	std::vector<std::pair<Dart,Dart> > subdividedfacesT;
	subdividedfacesT.reserve(25);
untereiner's avatar
untereiner committed
948 949


950 951 952 953 954
	//First step : subdivide edges and faces
	//creates a i+1 edge level and i+1 face level
	for (std::vector<Dart>::iterator face = visitedFaces.begin(); face != visitedFaces.end(); ++face)
	{
		Dart d = *face;
untereiner's avatar
untereiner committed
955

956 957 958
		//if needed subdivide face
		if(!map.faceIsSubdivided(d))
			Algo::IHM::subdivideFace<PFP>(map, d, position);
untereiner's avatar
untereiner committed
959

960 961 962 963 964 965 966 967 968 969 970 971

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

		unsigned int fLevel = map.faceLevel(d) + 1; //puisque dans tous les cas, la face est subdivisee
		map.setCurrentLevel(fLevel) ;



		//test si la face est triangulaire ou non
		if(map.phi1(map.phi1(map.phi1(d))) == d)
		{
972
			//std::cout << "trian" << std::endl;
untereiner's avatar
untereiner committed
973 974 975 976
			Dart cf = map.phi2(map.phi1(d));
			Dart e = cf;
			do
			{
977
				subdividedfacesT.push_back(std::pair<Dart,Dart>(e,map.phi2(e)));
untereiner's avatar
untereiner committed
978 979
				e = map.phi1(e);
			}while (e != cf);
980 981 982
		}
		else
		{
983
			//std::cout << "quad" << std::endl;
984 985 986 987 988 989 990 991
			Dart cf = map.phi1(d);
			Dart e = cf;
			do
			{
				subdividedfacesQ.push_back(std::pair<Dart,Dart>(e,map.phi2(e)));
				e = map.phi2(map.phi1(e));
			}while (e != cf);

untereiner's avatar
untereiner committed
992 993 994

		}

995
		map.setCurrentLevel(cur);
untereiner's avatar
untereiner committed
996

997
	}
untereiner's avatar
untereiner committed
998

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

1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014
	std::vector<Dart> newEdges;	//save darts from inner edges
	newEdges.reserve(50);

	bool istet = true;

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

		Dart f1 = map.phi1(*edge);
		Dart f2 = map.phi2(f1);

		do
untereiner's avatar
untereiner committed
1015
		{
1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027
			if(map.phi1(map.phi1(map.phi1(e))) != e)
				map.unsewFaces(map.phi1(map.phi1(e)));

			map.unsewFaces(map.phi1(e));


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

		map.closeHole(f1);

untereiner's avatar
untereiner committed
1028

1029
		//fonction qui calcule le degree max des faces atour d'un sommet
1030 1031 1032 1033 1034 1035 1036 1037
		unsigned int fdeg = map.faceDegree(map.phi2(f1));


		if(fdeg > 4)
		{
			Dart old = map.phi2(map.phi1(e));
			Dart dd = map.phi1(map.phi1(old)) ;
			map.splitFace(old,dd) ;
untereiner's avatar
untereiner committed
1038

1039 1040 1041 1042 1043 1044 1045 1046 1047 1048
			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);
untereiner's avatar
untereiner committed
1049 1050
			do
			{
1051
				dd = map.phi1(map.phi1(map.phi1(ne)));
untereiner's avatar
untereiner committed
1052

1053 1054
				//A Verifier !!
				map.splitFace(ne, dd) ;
untereiner's avatar
untereiner committed
1055

1056
				newEdges.push_back(map.phi1(dd));
untereiner's avatar
untereiner committed
1057

1058 1059 1060 1061 1062 1063 1064
				ne = map.phi2(map.phi_1(ne));
				dd = map.phi1(map.phi1(dd));
			}
			while(dd != stop);
		}
		else if(fdeg > 3)
		{
untereiner's avatar
untereiner committed
1065 1066 1067
			map.closeHole(f2);
			map.sewVolumes(map.phi2(f1),map.phi2(f2));

1068 1069 1070 1071
			istet = false;
			Dart old = map.phi2(map.phi1(*edge));
			Dart dd = map.phi1(old) ;
			map.splitFace(old,dd) ;
untereiner's avatar
untereiner committed
1072

1073
			Dart ne = map.phi1(old);
untereiner's avatar
untereiner committed
1074

1075 1076 1077 1078
			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));
untereiner's avatar
untereiner committed
1079

1080 1081 1082 1083 1084
			Dart stop = map.phi2(map.phi1(ne));
			ne = map.phi2(ne);
			do
			{
				dd = map.phi1(map.phi1(ne));
untereiner's avatar
untereiner committed
1085

1086
				map.splitFace(ne, dd) ;
untereiner's avatar
untereiner committed
1087

1088
				newEdges.push_back(map.phi1(dd));
untereiner's avatar
untereiner committed
1089

1090 1091
				ne = map.phi2(map.phi_1(ne));
				dd = map.phi1(dd);
untereiner's avatar
untereiner committed
1092
			}
1093 1094 1095 1096 1097
			while(dd != stop);
		}
		else
		{
			map.closeHole(f2);
1098
			map.sewVolumes(map.phi2(f1),map.phi2(f2));
untereiner's avatar
untereiner committed
1099

1100 1101
			unsigned int idface = map.getNewFaceId();
			map.setFaceId(map.phi2(f1),idface, FACE);
untereiner's avatar
untereiner committed
1102 1103
		}

1104 1105 1106 1107 1108
	}

	if(!istet)
	{
		for (std::vector<Dart>::iterator edge = oldEdges.begin(); edge != oldEdges.end(); ++edge)
untereiner's avatar
untereiner committed
1109
		{
1110
			Dart e = *edge;
untereiner's avatar
untereiner committed
1111

1112 1113
			Dart x = map.phi_1(map.phi2(map.phi1(*edge)));
			Dart f = x;
untereiner's avatar
untereiner committed
1114

1115 1116 1117 1118
			do
			{
				Dart f3 = map.phi3(f);
				Dart tmp =  map.phi_1(map.phi2(map.phi_1(map.phi2(map.phi_1(f3)))));
untereiner's avatar
untereiner committed
1119

1120 1121 1122
				map.unsewFaces(f3);
				map.unsewFaces(tmp);
				map.sewFaces(f3, tmp);
untereiner's avatar
untereiner committed
1123

1124 1125
				unsigned int idface = map.getNewFaceId();
				map.setFaceId(map.phi2(f3),idface, FACE);
untereiner's avatar
untereiner committed
1126 1127


1128 1129
				f = map.phi2(map.phi_1(f));
			}while(f != x);
untereiner's avatar
untereiner committed
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
	}

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

		//FAIS a la couture !!!!!!!
		//id pour toutes les aretes exterieurs des faces quadrangulees
		unsigned int idedge = map.getEdgeId(f1);
		map.setEdgeId(map.phi2(f1), idedge, DART);
		map.setEdgeId( map.phi2(f2), idedge, DART);

	}

	//LA copie de L'id est a gerer avec le sewVolumes normalement !!!!!!
	//id pour les aretes interieurs : (i.e. 16 pour un octa)
	DartMarker mne(map);
	for(std::vector<Dart>::iterator it = newEdges.begin() ; it != newEdges.end() ; ++it)
	{
		if(!mne.isMarked(*it))
untereiner's avatar
untereiner committed
1156
		{
1157 1158
			unsigned int idedge = map.getNewEdgeId();
			map.setEdgeId(*it, idedge, EDGE);
1159
			mne.markOrbit(EDGE, *it);
1160 1161 1162
		}
	}
	}
untereiner's avatar
untereiner committed
1163

1164 1165 1166 1167 1168 1169
	{
	//Third step : 3-sew internal faces
	for (std::vector<std::pair<Dart,Dart> >::iterator it = subdividedfacesQ.begin(); it != subdividedfacesQ.end(); ++it)
	{
		Dart f1 = (*it).first;
		Dart f2 = (*it).second;
untereiner's avatar
untereiner committed
1170

1171 1172 1173 1174 1175 1176 1177 1178
		if(map.phi3(map.phi2(f1)) == map.phi2(f1) && map.phi3(map.phi2(f2)) == 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);
untereiner's avatar
untereiner committed
1179 1180
		}

1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193
		//FAIS a la couture !!!!!!!
		//id pour toutes les aretes exterieurs des faces quadrangulees
		unsigned int idedge = map.getEdgeId(f1);
		map.setEdgeId(map.phi2(f1), idedge, DART);
		map.setEdgeId( map.phi2(f2), idedge, DART);
	}

	//LA copie de L'id est a gerer avec le sewVolumes normalement !!!!!!
	//id pour les aretes interieurs : (i.e. 6 pour un hexa)
	DartMarker mne(map);
	for(std::vector<Dart>::iterator it = newEdges.begin() ; it != newEdges.end() ; ++it)
	{
		if(!mne.isMarked(*it))
untereiner's avatar
untereiner committed
1194
		{
1195 1196
			unsigned int idedge = map.getNewEdgeId();
			map.setEdgeId(*it, idedge, EDGE);
1197
			mne.markOrbit(EDGE, *it);
untereiner's avatar
untereiner committed
1198
		}
1199 1200
	}
	}
untereiner's avatar
untereiner committed
1201

1202
	map.setCurrentLevel(cur) ;
untereiner's avatar
untereiner committed
1203

1204
	return subdividedfacesQ.begin()->first;
1205 1206
}

untereiner's avatar
untereiner committed
1207

1208

1209 1210 1211 1212

/************************************************************************************************
 * 									Simplification												*
 ************************************************************************************************/
1213 1214


untereiner's avatar
untereiner committed
1215 1216 1217 1218 1219 1220 1221 1222
template <typename PFP>
void coarsenEdge(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position)
{
	assert(map.getDartLevel(d) <= map.getCurrentLevel() || !"Access to a dart introduced after current level") ;
	assert(map.edgeCanBeCoarsened(d) || !"Trying to coarsen an edge that can not be coarsened") ;

	unsigned int cur = map.getCurrentLevel() ;
	map.setCurrentLevel(cur + 1) ;
untereiner's avatar
untereiner committed
1223
	map.uncutEdge(d) ;
untereiner's avatar
untereiner committed
1224 1225 1226 1227
	map.setCurrentLevel(cur) ;
}

template <typename PFP>
1228
void coarsenFace(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position, SubdivideType sType)
untereiner's avatar
untereiner committed
1229 1230
{
	assert(map.getDartLevel(d) <= map.getCurrentLevel() || !"Access to a dart introduced after current level") ;
untereiner's avatar
untereiner committed
1231
	assert(map.faceIsSubdividedOnce(d) || !"Trying to coarsen a non-subdivided face or a more than once subdivided face") ;
untereiner's avatar
untereiner committed
1232

untereiner's avatar
untereiner committed
1233 1234 1235 1236 1237 1238 1239 1240 1241 1242
	unsigned int cur = map.getCurrentLevel() ;

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

untereiner's avatar
untereiner committed
1243 1244 1245 1246 1247
	// boucler sur d avec phi2(phi_1()) et faire des unsewvolumes
	// delete le vertex sur d
	// si le volume d'a cote n'est pas subdiv
	// alors delete le vertex aussi
	// recouture du tout
1248

untereiner's avatar
untereiner committed
1249
	Dart d3 = map.phi3(d);
1250

untereiner's avatar
untereiner committed
1251
	map.setCurrentLevel(cur + 1) ;
untereiner's avatar
untereiner committed
1252

untereiner's avatar
untereiner committed
1253 1254 1255 1256 1257 1258
	Dart centralV = map.phi1(map.phi1(d));
	//Tester si il y a un volume voisin
	if(d != d3)
	{
		//on decoud
		Dart it = centralV;
1259

untereiner's avatar
untereiner committed
1260
		do
1261
		{
untereiner's avatar
untereiner committed
1262 1263 1264
			map.unsewVolumes(it);
			it = map.phi2(map.phi_1(it));
		}while(it != centralV);
1265

untereiner's avatar
untereiner committed
1266 1267 1268 1269
		//Si ce volume voisin n'est pas subdivise
		if(!map.volumeIsSubdivided(d3))
			//alors on supprime le sommet en face
			map.Map2::deleteVertex(map.phi1(map.phi1(d3)));
1270 1271 1272

	}

untereiner's avatar
untereiner committed
1273 1274
	//On supprime le sommet sur la face du volume courant
	map.Map2::deleteVertex(centralV);
1275

untereiner's avatar
untereiner committed
1276 1277
	if(d != d3)
		map.sewVolumes(d,map.phi1(d3));
1278

untereiner's avatar
untereiner committed
1279
	map.setCurrentLevel(cur) ;
untereiner's avatar
untereiner committed
1280 1281 1282 1283 1284 1285 1286 1287
}

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

untereiner's avatar
untereiner committed
1288 1289
	unsigned int cur = map.getCurrentLevel() ;

1290 1291
	std::cout << "cur = " << cur << std::endl;

untereiner's avatar
untereiner committed
1292 1293 1294 1295 1296 1297 1298 1299 1300
	/*
	 * au niveau du volume courant i
	 * stockage d'un brin de chaque face de celui-ci
	 */

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

	//Store faces that are traversed and start with the face of d
	std::vector<Dart> visitedFaces;
1301
	visitedFaces.reserve(512);
untereiner's avatar
untereiner committed
1302 1303
	visitedFaces.push_back(d);

1304
	mf.markOrbit(FACE, d) ;
untereiner's avatar
untereiner committed
1305

1306
	for(unsigned int i = 0; i < visitedFaces.size(); ++i)
untereiner's avatar
untereiner committed
1307
	{
1308
		Dart e = visitedFaces[i] ;
untereiner's avatar
untereiner committed
1309 1310 1311 1312 1313 1314 1315
		do
		{
			// add all face neighbours to the table
			Dart ee = map.phi2(e) ;
			if(!mf.isMarked(ee)) // not already marked
			{
				visitedFaces.push_back(ee) ;
1316
				mf.markOrbit(FACE, ee) ;
untereiner's avatar
untereiner committed
1317 1318 1319
			}

			e = map.phi1(e) ;
1320
		} while(e != visitedFaces[i]) ;
untereiner's avatar
untereiner committed
1321 1322 1323
	}

	/*
1324
	 * Deconnecter toutes les faces interieurs
untereiner's avatar
untereiner committed
1325
	 */
untereiner's avatar
untereiner committed
1326 1327 1328 1329
	map.setCurrentLevel(cur + 1) ;
	Dart nf = map.phi_1(map.phi2(map.phi1(d)));
	map.deleteVertex(nf);
	map.setCurrentLevel(cur) ;
1330

untereiner's avatar
untereiner committed
1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346
//	for(std::vector<Dart>::iterator face = visitedFaces.begin(); face != visitedFaces.end(); ++face)
//	{
//		Dart fit = *face;
//
//		do
//		{
//			map.setCurrentLevel(cur + 1) ;
//
//			Dart nf = map.phi2(map.phi1(fit));
//			if(map.getDartLevel(map.faceOldestDart(nf)) != cur)
//				map.mergeVolumes(nf);
//
//			map.setCurrentLevel(cur) ;
//			fit = map.phi1(fit);
//		}while(fit != *face);
//	}
untereiner's avatar
untereiner committed
1347 1348 1349 1350

	/*
	 * simplifier les faces
	 */
untereiner's avatar
untereiner committed
1351
	//std::vector<Dart>::iterator face = visitedFaces.begin();
untereiner's avatar
untereiner committed
1352 1353
	for(std::vector<Dart>::iterator face = visitedFaces.begin(); face != visitedFaces.end(); ++face)
	{
1354 1355
		Dart fit = *face;
		if(map.faceCanBeCoarsened(fit))
untereiner's avatar
untereiner committed
1356
		{
1357
			Algo::IHM::coarsenFace<PFP>(map, fit, position, Algo::IHM::S_QUAD);
untereiner's avatar
untereiner committed
1358 1359 1360 1361 1362 1363 1364 1365
		}
	}

	/*
	 * simplifier les aretes
	 */
	for(std::vector<Dart>::iterator face = visitedFaces.begin(); face != visitedFaces.end(); ++face)
	{
untereiner's avatar
untereiner committed
1366 1367 1368 1369 1370
		Dart fit = *face ;
		do
		{
			if(map.edgeCanBeCoarsened(fit))
				Algo::IHM::coarsenEdge<PFP>(map, fit, position) ;
1371

untereiner's avatar
untereiner committed
1372 1373
			fit = map.phi1(fit) ;
		} while(fit != *face) ;