subdivision3.hpp 41.7 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 27 28 29 30 31 32 33
* Contact information: cgogn@unistra.fr                                        *
*                                                                              *
*******************************************************************************/

#include "Algo/Geometry/centroid.h"
#include "Algo/Modelisation/subdivision.h"

namespace CGoGN
{

namespace Algo
{

untereiner's avatar
untereiner committed
34
namespace IHM
35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55
{

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) ;
56 57
	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) ;
58

59

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

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

	map.setCurrentLevel(cur) ;
}

template <typename PFP>
69
void subdivideFace(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position, SubdivideType sType)
70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87
{
	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
88
			Algo::IHM::subdivideEdge<PFP>(map, it, position) ;	// and compute the degree of the face
89 90 91 92 93 94
		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

95
	Dart res;
96

97 98 99 100 101 102
	if(degree == 3 && sType ==  S_TRI)		//subdiviser une face triangulaire
	{
		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() ;
103
		map.setEdgeId(map.phi_1(dd), id, EDGE) ;		// set the edge id of the inserted edge to the next available id
104

105
		unsigned int idface = map.getFaceId(old);
106 107
		map.setFaceId(dd, idface, FACE) ;
		map.setFaceId(e, idface, FACE) ;
108

109 110 111 112
		dd = e ;
		e = map.phi1(map.phi1(dd)) ;
		map.splitFace(dd, e) ;
		id = map.getNewEdgeId() ;
113
		map.setEdgeId(map.phi_1(dd), id, EDGE) ;
114

115 116
		map.setFaceId(dd, idface, FACE) ;
		map.setFaceId(e, idface, FACE) ;
117

118 119 120
		dd = e ;
		e = map.phi1(map.phi1(dd)) ;
		map.splitFace(dd, e) ;
121
		id = map.getNewEdgeId() ;
122
		map.setEdgeId(map.phi_1(dd), id, EDGE) ;
123

124 125
		map.setFaceId(dd, idface, FACE) ;
		map.setFaceId(e, idface, FACE) ;
126
	}
127 128 129 130 131 132 133
	else
	{
		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);
134

135 136
		map.cutEdge(ne) ;
		unsigned int id = map.getNewEdgeId() ;
137
		map.setEdgeId(ne, id, EDGE) ;
138
		id = map.getNewEdgeId() ;
139
		map.setEdgeId(ne2, id, EDGE) ;
140

141
		position[map.phi2(ne)] = p ;
142

143 144 145 146 147 148
		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)) ;
149

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

			dd = next ;
		}

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

	map.setCurrentLevel(cur) ;
168 169 170
}

template <typename PFP>
171
Dart subdivideVolume(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position)
172 173 174 175
{
	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
176 177
	unsigned int vLevel = map.volumeLevel(d);
	Dart old = map.volumeOldestDart(d);
178

untereiner's avatar
ihm3  
untereiner committed
179 180
	unsigned int cur = map.getCurrentLevel();
	map.setCurrentLevel(vLevel);
181 182

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

188 189 190 191 192
	DartMarkerStore mf(map);		// Lock a face marker to save one dart per face
	DartMarkerStore mv(map);		// Lock a vertex marker to compute volume center

	typename PFP::VEC3 volCenter;
	unsigned count = 0 ;
193 194 195 196 197 198 199 200 201 202

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

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

203
	mf.markOrbit(FACE, old) ;
204

205 206 207
	for(std::vector<Dart>::iterator face = visitedFaces.begin(); face != visitedFaces.end(); ++face)
	{
		Dart e = *face ;
208
		do
209
		{
untereiner's avatar
untereiner committed
210
			//add one old edge per vertex to the old edge list
211 212 213 214 215
			//compute volume centroid
			if(!mv.isMarked(e))
			{
				volCenter += position[e];
				++count;
216
				mv.markOrbit(VERTEX, e);
217 218
				oldEdges.push_back(e);
			}
untereiner's avatar
untereiner committed
219

untereiner's avatar
untereiner committed
220
			// add all face neighbours to the table
221 222 223 224
			Dart ee = map.phi2(e) ;
			if(!mf.isMarked(ee)) // not already marked
			{
				visitedFaces.push_back(ee) ;
225
				mf.markOrbit(FACE, ee) ;
226
			}
227

228 229 230 231
			e = map.phi1(e) ;
		} while(e != *face) ;
	}

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

untereiner's avatar
untereiner committed
234
	/*
235
	 * Subdivision
untereiner's avatar
untereiner committed
236
	 */
237

untereiner's avatar
untereiner committed
238
	//Store the darts from quadrangulated faces
untereiner's avatar
untereiner committed
239 240
	std::vector<std::pair<Dart,Dart> > subdividedfaces;
	subdividedfaces.reserve(25);
241 242 243 244 245 246 247

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

248
		//if needed subdivide face
untereiner's avatar
untereiner committed
249
		if(!map.faceIsSubdivided(d))
untereiner's avatar
untereiner committed
250
			Algo::IHM::subdivideFace<PFP>(map, d, position);
251

252 253
		//save a dart from the subdivided face
		unsigned int cur = map.getCurrentLevel() ;
untereiner's avatar
untereiner committed
254

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

untereiner's avatar
untereiner committed
258 259

		//le brin est forcement du niveau cur
260 261 262 263
		Dart cf = map.phi1(d);
		Dart e = cf;
		do
		{
untereiner's avatar
untereiner committed
264
			subdividedfaces.push_back(std::pair<Dart,Dart>(e,map.phi2(e)));
265 266
			e = map.phi2(map.phi1(e));
		}while (e != cf);
untereiner's avatar
untereiner committed
267

268 269
		map.setCurrentLevel(cur);
	}
