subdivision3.hpp 36.8 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 44 45 46 47 48 49 50 51 52 53 54 55 56 57
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") ;

	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) ;
58 59
	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) ;
60

61

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

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

67

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

template <typename PFP>
72
void subdivideFace(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position, SubdivideType sType)
73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90
{
	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") ;

	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
91
			Algo::IHM::subdivideEdge<PFP>(map, it, position) ;	// and compute the degree of the face
92 93 94 95 96 97
		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

98
	Dart res;
99

100
	if(degree == 3 && sType == Algo::IHM::S_TRI)	//subdiviser une face triangulaire
101 102 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
	{
		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
	{
132 133 134 135 136
		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);
137

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

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

146 147 148 149 150 151
		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)) ;
152

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

			dd = next ;
		}

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

	map.setCurrentLevel(cur) ;
171 172
}

untereiner's avatar
untereiner committed
173 174 175 176 177 178 179 180 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 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 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 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 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
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") ;

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

	for(std::vector<Dart>::iterator face = visitedFaces.begin(); face != visitedFaces.end(); ++face)
	{
		Dart e = *face ;
		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) ;
		} while(e != *face) ;
	}

	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;

		Dart f1 = map.phi1(*edge);

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

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

		Dart ne = map.phi1(map.phi1(old)) ;

		map.cutEdge(ne);
		position[map.phi1(ne)] = volCenter; //plonger a la fin de la boucle ????
		newEdges.push_back(ne);
		newEdges.push_back(map.phi1(ne));


		Dart stop = map.phi2(map.phi1(ne));
		ne = map.phi2(ne);
		do
		{
			dd = map.phi1(map.phi1(map.phi1(ne)));

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

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

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

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

		//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))
		{
			unsigned int idedge = map.getNewEdgeId();
			map.setEdgeId(*it, idedge, EDGE);
			mne.markOrbit(EDGE,*it);
		}
	}

	map.setCurrentLevel(cur) ;

	return subdividedfaces.begin()->first;
}

369
template <typename PFP>
370
Dart subdivideVolumeGen(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position)
371 372 373 374
{
	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
375 376
	unsigned int vLevel = map.volumeLevel(d);
	Dart old = map.volumeOldestDart(d);
377

untereiner's avatar
ihm3  
untereiner committed
378 379
	unsigned int cur = map.getCurrentLevel();
	map.setCurrentLevel(vLevel);
380 381

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

387
	DartMarkerStore mf(map);		// Lock a face marker to save one dart per face
untereiner's avatar
untereiner committed
388
	CellMarker mv(map, VERTEX);
389 390 391

	typename PFP::VEC3 volCenter;
	unsigned count = 0 ;
392 393 394

	//Store faces that are traversed and start with the face of d
	std::vector<Dart> visitedFaces;
395
	visitedFaces.reserve(512);
396 397 398 399
	visitedFaces.push_back(old);

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

402
	mf.markOrbit(FACE, old) ;
403

404 405 406
	for(std::vector<Dart>::iterator face = visitedFaces.begin(); face != visitedFaces.end(); ++face)
	{
		Dart e = *face ;
407
		do
408
		{
untereiner's avatar
untereiner committed
409
			//add one old edge per vertex to the old edge list
410 411 412
			//compute volume centroid
			if(!mv.isMarked(e))
			{
untereiner's avatar
untereiner committed
413
				mv.mark(e);
414 415 416 417
				volCenter += position[e];
				++count;
				oldEdges.push_back(e);
			}
untereiner's avatar
untereiner committed
418

untereiner's avatar
untereiner committed
419
			// add all face neighbours to the table
420 421 422 423
			Dart ee = map.phi2(e) ;
			if(!mf.isMarked(ee)) // not already marked
			{
				visitedFaces.push_back(ee) ;
424
				mf.markOrbit(FACE, ee) ;
425
			}
426

427 428 429 430
			e = map.phi1(e) ;
		} while(e != *face) ;
	}

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

untereiner's avatar
untereiner committed
433
	/*
434
	 * Subdivision
untereiner's avatar
untereiner committed
435 436
	 */
	//Store the darts from quadrangulated faces
437 438 439 440 441 442
	std::vector<std::pair<Dart,Dart> > subdividedfacesQ;
	subdividedfacesQ.reserve(25);

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

443 444 445 446 447 448 449

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

450
		//if needed subdivide face
untereiner's avatar
untereiner committed
451
		if(!map.faceIsSubdivided(d))
untereiner's avatar
untereiner committed
452
			Algo::IHM::subdivideFace<PFP>(map, d, position);
453

454

455 456
		//save a dart from the subdivided face
		unsigned int cur = map.getCurrentLevel() ;
untereiner's avatar
untereiner committed
457

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

untereiner's avatar
untereiner committed
461

462 463 464

		//test si la face est triangulaire ou non
		if(map.phi1(map.phi1(map.phi1(d))) == d)
465
		{
untereiner's avatar
untereiner committed
466
			//std::cout << "trian" << std::endl;
467 468 469 470 471 472 473 474 475 476
			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
477
			//std::cout << "quad" << std::endl;
478 479 480 481 482 483 484 485 486 487
			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
488

489 490
		map.setCurrentLevel(cur);
	}
untereiner's avatar
untereiner committed
491

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

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

untereiner's avatar
untereiner committed
497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 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 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 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 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 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 833 834 835 836 837 838 839 840 841 842 843
	//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)
	{
		//std::vector<Dart>::iterator edge = oldEdges.begin();
		Dart e = *edge;

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

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

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


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

		map.closeHole(f1);

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

	}

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

//Fonction isTetrahedron ??
//		//if(Algo::Modelisation::Tetrahedron::isTetrahedron<PFP>(map,f2))
		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)
		{ //cas du tetrahedre

			//std::cout << "ajout d'une face" << std::endl;

			if(map.phi3(map.phi2(f2)) == map.phi2(f2))
			{
				Dart nf = map.newFace(3);
				map.sewVolumes(map.phi2(f2),nf);
			}

			if(map.phi2(map.phi3(map.phi2(f2))) == map.phi3(map.phi2(f2)))
			{
				map.sewFaces(map.phi3(map.phi2(f2)), f1);
			}
		}
		else
		{
			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))));

				}
			}
		}

	}

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


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

		}

	}

	map.setCurrentLevel(cur) ;

