subdivision3.hpp 37.1 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 282 283 284 285 286
	}

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

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

untereiner's avatar
untereiner committed
287
		std::vector<Dart> v ;
untereiner's avatar
untereiner committed
288 289 290

		do
		{
untereiner's avatar
untereiner committed
291 292
			v.push_back(map.phi1(map.phi1(e)));
			v.push_back(map.phi1(e));
untereiner's avatar
untereiner committed
293 294 295 296 297

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

untereiner's avatar
untereiner committed
298
		map.splitVolume(v) ;
untereiner's avatar
untereiner committed
299 300 301 302 303

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

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

untereiner's avatar
untereiner committed
307 308 309 310 311 312 313
		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));

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

untereiner's avatar
untereiner committed
317 318 319 320 321 322 323
		Dart stop = map.phi2(map.phi1(ne));
		ne = map.phi2(ne);
		do
		{
			dd = map.phi1(map.phi1(map.phi1(ne)));

			map.splitFace(ne, dd) ;
324 325
			unsigned int idface = map.getNewFaceId();
			map.setFaceId(dd,idface, FACE);
untereiner's avatar
untereiner committed
326 327 328 329 330 331 332 333 334

			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
335 336 337
	map.deleteVolume(map.phi3(map.phi2(map.phi1(oldEdges.front()))));


338 339 340 341 342
	//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
343

344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372
		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
373 374 375 376 377 378

	map.setCurrentLevel(cur) ;

	return subdividedfaces.begin()->first;
}

379
template <typename PFP>
380
Dart subdivideVolumeGen(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position)
381 382 383 384
{
	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
385 386
	unsigned int vLevel = map.volumeLevel(d);
	Dart old = map.volumeOldestDart(d);
387

untereiner's avatar
ihm3  
untereiner committed
388 389
	unsigned int cur = map.getCurrentLevel();
	map.setCurrentLevel(vLevel);
390 391

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

397
	DartMarkerStore mf(map);		// Lock a face marker to save one dart per face
untereiner's avatar
untereiner committed
398
	CellMarker mv(map, VERTEX);
399 400 401

	typename PFP::VEC3 volCenter;
	unsigned count = 0 ;
402 403 404

	//Store faces that are traversed and start with the face of d
	std::vector<Dart> visitedFaces;
405
	visitedFaces.reserve(512);
406 407 408 409
	visitedFaces.push_back(old);

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

412
	mf.markOrbit(FACE, old) ;
413

414
	for(unsigned int i = 0; i < visitedFaces.size(); ++i)
415
	{
416
		Dart e = visitedFaces[i] ;
417
		do
418
		{
untereiner's avatar
untereiner committed
419
			//add one old edge per vertex to the old edge list
420 421 422
			//compute volume centroid
			if(!mv.isMarked(e))
			{
untereiner's avatar
untereiner committed
423
				mv.mark(e);
424 425 426 427
				volCenter += position[e];
				++count;
				oldEdges.push_back(e);
			}
untereiner's avatar
untereiner committed
428

untereiner's avatar
untereiner committed
429
			// add all face neighbours to the table
430 431 432 433
			Dart ee = map.phi2(e) ;
			if(!mf.isMarked(ee)) // not already marked
			{
				visitedFaces.push_back(ee) ;
434
				mf.markOrbit(FACE, ee) ;
435
			}
436

437
			e = map.phi1(e) ;
438
		} while(e != visitedFaces[i]) ;
439 440
	}

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

untereiner's avatar
untereiner committed
443
	/*
444
	 * Subdivision
untereiner's avatar
untereiner committed
445 446
	 */
	//Store the darts from quadrangulated faces
447 448 449 450 451 452
	std::vector<std::pair<Dart,Dart> > subdividedfacesQ;
	subdividedfacesQ.reserve(25);

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

453 454 455 456 457 458 459

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

460
		//if needed subdivide face
untereiner's avatar
untereiner committed
461
		if(!map.faceIsSubdivided(d))
untereiner's avatar
untereiner committed
462
			Algo::IHM::subdivideFace<PFP>(map, d, position);
463

464

465 466
		//save a dart from the subdivided face
		unsigned int cur = map.getCurrentLevel() ;
untereiner's avatar
untereiner committed
467

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

untereiner's avatar
untereiner committed
471

472 473 474

		//test si la face est triangulaire ou non
		if(map.phi1(map.phi1(map.phi1(d))) == d)
475
		{
untereiner's avatar
untereiner committed
476
			//std::cout << "trian" << std::endl;
477 478 479 480 481 482 483 484 485 486
			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
487
			//std::cout << "quad" << std::endl;
488 489 490 491 492 493 494 495 496 497
			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
498

499 500
		map.setCurrentLevel(cur);
	}
untereiner's avatar
untereiner committed
501

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

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

untereiner's avatar
untereiner committed
507 508 509 510 511
	//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;

512
		std::vector<Dart> v ;
untereiner's avatar
untereiner committed
513 514 515 516

		do
		{
			if(map.phi1(map.phi1(map.phi1(e))) != e)
517
				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
518

519
			v.push_back(map.phi1(e));
untereiner's avatar
untereiner committed
520 521 522 523 524

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

525
		map.splitVolume(v) ;
untereiner's avatar
untereiner committed
526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 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

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

	}

637 638 639



untereiner's avatar
untereiner committed
640 641 642 643 644 645 646 647 648 649
	//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)
	{
		Dart f1 = (*edges).first;
		Dart f2 = (*edges).second;

650 651 652
		//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
653 654
		{

655
			//map.deleteVolume(map.phi3(map.phi2(map.phi1(oldEdges.front()))));
untereiner's avatar
untereiner committed
656

657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714
//			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
715 716 717 718 719 720 721

		}
	}

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


722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 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
//	{
//		//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
833 834 835

	map.setCurrentLevel(cur) ;

836
	return subdividedfacesQ.begin()->first;
837
}
untereiner's avatar
untereiner committed
838