untereiner's avatar
untereiner committed
270

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

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

untereiner's avatar
untereiner committed
276
	//Second step : deconnect each corner, close each hole, subdivide each new face into 3
277 278 279
	for (std::vector<Dart>::iterator edge = oldEdges.begin(); edge != oldEdges.end(); ++edge)
	{
		Dart e = *edge;
280

untereiner's avatar
untereiner committed
281 282
		Dart f1 = map.phi1(*edge);

283 284 285
		do
		{
			map.unsewFaces(map.phi1(map.phi1(e)));
untereiner's avatar
untereiner committed
286 287

			//TODO utile ?
288
			//if(map.phi2(map.phi1(e)) != map.phi1(e))
untereiner's avatar
untereiner committed
289 290
				map.unsewFaces(map.phi1(e));

291
			e = map.phi2(map.phi_1(e));
untereiner's avatar
untereiner committed
292 293
		}
		while(e != *edge);
untereiner's avatar
untereiner committed
294

untereiner's avatar
untereiner committed
295
		map.closeHole(f1);
untereiner's avatar
untereiner committed
296

untereiner's avatar
untereiner committed
297 298 299
		Dart old = map.phi2(map.phi1(e));
		Dart dd = map.phi1(map.phi1(old)) ;
		map.splitFace(old,dd) ;
300

untereiner's avatar
untereiner committed
301
		Dart ne = map.phi1(map.phi1(old)) ;
302

untereiner's avatar
untereiner committed
303 304
		map.cutEdge(ne);
		position[map.phi1(ne)] = volCenter; //plonger a la fin de la boucle ????
305 306
		newEdges.push_back(ne);
		newEdges.push_back(map.phi1(ne));
untereiner's avatar
untereiner committed
307

untereiner's avatar
untereiner committed
308 309 310 311

		Dart stop = map.phi2(map.phi1(ne));
		ne = map.phi2(ne);
		do
312
		{
untereiner's avatar
untereiner committed
313
			dd = map.phi1(map.phi1(map.phi1(ne)));
untereiner's avatar
untereiner committed
314

untereiner's avatar
untereiner committed
315 316
			//A Verifier !!
			map.splitFace(ne, dd) ;
untereiner's avatar
untereiner committed
317

untereiner's avatar
untereiner committed
318 319 320 321
			newEdges.push_back(map.phi1(dd));

			ne = map.phi2(map.phi_1(ne));
			dd = map.phi1(map.phi1(dd));
322
		}
untereiner's avatar
untereiner committed
323
		while(dd != stop);
324
	}
untereiner's avatar
untereiner committed
325

326
	//Third step : 3-sew internal faces
untereiner's avatar
untereiner committed
327
	for (std::vector<std::pair<Dart,Dart> >::iterator it = subdividedfaces.begin(); it != subdividedfaces.end(); ++it)
328
	{
untereiner's avatar
untereiner committed
329 330 331 332
		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))