844
	return subdividedfacesQ.begin()->first;
845
}
untereiner's avatar
untereiner committed
846

untereiner's avatar
untereiner committed
847

848

849
template <typename PFP>
850
Dart subdivideVolume(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position)
851
{
untereiner's avatar
untereiner committed
852 853
	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") ;
854
	assert(!map.neighborhoodLevelDiffersByOne(d) || !"Trying to subdivide a volume with neighborhood Level difference greater than 1");
untereiner's avatar
untereiner committed
855

856 857
	unsigned int vLevel = map.volumeLevel(d);
	Dart old = map.volumeOldestDart(d);
untereiner's avatar
untereiner committed
858

859 860
	unsigned int cur = map.getCurrentLevel();
	map.setCurrentLevel(vLevel);
untereiner's avatar
untereiner committed
861

untereiner's avatar
untereiner committed
862 863 864 865 866
	/*
	 * 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
867

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

untereiner's avatar
untereiner committed
871 872
	typename PFP::VEC3 volCenter;
	unsigned count = 0 ;
untereiner's avatar
untereiner committed
873

untereiner's avatar
untereiner committed
874 875
	//Store faces that are traversed and start with the face of d
	std::vector<Dart> visitedFaces;
876
	visitedFaces.reserve(512);
untereiner's avatar
untereiner committed
877
	visitedFaces.push_back(old);
untereiner's avatar
untereiner committed
878

untereiner's avatar
untereiner committed
879 880 881
	//Store the edges before the cutEdge
	std::vector<Dart> oldEdges;
	oldEdges.reserve(20);
untereiner's avatar
untereiner committed
882

883
	mf.markOrbit(FACE, old) ;
untereiner's avatar
untereiner committed
884

untereiner's avatar
untereiner committed
885
	for(std::vector<Dart>::iterator face = visitedFaces.begin(); face != visitedFaces.end(); ++face)
886
	{
untereiner's avatar
untereiner committed
887 888 889 890 891 892 893
		Dart e = *face ;
		do
		{
			//add one old edge per vertex to the old edge list
			//compute volume centroid
			if(!mv.isMarked(e))
			{
894
				mv.mark(e);
untereiner's avatar
untereiner committed
895 896 897 898 899 900 901 902 903 904
				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) ;
905
				mf.markOrbit(FACE, ee) ;
untereiner's avatar
untereiner committed
906 907 908 909
			}

			e = map.phi1(e) ;
		} while(e != *face) ;
910 911
	}

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

untereiner's avatar
untereiner committed
914 915 916 917
	/*
	 * Subdivision
	 */
	//Store the darts from quadrangulated faces
918 919
	std::vector<std::pair<Dart,Dart> > subdividedfacesQ;
	subdividedfacesQ.reserve(25);
920

921 922
	std::vector<std::pair<Dart,Dart> > subdividedfacesT;
	subdividedfacesT.reserve(25);
untereiner's avatar
untereiner committed
923 924


925 926 927 928 929
	//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
930

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

935 936 937 938 939 940 941 942 943 944 945 946

		//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)
		{
947
			//std::cout << "trian" << std::endl;
untereiner's avatar
untereiner committed
948 949 950 951
			Dart cf = map.phi2(map.phi1(d));
			Dart e = cf;
			do
			{
952
				subdividedfacesT.push_back(std::pair<Dart,Dart>(e,map.phi2(e)));
untereiner's avatar
untereiner committed
953 954
				e = map.phi1(e);
			}while (e != cf);
955 956 957
		}
		else
		{
958
			//std::cout << "quad" << std::endl;
959 960 961 962 963 964 965 966
			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
967 968 969

		}

970
		map.setCurrentLevel(cur);
untereiner's avatar
untereiner committed
971

972
	}