untereiner's avatar
untereiner committed
839

840

841
template <typename PFP>
842
Dart subdivideVolume(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position)
843
{
untereiner's avatar
untereiner committed
844 845
	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") ;
846
	assert(!map.neighborhoodLevelDiffersByOne(d) || !"Trying to subdivide a volume with neighborhood Level difference greater than 1");
untereiner's avatar
untereiner committed
847

848 849
	unsigned int vLevel = map.volumeLevel(d);
	Dart old = map.volumeOldestDart(d);
untereiner's avatar
untereiner committed
850

851 852
	unsigned int cur = map.getCurrentLevel();
	map.setCurrentLevel(vLevel);
untereiner's avatar
untereiner committed
853

untereiner's avatar
untereiner committed
854 855 856 857 858
	/*
	 * 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
859

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

untereiner's avatar
untereiner committed
863 864
	typename PFP::VEC3 volCenter;
	unsigned count = 0 ;
untereiner's avatar
untereiner committed
865

untereiner's avatar
untereiner committed
866 867
	//Store faces that are traversed and start with the face of d
	std::vector<Dart> visitedFaces;
868
	visitedFaces.reserve(512);
untereiner's avatar
untereiner committed
869
	visitedFaces.push_back(old);
untereiner's avatar
untereiner committed
870

untereiner's avatar
untereiner committed
871 872 873
	//Store the edges before the cutEdge
	std::vector<Dart> oldEdges;
	oldEdges.reserve(20);
untereiner's avatar
untereiner committed
874

875
	mf.markOrbit(FACE, old) ;
untereiner's avatar
untereiner committed
876

877
	for(unsigned int i = 0; i < visitedFaces.size(); ++i)
878
	{
879
		Dart e = visitedFaces[i] ;
untereiner's avatar
untereiner committed
880 881 882 883 884 885
		do
		{
			//add one old edge per vertex to the old edge list
			//compute volume centroid
			if(!mv.isMarked(e))
			{
886
				mv.mark(e);
untereiner's avatar
untereiner committed
887 888 889 890 891 892 893 894 895 896
				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) ;
897
				mf.markOrbit(FACE, ee) ;
untereiner's avatar
untereiner committed
898 899 900
			}

			e = map.phi1(e) ;
901
		} while(e != visitedFaces[i]) ;
902 903
	}

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

untereiner's avatar
untereiner committed
906 907 908 909
	/*
	 * Subdivision
	 */
	//Store the darts from quadrangulated faces
910 911
	std::vector<std::pair<Dart,Dart> > subdividedfacesQ;
	subdividedfacesQ.reserve(25);
912

913 914
	std::vector<std::pair<Dart,Dart> > subdividedfacesT;
	subdividedfacesT.reserve(25);
untereiner's avatar
untereiner committed
915 916


917 918 919 920 921
	//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
922

923 924 925
		//if needed subdivide face
		if(!map.faceIsSubdivided(d))
			Algo::IHM::subdivideFace<PFP>(map, d, position);
untereiner's avatar
untereiner committed
926

927 928 929 930 931 932 933 934 935 936 937 938

		//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)
		{
939
			//std::cout << "trian" << std::endl;
untereiner's avatar
untereiner committed
940 941 942 943
			Dart cf = map.phi2(map.phi1(d));
			Dart e = cf;
			do
			{
944
				subdividedfacesT.push_back(std::pair<Dart,Dart>(e,map.phi2(e)));
untereiner's avatar
untereiner committed
945 946
				e = map.phi1(e);
			}while (e != cf);
947 948 949
		}
		else
		{
950
			//std::cout << "quad" << std::endl;
951 952 953 954 955 956 957 958
			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
959 960 961

		}

962
		map.setCurrentLevel(cur);
untereiner's avatar
untereiner committed
963

964
	}