333
		{
untereiner's avatar
untereiner committed
334 335 336 337 338
				//id pour toutes les faces interieures
				map.sewVolumes(map.phi2(f1), map.phi2(f2));

				//Fais a la couture !!!!!
				unsigned int idface = map.getNewFaceId();
339
				map.setFaceId(map.phi2(f1),idface, FACE);
340
		}
untereiner's avatar
untereiner committed
341

untereiner's avatar
untereiner committed
342
		//FAIS a la couture !!!!!!!
343
		//id pour toutes les aretes exterieurs des faces quadrangulees
untereiner's avatar
untereiner committed
344
		unsigned int idedge = map.getEdgeId(f1);
345 346
		map.setEdgeId(map.phi2(f1), idedge, DART);
		map.setEdgeId( map.phi2(f2), idedge, DART);
347 348
	}

untereiner's avatar
untereiner committed
349 350
	//LA copie de L'id est a gerer avec le sewVolumes normalement !!!!!!
	//id pour les aretes interieurs : (i.e. 6 pour un hexa)
351 352 353 354 355 356
	DartMarker mne(map);
	for(std::vector<Dart>::iterator it = newEdges.begin() ; it != newEdges.end() ; ++it)
	{
		if(!mne.isMarked(*it))
		{
			unsigned int idedge = map.getNewEdgeId();
357 358
			map.setEdgeId(*it, idedge, EDGE);
			mne.markOrbit(EDGE,*it);
359 360
		}
	}
untereiner's avatar
untereiner committed
361

362
	map.setCurrentLevel(cur) ;
363 364

	return subdividedfaces.begin()->first;
365
}
untereiner's avatar
untereiner committed
366

untereiner's avatar
untereiner committed
367