untereiner's avatar
untereiner committed
973

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

976 977 978 979 980 981 982 983 984 985 986 987 988 989
	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
990
		{
991 992 993 994 995 996 997 998 999 1000 1001 1002
			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
1003

1004
		//fonction qui calcule le degree max des faces atour d'un sommet
1005 1006 1007 1008 1009 1010 1011 1012
		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
1013

1014 1015 1016 1017 1018 1019 1020 1021 1022 1023
			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
1024 1025
			do
			{
1026
				dd = map.phi1(map.phi1(map.phi1(ne)));
untereiner's avatar
untereiner committed
1027

1028 1029
				//A Verifier !!
				map.splitFace(ne, dd) ;
untereiner's avatar
untereiner committed
1030

1031
				newEdges.push_back(map.phi1(dd));
untereiner's avatar
untereiner committed
1032

1033 1034 1035 1036 1037 1038 1039
				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
1040 1041 1042
			map.closeHole(f2);
			map.sewVolumes(map.phi2(f1),map.phi2(f2));

1043 1044 1045 1046
			istet = false;
			Dart old = map.phi2(map.phi1(*edge));
			Dart dd = map.phi1(old) ;
			map.splitFace(old,dd) ;
untereiner's avatar
untereiner committed
1047

1048
			Dart ne = map.phi1(old);
untereiner's avatar
untereiner committed
1049

1050 1051 1052 1053
			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
1054

1055 1056 1057 1058 1059
			Dart stop = map.phi2(map.phi1(ne));
			ne = map.phi2(ne);
			do
			{
				dd = map.phi1(map.phi1(ne));
untereiner's avatar
untereiner committed
1060

1061
				map.splitFace(ne, dd) ;
untereiner's avatar
untereiner committed
1062

1063
				newEdges.push_back(map.phi1(dd));
untereiner's avatar
untereiner committed
1064

1065 1066
				ne = map.phi2(map.phi_1(ne));
				dd = map.phi1(dd);
untereiner's avatar
untereiner committed
1067
			}
1068 1069 1070 1071 1072
			while(dd != stop);
		}
		else
		{
			map.closeHole(f2);
1073
			map.sewVolumes(map.phi2(f1),map.phi2(f2));
untereiner's avatar
untereiner committed
1074

1075 1076
			unsigned int idface = map.getNewFaceId();
			map.setFaceId(map.phi2(f1),idface, FACE);
untereiner's avatar
untereiner committed
1077 1078
		}

1079 1080 1081 1082 1083
	}

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

1087 1088
			Dart x = map.phi_1(map.phi2(map.phi1(*edge)));
			Dart f = x;
untereiner's avatar
untereiner committed
1089

1090 1091 1092 1093
			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
1094

1095 1096 1097
				map.unsewFaces(f3);
				map.unsewFaces(tmp);
				map.sewFaces(f3, tmp);
