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

untereiner's avatar
untereiner committed
283 284 285 286
	//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
287 288 289 290
		Dart e = *edge;
		std::vector<Dart> v ;

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

untereiner's avatar
untereiner committed
295 296 297
			e = map.phi2(map.phi_1(e));
		}
		while(e != *edge);
untereiner's avatar
untereiner committed
298

untereiner's avatar
untereiner committed
299
		map.splitVolume(v) ;
untereiner's avatar
untereiner committed
300

untereiner's avatar
untereiner committed
301
		Dart old = map.phi2(map.phi1(*edge));
untereiner's avatar
untereiner committed
302 303 304
		Dart dd = map.phi1(map.phi1(old)) ;
		map.splitFace(old,dd) ;

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

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

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

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

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

			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
334

335 336
	}

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

untereiner's avatar
untereiner committed
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 369 370 371 372 373
	//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
374 375 376 377 378 379

	map.setCurrentLevel(cur) ;

	return subdividedfaces.begin()->first;
}

untereiner's avatar
untereiner committed
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 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487
template <typename PFP>
Dart subdivideVolumeClassic2(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") ;
	assert(!map.isBoundaryMarked(d) || !"Trying to subdivide a dart marked boundary");

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

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

	/*
	 * Compute volume centroid
	 */
	typename PFP::VEC3 volCenter =  Algo::Geometry::volumeCentroid<PFP>(map, old, position);

	/*
	 * Subdivide Faces
	 */
	std::vector<std::pair<Dart,Dart> > subdividedfaces;
	subdividedfaces.reserve(25);

	Traversor3WF<typename PFP::MAP> traF(map, old);
	for(Dart dit = traF.begin(); dit != traF.end(); dit = traF.next())
	{
		//if needed subdivide face
		if(!map.faceIsSubdivided(dit))
			Algo::IHM::subdivideFace<PFP>(map, dit, 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);
	}

	/*
	 * Create inside volumes
	 */
	std::vector<Dart> newEdges;	//save darts from inner edges
	newEdges.reserve(50);
	Dart centralDart = NIL;
	Traversor3WV<typename PFP::MAP> traV(map, old);
	map.setCurrentLevel(vLevel + 1) ; // go to the next level to perform volume subdivision
	for(Dart dit = traV.begin(); dit != traV.end(); dit = traV.next())
	{
		Dart e = dit;
		std::vector<Dart> v ;

		do
		{
			v.push_back(map.phi1(map.phi1(e)));
			v.push_back(map.phi1(e));

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

		map.splitVolume(v) ;

//		Dart old = map.phi2(map.phi1(dit));
//		Dart dd = map.phi1(map.phi1(old)) ;
//		map.splitFace(old,dd) ;
//
//		unsigned int idface = map.getNewFaceId();
//		map.setFaceId(dd,idface, FACE);
//
//		Dart ne = map.phi1(map.phi1(old)) ;
//
//		map.cutEdge(ne);
//		centralDart = map.phi1(ne);
//		newEdges.push_back(ne);
//		newEdges.push_back(map.phi1(ne));
//
//		unsigned int id = map.getNewEdgeId() ;
//		map.setEdgeId(ne, id, EDGE) ;
//
//		Dart stop = map.phi2(map.phi1(ne));
//		ne = map.phi2(ne);
//		do
//		{
//			dd = map.phi1(map.phi1(map.phi1(ne)));
//
//			map.splitFace(ne, dd) ;
//			unsigned int idface = map.getNewFaceId();
//			map.setFaceId(dd,idface, FACE);
//
//			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
488

untereiner's avatar
untereiner committed
489 490
//	map.deleteVolume(map.phi3(map.phi2(map.phi1(traV.begin()))));
//
untereiner's avatar
untereiner committed
491 492 493 494 495 496 497 498
//	//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)))
//		{
untereiner's avatar
untereiner committed
499 500
//			//id pour toutes les faces interieures
//			map.sewVolumes(map.phi2(f1), map.phi2(f2));
untereiner's avatar
untereiner committed
501
//
untereiner's avatar
untereiner committed
502 503 504
//			//Fais a la couture !!!!!
//			unsigned int idface = map.getNewFaceId();
//			map.setFaceId(map.phi2(f1),idface, FACE);
untereiner's avatar
untereiner committed
505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525
//		}
//
//		//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
526 527 528
//
//
//	position[centralDart] = volCenter; //plonger a la fin de la boucle ????
untereiner's avatar
untereiner committed
529 530 531 532

	map.setCurrentLevel(cur) ;

	return subdividedfaces.begin()->first;
untereiner's avatar
untereiner committed
533

untereiner's avatar
untereiner committed
534 535
}

536
template <typename PFP>
537
Dart subdivideVolume(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position)
538 539 540
{
	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") ;
541
	assert(!map.neighborhoodLevelDiffersByOne(d) || !"Trying to subdivide a volume with neighborhood Level difference greater than 1");
542

untereiner's avatar
ihm3  
untereiner committed
543 544
	unsigned int vLevel = map.volumeLevel(d);
	Dart old = map.volumeOldestDart(d);
545

untereiner's avatar
ihm3  
untereiner committed
546 547
	unsigned int cur = map.getCurrentLevel();
	map.setCurrentLevel(vLevel);
548 549

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

555
	DartMarkerStore mf(map);		// Lock a face marker to save one dart per face
untereiner's avatar
untereiner committed
556
	CellMarker mv(map, VERTEX);
557 558 559

	typename PFP::VEC3 volCenter;
	unsigned count = 0 ;
560 561 562

	//Store faces that are traversed and start with the face of d
	std::vector<Dart> visitedFaces;
563
	visitedFaces.reserve(512);
564 565 566 567
	visitedFaces.push_back(old);

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

570
	mf.markOrbit(FACE, old) ;
571

572
	for(unsigned int i = 0; i < visitedFaces.size(); ++i)
573
	{
574
		Dart e = visitedFaces[i] ;
575
		do
576
		{
untereiner's avatar
untereiner committed
577
			//add one old edge per vertex to the old edge list
578 579 580
			//compute volume centroid
			if(!mv.isMarked(e))
			{
untereiner's avatar
untereiner committed
581
				mv.mark(e);
582 583 584 585
				volCenter += position[e];
				++count;
				oldEdges.push_back(e);
			}
untereiner's avatar
untereiner committed
586

untereiner's avatar
untereiner committed
587
			// add all face neighbours to the table
588 589 590 591
			Dart ee = map.phi2(e) ;
			if(!mf.isMarked(ee)) // not already marked
			{
				visitedFaces.push_back(ee) ;
592
				mf.markOrbit(FACE, ee) ;
593
			}
594

595
			e = map.phi1(e) ;
596
		} while(e != visitedFaces[i]) ;
597 598
	}

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

untereiner's avatar
untereiner committed
601
	/*
602
	 * Subdivision
untereiner's avatar
untereiner committed
603
	 */
604 605 606
	//type 'q' : quad et plus
	//type 't' : tri
	std::vector<std::pair<char, std::pair<Dart,Dart> > > subdividedfaces;
607 608 609 610 611 612 613

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

614
		//if needed subdivide face
untereiner's avatar
untereiner committed
615
		if(!map.faceIsSubdivided(d))
untereiner's avatar
untereiner committed
616
			Algo::IHM::subdivideFace<PFP>(map, d, position);
617

618

619 620
		//save a dart from the subdivided face
		unsigned int cur = map.getCurrentLevel() ;
untereiner's avatar
untereiner committed
621

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

625 626
		//test si la face est triangulaire ou non
		if(map.phi1(map.phi1(map.phi1(d))) == d)
627
		{
untereiner's avatar
untereiner committed
628
			//std::cout << "trian" << std::endl;
629 630 631 632
			Dart cf = map.phi2(map.phi1(d));
			Dart e = cf;
			do
			{
633 634
				std::pair<Dart,Dart> pd(e,map.phi2(e));
				subdividedfaces.push_back(std::pair<char, std::pair<Dart,Dart> > ('t',pd));
635 636 637 638 639
				e = map.phi1(e);
			}while (e != cf);
		}
		else
		{
untereiner's avatar
untereiner committed
640
			//std::cout << "quad" << std::endl;
641 642 643 644
			Dart cf = map.phi1(d);
			Dart e = cf;
			do
			{
645 646
				std::pair<Dart,Dart> pd(e,map.phi2(e));
				subdividedfaces.push_back(std::pair<char, std::pair<Dart,Dart> >('q',pd));
647 648 649 650 651
				e = map.phi2(map.phi1(e));
			}while (e != cf);


		}
untereiner's avatar
untereiner committed
652

653
		map.setCurrentLevel(cur);
654

655
	}
untereiner's avatar
untereiner committed
656

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

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

662 663 664
	bool istet = true;
	bool ishex = false;

untereiner's avatar
untereiner committed
665 666 667 668
	//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;
669
		std::vector<Dart> v ;
untereiner's avatar
untereiner committed
670

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

untereiner's avatar
untereiner committed
674 675 676
		do
		{
			if(map.phi1(map.phi1(map.phi1(e))) != e)
677
				v.push_back(map.phi1(map.phi1(e)));
untereiner's avatar
untereiner committed
678

679
			v.push_back(map.phi1(e));
untereiner's avatar
untereiner committed
680 681 682 683 684

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

685
		map.splitVolume(v) ;
untereiner's avatar
untereiner committed
686 687


688 689
//		//fonction qui calcule le degree max des faces atour d'un sommet
//		unsigned int fdeg = map.faceDegree(map.phi2(f1));
690
//
691 692 693
//		if(fdeg > 4)
//		{
//			std::cout << "> 4" << std::endl;
694
//
695
//			ishex = true;
696
//
697 698 699
//			Dart old = map.phi2(map.phi1(e));
//			Dart dd = map.phi1(map.phi1(old)) ;
//			map.splitFace(old,dd) ;
700
//
701
//			Dart ne = map.phi1(map.phi1(old)) ;
702
//
703 704 705 706
//			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));
707 708
//
//
709 710 711 712 713
//			Dart stop = map.phi2(map.phi1(ne));
//			ne = map.phi2(ne);
//			do
//			{
//				dd = map.phi1(map.phi1(map.phi1(ne)));
714
//
715 716
//				//A Verifier !!
//				map.splitFace(ne, dd) ;
717
//
718
//				newEdges.push_back(map.phi1(dd));
719
//
720 721
//				ne = map.phi2(map.phi_1(ne));
//				dd = map.phi1(map.phi1(dd));
722
//			}
723 724 725
//			while(dd != stop);
//		}
//		else if(fdeg > 3)
726
//		{
727
//			std::cout << "> 3" << std::endl;
728
//
729 730 731
//			//map.closeHole(f2);
//			//map.sewVolumes(map.phi2(f1),map.phi2(f2));
//			istet = false;
732
//
733 734 735
//			Dart old = map.phi2(map.phi1(*edge));
//			Dart dd = map.phi1(old) ;
//			map.splitFace(old,dd) ;
736
//
737
//			Dart ne = map.phi1(old);
738
//
739 740 741 742
//			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));
743
//
744 745 746 747 748
//			Dart stop = map.phi2(map.phi1(ne));
//			ne = map.phi2(ne);
//			do
//			{
//				dd = map.phi1(map.phi1(ne));
749
//
750
//				map.splitFace(ne, dd) ;
751
//
752 753 754 755
//				newEdges.push_back(map.phi1(dd));
//
//				ne = map.phi2(map.phi_1(ne));
//				dd = map.phi1(dd);
756
//			}
757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772
//			while(dd != stop);
//		}
//		else
//		{
//			//map.closeHole(f2);
//			//map.sewVolumes(map.phi2(f1),map.phi2(f2));
//
//			unsigned int idface = map.getNewFaceId();
//			map.setFaceId(map.phi2(f1),idface, FACE);
//		}

	}

	if(ishex)
	{
		map.deleteVolume(map.phi3(map.phi2(map.phi1(oldEdges.front()))));
773
//
774 775 776 777 778
//		//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;
779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799
//
//			//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);
//			}
//		}
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

	}

	if(!istet)
	{
		for (std::vector<Dart>::iterator edge = oldEdges.begin(); edge != oldEdges.end(); ++edge)
		{
			//Dart e = *edge;

			Dart x = map.phi_1(map.phi2(map.phi1(*edge)));
			Dart f = x;

			do
			{
				Dart f3 = map.phi3(f);
				Dart tmp =  map.phi_1(map.phi2(map.phi_1(map.phi2(map.phi_1(f3)))));

				map.unsewFaces(f3);
				map.unsewFaces(tmp);
				map.sewFaces(f3, tmp);

				unsigned int idface = map.getNewFaceId();
				map.setFaceId(map.phi2(f3),idface, FACE);


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

		}

	}





836
//	{
837 838 839 840 841
//	//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;
842
//
843 844 845 846 847
//		//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);
848
//
849
//	}
850
//
851 852 853 854 855 856
//	//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))
857
//		{
858 859 860
//			unsigned int idedge = map.getNewEdgeId();
//			map.setEdgeId(*it, idedge, EDGE);
//			mne.markOrbit(EDGE, *it);
861 862
//		}
//	}
863
//	}
864
//
865 866 867
//	{
//	//Third step : 3-sew internal faces
//	for (std::vector<std::pair<Dart,Dart> >::iterator it = subdividedfacesQ.begin(); it != subdividedfacesQ.end(); ++it)
868 869 870 871
//	{
//		Dart f1 = (*it).first;
//		Dart f2 = (*it).second;
//
872
//		if(map.phi3(map.phi2(f1)) == map.phi2(f1) && map.phi3(map.phi2(f2)) == map.phi2(f2))
873
//		{
874 875
//			//id pour toutes les faces interieures
//			map.sewVolumes(map.phi2(f1), map.phi2(f2));
876
//
877 878 879 880
//			//Fais a la couture !!!!!
//			unsigned int idface = map.getNewFaceId();
//			map.setFaceId(map.phi2(f1),idface, FACE);
//		}
881
//
882 883 884 885 886 887
//		//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);
//	}
888
//
889 890 891 892 893 894 895 896 897 898
//	//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);
899
//		}
900
//	}
901
//	}
untereiner's avatar
untereiner committed
902 903 904

	map.setCurrentLevel(cur) ;

905 906
//	return subdividedfacesQ.begin()->first;
	return NIL;
907
}
untereiner's avatar
untereiner committed
908

untereiner's avatar
untereiner committed
909

910
template <typename PFP>
911
Dart subdivideVolumeGen(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position)
912
{
untereiner's avatar
untereiner committed
913 914
	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
untereiner committed
915

916 917
	unsigned int vLevel = map.volumeLevel(d);
	Dart old = map.volumeOldestDart(d);
untereiner's avatar
untereiner committed
918

919 920
	unsigned int cur = map.getCurrentLevel();
	map.setCurrentLevel(vLevel);
untereiner's avatar
untereiner committed
921

untereiner's avatar
untereiner committed
922 923 924 925 926
	/*
	 * 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
927

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

untereiner's avatar
untereiner committed
931 932
	typename PFP::VEC3 volCenter;
	unsigned count = 0 ;
untereiner's avatar
untereiner committed
933

untereiner's avatar
untereiner committed
934 935
	//Store faces that are traversed and start with the face of d
	std::vector<Dart> visitedFaces;
936
	visitedFaces.reserve(512);
untereiner's avatar
untereiner committed
937
	visitedFaces.push_back(old);
untereiner's avatar
untereiner committed
938

untereiner's avatar
untereiner committed
939 940
	//Store the edges before the cutEdge
	std::vector<Dart> oldEdges;
941
	oldEdges.reserve(512);
untereiner's avatar
untereiner committed
942

943
	mf.markOrbit(FACE, old) ;
untereiner's avatar
untereiner committed
944

945
	for(unsigned int i = 0; i < visitedFaces.size(); ++i)
946
	{
947
		Dart e = visitedFaces[i] ;
untereiner's avatar
untereiner committed
948 949 950 951 952 953
		do
		{
			//add one old edge per vertex to the old edge list
			//compute volume centroid
			if(!mv.isMarked(e))
			{
954
				mv.mark(e);
untereiner's avatar
untereiner committed
955 956 957 958 959 960 961 962 963 964
				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) ;
965
				mf.markOrbit(FACE, ee) ;
untereiner's avatar
untereiner committed
966 967 968
			}

			e = map.phi1(e) ;
969
		} while(e != visitedFaces[i]) ;
970 971
	}

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

untereiner's avatar
untereiner committed
974 975 976 977
	/*
	 * Subdivision
	 */
	//Store the darts from quadrangulated faces
978 979
	std::vector<std::pair<Dart,Dart> > subdividedfacesQ;
	subdividedfacesQ.reserve(25);
980

981 982
	std::vector<std::pair<Dart,Dart> > subdividedfacesT;
	subdividedfacesT.reserve(25);
untereiner's avatar
untereiner committed
983 984


985 986 987 988 989
	//First step : subdivide edges and faces
	//creates a i+1 edge level and i+1 face level
	for (std::vector<Dart>::iterator face = visitedFaces.begin(); face != visitedFaces.end(); ++face)
	{
		Dart d = *face;
untereiner's avatar
untereiner committed
990

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

995 996 997 998 999 1000 1001 1002 1003 1004

		//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)
		{
1005
			//std::cout << "trian" << std::endl;
untereiner's avatar
untereiner committed
1006 1007 1008 1009
			Dart cf = map.phi2(map.phi1(d));
			Dart e = cf;
			do
			{
1010
				subdividedfacesT.push_back(std::pair<Dart,Dart>(e,map.phi2(e)));
untereiner's avatar
untereiner committed
1011 1012
				e = map.phi1(e);
			}while (e != cf);
1013 1014 1015
		}
		else
		{
1016
			//std::cout << "quad" << std::endl;
1017 1018 1019 1020 1021 1022 1023 1024
			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
1025 1026 1027

		}

1028 1029
		map.setCurrentLevel(cur);
	}
untereiner's avatar
untereiner committed
1030

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

1033 1034 1035 1036 1037 1038 1039 1040
	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;

1041
		std::vector<Dart> v ;
1042 1043

		do
untereiner's avatar
untereiner committed
1044
		{
1045
			if(map.phi1(map.phi1(map.phi1(e))) != e)
1046
				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))
1047

1048
			v.push_back(map.phi1(e));
1049 1050 1051 1052 1053

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

1054
		map.splitVolume(v) ;
1055

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

1059 1060 1061 1062
		//tourner autour du sommet pour connaitre le brin d'un sommet de valence < cornerDegree
		bool found = false;
		Dart stop = e;
		do
1063
		{
untereiner's avatar
untereiner committed
1064

1065 1066 1067 1068 1069
			if(map.Map2::vertexDegree(map.phi2(map.phi1(e))) < cornerDegree)
			{
				stop = map.phi2(map.phi1(e));
				found = true;
			}
1070

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

1075 1076 1077 1078 1079 1080
		//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);
1081

untereiner's avatar
untereiner committed
1082 1083
			do
			{
1084 1085 1086 1087 1088 1089
				if(map.Map2::vertexDegree(dd) < cornerDegree)
					found2 = true;
				else
					dd = map.phi1(dd);
			}
			while(!found2);
untereiner's avatar
untereiner committed
1090

1091 1092 1093 1094 1095 1096 1097 1098 1099
			//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);
untereiner's avatar
untereiner committed
1100

1101 1102 1103 1104 1105
				//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;
untereiner's avatar
untereiner committed
1106

1107 1108 1109 1110
					Dart ne = map.phi_1(stop) ;
					map.cutEdge(ne);
					position[map.phi1(ne)] = volCenter;
					stop = map.phi2(map.phi1(ne));
untereiner's avatar
untereiner committed
1111

1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130
					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);
untereiner's avatar
untereiner committed
1131