368
template <typename PFP>
untereiner's avatar
untereiner committed
369
void subdivideLoop(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position)
370
{
untereiner's avatar
untereiner committed
371 372
	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
373

untereiner's avatar
untereiner committed
374 375
	unsigned int vLevel = map.volumeLevel(d) ;
	Dart old = map.volumeOldestDart(d) ;
untereiner's avatar
untereiner committed
376

untereiner's avatar
untereiner committed
377 378
	unsigned int cur = map.getCurrentLevel() ;
	map.setCurrentLevel(vLevel) ;		// go to the level of the face to subdivide its edges
untereiner's avatar
untereiner committed
379 380


untereiner's avatar
untereiner committed
381 382 383 384 385
	/*
	 * 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
386

untereiner's avatar
untereiner committed
387 388
	DartMarkerStore mf(map);		// Lock a face marker to save one dart per face
	DartMarkerStore mv(map);		// Lock a vertex marker to compute volume center
untereiner's avatar
untereiner committed
389

untereiner's avatar
untereiner committed
390 391
	typename PFP::VEC3 volCenter;
	unsigned count = 0 ;
untereiner's avatar
untereiner committed
392

untereiner's avatar
untereiner committed
393 394 395 396
	//Store faces that are traversed and start with the face of d
	std::vector<Dart> visitedFaces;
	visitedFaces.reserve(20);
	visitedFaces.push_back(old);
untereiner's avatar
untereiner committed
397

untereiner's avatar
untereiner committed
398 399 400
	//Store the edges before the cutEdge
	std::vector<Dart> oldEdges;
	oldEdges.reserve(20);
untereiner's avatar
untereiner committed
401

402
	mf.markOrbit(FACE, old) ;
untereiner's avatar
untereiner committed
403

untereiner's avatar
untereiner committed
404
	for(std::vector<Dart>::iterator face = visitedFaces.begin(); face != visitedFaces.end(); ++face)
405
	{
untereiner's avatar
untereiner committed
406 407 408 409 410 411 412 413 414
		Dart e = *face ;
		do
		{
			//add one old edge per vertex to the old edge list
			//compute volume centroid
			if(!mv.isMarked(e))
			{
				volCenter += position[e];
				++count;
415
				mv.markOrbit(VERTEX, e);
untereiner's avatar
untereiner committed
416 417 418 419 420 421 422 423
				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) ;
424
				mf.markOrbit(FACE, ee) ;
untereiner's avatar
untereiner committed
425 426 427 428
			}

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

untereiner's avatar
untereiner committed
431
	volCenter /=  typename PFP::REAL(count) ;
432

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

untereiner's avatar
untereiner committed
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 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529
		//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_TRI);

			//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.phi2(map.phi1(d));
			Dart e = cf;
			do
			{
				subdividedfaces.push_back(std::pair<Dart,Dart>(e,map.phi2(e)));
				e = 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);

		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
			{

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

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

			map.closeHole(f1);
			map.closeHole(f2);
			map.sewVolumes(map.phi2(f1),map.phi2(f2));

			unsigned int fdeg = map.faceDegree(map.phi2(f1));

			if(fdeg > 3)
			{
				istet = false;
				Dart old = map.phi2(map.phi1(*edge));
				Dart dd = map.phi1(old) ;
				map.splitFace(old,dd) ;

				Dart ne = map.phi1(old);

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

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

					map.splitFace(ne, dd) ;

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

					ne = map.phi2(map.phi_1(ne));
					dd = map.phi1(dd);
				}
				while(dd != stop);
			}
			else
			{
				unsigned int idface = map.getNewFaceId();
530
				map.setFaceId(map.phi2(f1),idface, FACE);
untereiner's avatar
untereiner committed
531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553
			}

		}

		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();
554
					map.setFaceId(map.phi2(f3),idface, FACE);
untereiner's avatar
untereiner committed
555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571


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

			}
		}

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

			//FAIS a la couture !!!!!!!
			//id pour toutes les aretes exterieurs des faces quadrangulees
			unsigned int idedge = map.getEdgeId(f1);
572 573
			map.setEdgeId(map.phi2(f1), idedge, DART);
			map.setEdgeId( map.phi2(f2), idedge, DART);
untereiner's avatar
untereiner committed
574 575 576 577 578 579 580 581 582 583 584

		}

		//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();
585 586
				map.setEdgeId(*it, idedge, EDGE);
				mne.markOrbit(EDGE,*it);
untereiner's avatar
untereiner committed
587 588 589 590 591
			}
		}


		map.setCurrentLevel(cur) ;
592 593
}

untereiner's avatar
untereiner committed
594 595 596 597 598 599 600 601 602

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
603
	map.uncutEdge(d) ;
untereiner's avatar
untereiner committed
604 605 606 607 608 609 610
	map.setCurrentLevel(cur) ;
}

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

untereiner's avatar
untereiner committed
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
	unsigned int cur = map.getCurrentLevel() ;

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

	if(degree == 3)
	{
//		fit = d ;
//		do
//		{
//			map.setCurrentLevel(cur + 1) ;
//			Dart innerEdge = map.phi1(fit) ;
//			map.setCurrentLevel(map.getMaxLevel()) ;
//			map.mergeFaces(innerEdge) ;
//			map.setCurrentLevel(cur) ;
//			fit = map.phi1(fit) ;
//		} while(fit != d) ;
	}
	else
	{
		map.setCurrentLevel(cur + 1) ;
		Dart centralV = map.phi1(map.phi1(d)) ;
		map.setCurrentLevel(map.getMaxLevel()) ;
		map.deleteVertex(centralV) ;
		map.setCurrentLevel(cur) ;
	}

//	fit = d ;
//	do
//	{
//		if(map.edgeCanBeCoarsened(fit))
//			coarsenEdge<PFP>(map, fit, position) ;
//		fit = map.phi1(fit) ;
//	} while(fit != d) ;
untereiner's avatar
untereiner committed
652 653 654 655 656 657 658 659
}

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
660 661 662 663 664 665 666 667 668 669 670 671 672 673 674
	unsigned int cur = map.getCurrentLevel() ;

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

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

675
	mf.markOrbit(FACE, d) ;
untereiner's avatar
untereiner committed
676 677 678 679 680 681 682 683 684 685 686

	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) ;
687
				mf.markOrbit(FACE, ee) ;
untereiner's avatar
untereiner committed
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
			}

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

	/*
	 * fusionner tous les volumes internes
	 */
	map.setCurrentLevel(cur + 1) ;
	Dart centralV = map.phi_1(map.phi2(map.phi1(d)));
	map.deleteVertex(centralV) ;
	map.setCurrentLevel(cur) ;

	/*
	 * simplifier les faces
	 */
	for(std::vector<Dart>::iterator face = visitedFaces.begin(); face != visitedFaces.end(); ++face)
	{
		Dart d = *face;

		if(map.faceIsSubdividedOnce(d))
		{
			std::cout << "once : " << d << std::endl;
			coarsenFace<PFP>(map, d, position);
		}
	}

	map.setCurrentLevel(cur) ;

	/*
	 * simplifier les aretes
	 */
	for(std::vector<Dart>::iterator face = visitedFaces.begin(); face != visitedFaces.end(); ++face)
	{
			Dart fit = *face ;
			do
			{
				if(map.edgeCanBeCoarsened(fit))
				{
					std::cout << "edge coarsened = " << fit << std::endl;
				}
					//coarsenEdge<PFP>(map, fit, position) ;
				std::cout << "boucle = " << fit << std::endl;
				fit = map.phi1(fit) ;
			} while(fit != *face) ;
	}

	std::cout << "end" << std::endl;

	map.setCurrentLevel(cur) ;
untereiner's avatar
untereiner committed
739 740
}