untereiner's avatar
untereiner committed
965

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

968 969 970 971 972 973 974 975 976 977 978 979 980 981
	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
982
		{
983 984 985 986 987 988 989 990 991 992 993 994
			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
995

996
		//fonction qui calcule le degree max des faces atour d'un sommet
997 998 999 1000 1001 1002 1003 1004
		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
1005

1006 1007 1008 1009 1010 1011 1012 1013 1014 1015
			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
1016 1017
			do
			{
1018
				dd = map.phi1(map.phi1(map.phi1(ne)));
untereiner's avatar
untereiner committed
1019

1020 1021
				//A Verifier !!
				map.splitFace(ne, dd) ;
untereiner's avatar
untereiner committed
1022

1023
				newEdges.push_back(map.phi1(dd));
untereiner's avatar
untereiner committed
1024

1025 1026 1027 1028 1029 1030 1031
				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
1032 1033 1034
			map.closeHole(f2);
			map.sewVolumes(map.phi2(f1),map.phi2(f2));

1035 1036 1037 1038
			istet = false;
			Dart old = map.phi2(map.phi1(*edge));
			Dart dd = map.phi1(old) ;
			map.splitFace(old,dd) ;
untereiner's avatar
untereiner committed
1039

1040
			Dart ne = map.phi1(old);
untereiner's avatar
untereiner committed
1041

1042 1043 1044 1045
			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
1046

1047 1048 1049 1050 1051
			Dart stop = map.phi2(map.phi1(ne));
			ne = map.phi2(ne);
			do
			{
				dd = map.phi1(map.phi1(ne));
untereiner's avatar
untereiner committed
1052

1053
				map.splitFace(ne, dd) ;
untereiner's avatar
untereiner committed
1054

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

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

1067 1068
			unsigned int idface = map.getNewFaceId();
			map.setFaceId(map.phi2(f1),idface, FACE);
untereiner's avatar
untereiner committed
1069 1070
		}

1071 1072 1073 1074 1075
	}

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

1079 1080
			Dart x = map.phi_1(map.phi2(map.phi1(*edge)));
			Dart f = x;
untereiner's avatar
untereiner committed
1081

1082 1083 1084 1085
			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
1086

1087 1088 1089
				map.unsewFaces(f3);
				map.unsewFaces(tmp);
				map.sewFaces(f3, tmp);
untereiner's avatar
untereiner committed
1090

1091 1092
				unsigned int idface = map.getNewFaceId();
				map.setFaceId(map.phi2(f3),idface, FACE);
untereiner's avatar
untereiner committed
1093 1094


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

	{
	//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
1123
		{
1124 1125
			unsigned int idedge = map.getNewEdgeId();
			map.setEdgeId(*it, idedge, EDGE);
1126
			mne.markOrbit(EDGE, *it);
1127 1128 1129
		}
	}
	}
untereiner's avatar
untereiner committed
1130

1131 1132 1133 1134 1135 1136
	{
	//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
1137

1138 1139 1140 1141 1142 1143 1144 1145
		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
1146 1147
		}

1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160
		//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
1161
		{
1162 1163
			unsigned int idedge = map.getNewEdgeId();
			map.setEdgeId(*it, idedge, EDGE);
1164
			mne.markOrbit(EDGE, *it);
untereiner's avatar
untereiner committed
1165
		}
1166 1167
	}
	}
untereiner's avatar
untereiner committed
1168

1169
	map.setCurrentLevel(cur) ;
untereiner's avatar
untereiner committed
1170

1171
	return subdividedfacesQ.begin()->first;
1172 1173
}

untereiner's avatar
untereiner committed
1174

1175

1176 1177 1178 1179

/************************************************************************************************
 * 									Simplification												*
 ************************************************************************************************/
1180 1181


untereiner's avatar
untereiner committed
1182 1183 1184 1185 1186 1187 1188 1189
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
1190
	map.uncutEdge(d) ;
untereiner's avatar
untereiner committed
1191 1192 1193 1194
	map.setCurrentLevel(cur) ;
}

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

untereiner's avatar
untereiner committed
1200 1201 1202 1203 1204 1205 1206 1207 1208 1209
	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
1210 1211 1212 1213 1214
	// 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
1215

untereiner's avatar
untereiner committed
1216
	Dart d3 = map.phi3(d);
1217

untereiner's avatar
untereiner committed
1218
	map.setCurrentLevel(cur + 1) ;
untereiner's avatar
untereiner committed
1219

untereiner's avatar
untereiner committed
1220 1221 1222 1223 1224 1225
	Dart centralV = map.phi1(map.phi1(d));
	//Tester si il y a un volume voisin
	if(d != d3)
	{
		//on decoud
		Dart it = centralV;
1226