untereiner's avatar
untereiner committed
1098

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


1103 1104
				f = map.phi2(map.phi_1(f));
			}while(f != x);
untereiner's avatar
untereiner committed
1105 1106 1107

		}

1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130
	}

	{
	//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
1131
		{
1132 1133 1134 1135 1136 1137
			unsigned int idedge = map.getNewEdgeId();
			map.setEdgeId(*it, idedge, EDGE);
			mne.markOrbit(EDGE,*it);
		}
	}
	}
untereiner's avatar
untereiner committed
1138

1139 1140 1141 1142 1143 1144
	{
	//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
1145

1146 1147 1148 1149 1150 1151 1152 1153
		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
1154 1155
		}

1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168
		//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
1169
		{
1170 1171 1172
			unsigned int idedge = map.getNewEdgeId();
			map.setEdgeId(*it, idedge, EDGE);
			mne.markOrbit(EDGE,*it);
untereiner's avatar
untereiner committed
1173
		}
1174 1175
	}
	}
untereiner's avatar
untereiner committed
1176

1177
	map.setCurrentLevel(cur) ;
untereiner's avatar
untereiner committed
1178

1179
	return subdividedfacesQ.begin()->first;
1180 1181
}

untereiner's avatar
untereiner committed
1182

1183

1184 1185 1186 1187

/************************************************************************************************
 * 									Simplification												*
 ************************************************************************************************/
1188 1189


untereiner's avatar
untereiner committed
1190 1191 1192 1193 1194 1195 1196 1197
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
1198
	map.uncutEdge(d) ;
untereiner's avatar
untereiner committed
1199 1200 1201 1202
	map.setCurrentLevel(cur) ;
}

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

untereiner's avatar
untereiner committed
1208 1209 1210 1211 1212 1213 1214 1215 1216 1217
	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
1218 1219 1220 1221 1222
	// 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
1223

untereiner's avatar
untereiner committed
1224
	Dart d3 = map.phi3(d);
1225

untereiner's avatar
untereiner committed
1226
	map.setCurrentLevel(cur + 1) ;
untereiner's avatar
untereiner committed
1227

untereiner's avatar
untereiner committed
1228 1229 1230 1231 1232 1233
	Dart centralV = map.phi1(map.phi1(d));
	//Tester si il y a un volume voisin
	if(d != d3)
	{
		//on decoud
		Dart it = centralV;
1234

untereiner's avatar
untereiner committed
1235
		do
1236
		{
untereiner's avatar
untereiner committed
1237 1238 1239
			map.unsewVolumes(it);
			it = map.phi2(map.phi_1(it));
		}while(it != centralV);
1240

untereiner's avatar
untereiner committed
1241 1242 1243 1244
		//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)));
1245 1246 1247

	}

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

untereiner's avatar
untereiner committed
1251 1252
	if(d != d3)
		map.sewVolumes(d,map.phi1(d3));
1253

untereiner's avatar
untereiner committed
1254
	map.setCurrentLevel(cur) ;
untereiner's avatar
untereiner committed
1255 1256 1257 1258 1259 1260 1261 1262
}

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
1263 1264
	unsigned int cur = map.getCurrentLevel() ;

1265 1266
	std::cout << "cur = " << cur << std::endl;

untereiner's avatar
untereiner committed
1267 1268 1269 1270 1271 1272 1273 1274 1275
	/*
	 * 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;
1276
	visitedFaces.reserve(512);
untereiner's avatar
untereiner committed
1277 1278
	visitedFaces.push_back(d);

1279
	mf.markOrbit(FACE, d) ;
untereiner's avatar
untereiner committed
1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290

	for(std::vector<Dart>::iterator face = visitedFaces.begin(); face != visitedFaces.end(); ++face)
	{
		Dart e = *face ;
		do
		{
			// add all face neighbours to the table
			Dart ee = map.phi2(e) ;
			if(!mf.isMarked(ee)) // not already marked
			{
				visitedFaces.push_back(ee) ;
1291
				mf.markOrbit(FACE, ee) ;
untereiner's avatar
untereiner committed
1292 1293 1294 1295 1296 1297 1298
			}

			e = map.phi1(e) ;
		} while(e != *face) ;
	}

	/*
1299
	 * Deconnecter toutes les faces interieurs