untereiner's avatar
untereiner committed
741
/***********************************************************************************
untereiner's avatar
ihm3  
untereiner committed
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
 *												Raffinement
 ***********************************************************************************/
template <typename PFP>
void splitVolume(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 cur = map.getCurrentLevel() ;
	unsigned int vLevel = map.volumeLevel(d) ;
	map.setCurrentLevel(vLevel) ;

	// first cut the edges (if they are not already)
	Dart t = d;
	do
	{
		if(!map.edgeIsSubdivided(map.phi1(map.phi2(t))))
			Algo::IHM::subdivideEdge<PFP>(map, map.phi1(map.phi2(t)), position) ;
		t = map.phi1(t);
	}
	while(t != d);

	unsigned int fLevel = map.faceLevel(map.phi1(d));
	map.setCurrentLevel(fLevel+1) ;		// go to the level of the face to subdivide its edges
	Dart neighboordVolume = map.phi1(map.phi1(map.phi2(d)));
	//map.setCurrentLevel(cur) ; // go to the next level to perform volume subdivision

	//Split the faces and open the midlle
	do
	{
		Dart t2 = map.phi2(t);

		unsigned int fLevel = map.faceLevel(t2) ;
		map.setCurrentLevel(fLevel+1) ;		// go to the level of the face to subdivide its edges

		Dart face2 = map.phi1(map.phi1(t2));
		map.splitFace(map.phi_1(t2), face2);
		map.unsewFaces(map.phi1(map.phi1(t2)));

		//id de face pour les 2 nouveaux brins
		unsigned int idface = map.getFaceId(t2);
		map.setFaceId(map.phi1(map.phi1(t2)), idface, DART);
		map.setFaceId(map.phi_1(face2), idface, DART);

		t = map.phi1(t);
	}
	while(t != d);

	//close the middle to create volumes & sew them
	map.setCurrentLevel(vLevel + 1) ; // go to the next level to perform volume subdivision

	map.closeHole(map.phi1(map.phi1(map.phi2(d))));
	map.closeHole(map.phi_1(neighboordVolume));
	map.sewVolumes(map.phi2(map.phi1(map.phi1(map.phi2(d)))), map.phi2(map.phi_1(neighboordVolume)));

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

	do
	{
		Dart t211 = map.phi1(map.phi1(map.phi2(t)));

		unsigned int idedge = map.getNewEdgeId();
		map.setEdgeId(t211, idedge, EDGE);
		t = map.phi1(t);
	}
	while(t != d);

	map.setCurrentLevel(cur) ;
}

/*************************************************************************************
untereiner's avatar
untereiner committed
814 815 816
 *
 */

817
template <typename PFP>
untereiner's avatar
untereiner committed
818
void subdivideVolume(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position, SubdivideType sType)
819 820 821 822 823 824 825 826 827 828
{
	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) ;		// go to the level of the face to subdivide its edges

untereiner's avatar
untereiner committed
829

untereiner's avatar
untereiner committed
830
	/*
untereiner's avatar
untereiner committed
831
	 * au niveau du volume courant i
832
	 * stockage d'un brin de chaque face de celui-ci
untereiner's avatar
untereiner committed
833
	 * avec calcul du centroid
untereiner's avatar
untereiner committed
834
	 */
835

untereiner's avatar
untereiner committed
836 837 838 839 840
	DartMarkerStore mf(map);		// Lock a face marker to save one dart per face
	DartMarkerStore mv(map);		// Lock a vertex marker to compute volume center

	typename PFP::VEC3 volCenter;
	unsigned count = 0 ;
841 842 843 844 845

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

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

851
	mf.markOrbit(FACE, old) ;
untereiner's avatar
untereiner committed
852

853
	for(std::vector<Dart>::iterator face = visitedFaces.begin(); face != visitedFaces.end(); ++face)
854
	{
855
		Dart e = *face ;
untereiner's avatar
untereiner committed
856
		do
857
		{
untereiner's avatar
untereiner committed
858 859 860 861 862 863
			//add one old edge per vertex to the old edge list
			//compute volume centroid
			if(!mv.isMarked(e))
			{
				volCenter += position[e];
				++count;
864
				mv.markOrbit(VERTEX, e);
untereiner's avatar
untereiner committed
865 866
				oldEdges.push_back(e);
			}
867

untereiner's avatar
untereiner committed
868
			// add all face neighbours to the table
869 870 871 872
			Dart ee = map.phi2(e) ;
			if(!mf.isMarked(ee)) // not already marked
			{
				visitedFaces.push_back(ee) ;
873
				mf.markOrbit(FACE, ee) ;
874
			}
untereiner's avatar
untereiner committed
875

876 877
			e = map.phi1(e) ;
		} while(e != *face) ;
878 879
	}

untereiner's avatar
untereiner committed
880 881 882 883 884 885 886 887 888 889 890 891 892
	volCenter /= typename PFP::REAL(count) ;

	/*
	 * Subdivision
	 */

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

	std::vector<std::pair<Dart,Dart> > subdividedQuadFaces;
	subdividedQuadFaces.reserve(15);

893 894 895 896 897 898
	//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
899
		//if needed subdivide face
900
		if(!map.faceIsSubdivided(d))
untereiner's avatar
untereiner committed
901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922
			Algo::IHM::subdivideFace<PFP>(map, d, position, Algo::IHM::S_TRI);

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

		//Face tri
		if(map.phi1(map.phi1(map.phi1(d))) == d)
		{

			//le brin est forcement du niveau cur
			Dart cf = map.phi2(map.phi1(d));
			Dart e = cf;
			do
			{
				subdividedTriFaces.push_back(std::pair<Dart,Dart>(e,map.phi2(e)));
				e = map.phi1(e);
			}while (e != cf);
		}
		else
923
		{
untereiner's avatar
untereiner committed
924 925 926 927 928 929 930 931
			//le brin est forcement du niveau cur
			Dart cf = map.phi1(d);
			Dart e = cf;
			do
			{
				subdividedQuadFaces.push_back(std::pair<Dart,Dart>(e,map.phi2(e)));
				e = map.phi2(map.phi1(e));
			}while (e != cf);
932
		}
untereiner's avatar
untereiner committed
933 934

		map.setCurrentLevel(cur);
935 936
	}

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

untereiner's avatar
untereiner committed
939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967
	//Second step : create corners
	for (std::vector<Dart>::iterator edge = oldEdges.begin(); edge != oldEdges.end(); ++edge)
	{
		Dart e = *edge;

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

		do
		{
			if(map.phi1(map.phi1(map.phi1(e))) != e)
				map.unsewFaces(map.phi1(map.phi1(e)));
			if(map.phi2(map.phi1(e)) != map.phi1(e))
				map.unsewFaces(map.phi1(e));

			e = map.phi2(map.phi_1(e));

		}while(e != *edge);

		map.closeHole(f1);
		map.closeHole(f2);
		map.sewVolumes(map.phi2(f1),map.phi2(f2));

		//un passage sur chaque nouvelle face pour recopier l'id d'arete
		Dart d = map.phi2(f1);
		e = d;
		do
		{
			unsigned int idedge = map.getEdgeId(map.phi2(e));
968
			map.setEdgeId(e, idedge, EDGE);
untereiner's avatar
untereiner committed
969 970 971 972 973 974
			e = map.phi1(e);
		}while(e != d);


		//Identifiant de face pour les 2 faces orientees
		unsigned int idface = map.getNewFaceId();
975
		map.setFaceId(map.phi2(f1),idface, FACE);
untereiner's avatar
untereiner committed
976 977 978 979 980 981 982 983 984 985 986
	}

	std::vector<Dart> inFaces;
	inFaces.reserve(10);

	//DartMarkerStore mv(map);

//	//Third Step : split inner faces if quad faces exists
//	for(std::vector<std::pair<Dart,Dart> >::iterator quadFaces = subdividedQuadFaces.begin() ; quadFaces != subdividedQuadFaces.end() ; ++quadFaces)
//	{
//		Dart f = (*quadFaces).first;
987
//
untereiner's avatar
untereiner committed
988 989 990
//		//if(!map.isMarked(f))
//		//{
//			map.splitFace(map.phi2(f), map.phi_1(map.phi_1(map.phi2(f))));
991
//			//mv.markOrbit(VERTEX(map.phi2(f));
untereiner's avatar
untereiner committed
992
//		//}
993
//
untereiner's avatar
untereiner committed
994 995 996 997
//		inFaces.push_back(map.phi1(map.phi3(map.phi2(f))));
//
//
//		unsigned int idface = map.getNewFaceId();
998
//		map.setFaceId(map.phi2(f),idface, FACE);
untereiner's avatar
untereiner committed
999 1000
//
//		idface = map.getNewFaceId();
1001
//		map.setFaceId(map.phi2(map.phi_1(map.phi2(f))),idface, FACE);
untereiner's avatar
untereiner committed
1002 1003 1004
//	}
//
//	for(std::vector<Dart>::iterator inFace = inFaces.begin() ; inFace != inFaces.end() ; ++inFace)
1005
//	{
untereiner's avatar
untereiner committed
1006 1007
//		Dart e = *inFace;
//		Dart e2 = map.phi2(*inFace);
1008 1009 1010
//
//		do
//		{
untereiner's avatar
untereiner committed
1011 1012 1013
//			map.unsewFaces(e);
//			e = map.phi1(map.phi2(map.phi1(e)));
//		}while(e != *inFace);
1014
//
untereiner's avatar
untereiner committed
1015 1016 1017 1018 1019 1020 1021
//		map.closeHole(*inFace);
//		map.closeHole(e2);
//
//		map.sewVolumes(map.phi2(*inFace), map.phi2(e2));
//
//		//Identifiant de face pour les 2 faces orientees
//		unsigned int idface = map.getNewFaceId();
1022
//		map.setFaceId(map.phi2(*inFace),idface, FACE);
untereiner's avatar
untereiner committed
1023 1024
//
//		//unsigned int idedge = map.getEdgeId(map.phi2(map.phi1(map.phi2(*inFace))));
1025
//		//map.setEdgeId(map.phi1(map.phi2(*inFace)), idedge, EDGE);
untereiner's avatar
untereiner committed
1026 1027 1028 1029 1030 1031 1032 1033
//
//	}
//
//	for(std::vector<Dart>::iterator inFace = inFaces.begin() ; inFace != inFaces.end() ; ++inFace)
//	{
//		Dart e = *inFace;
//
//		unsigned int idedge = map.getNewEdgeId();
1034
//		map.setEdgeId(e, idedge, EDGE);
untereiner's avatar
untereiner committed
1035 1036
//
//		idedge = map.getEdgeId(map.phi2(map.phi1(map.phi1(map.phi2(*inFace)))));
1037
//		map.setEdgeId(map.phi1(map.phi1(map.phi2(*inFace))), idedge, EDGE);
untereiner's avatar
untereiner committed
1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102
//
//	}

	map.setCurrentLevel(cur);
}


//				Dart old = map.phi1(map.phi2(map.phi1(e)));
//				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);
//
//				map.cutEdge(ne) ;
//				position[map.phi2(ne)] = volCenter;
//
//				newEdges.push_back(ne);
//				newEdges.push_back(map.phi1(ne));
//
//				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) ;
//
//					newEdges.push_back(ne);
//					newEdges.push_back(map.phi1(ne));
//
//					dd = next ;
//				}

template <typename PFP>
void catmullClark(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") ;

	typedef typename PFP::VEC3 VEC3;

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

//	unsigned int cur = map.getCurrentLevel() ;
//	map.setCurrentLevel(vLevel) ;		// go to the level of the face to subdivide its edges


	/*
	 * 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);		// Lock a vertex marker to compute volume center

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

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

1103
	mf.markOrbit(FACE, old) ;
untereiner's avatar
untereiner committed
1104 1105 1106 1107 1108 1109 1110 1111 1112 1113

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