subdivision3.hpp 42.6 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
		{
untereiner's avatar
untereiner committed
89
			Algo::IHM::subdivideEdge<PFP>(map, it, position) ;	// and compute the degree of the face
untereiner's avatar
untereiner committed
90
		}
91 92 93 94 95 96
		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

97
	Dart res;
98

untereiner's avatar
untereiner committed
99 100 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
//	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() ;
//		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
//	{
131 132 133 134 135
		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);
136

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

143
		position[map.phi2(ne)] = p ;
144

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

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

			dd = next ;
		}

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

	map.setCurrentLevel(cur) ;
170 171 172
}

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

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

untereiner's avatar
untereiner committed
184 185 186

	std::cout << "vLevel = " << vLevel << std::endl;

187
	/*
188
	 * au niveau du volume courant i
189
	 * stockage d'un brin de chaque face de celui-ci
190
	 * avec calcul du centroid
191 192
	 */

193
	DartMarkerStore mf(map);		// Lock a face marker to save one dart per face
untereiner's avatar
untereiner committed
194 195
	//DartMarkerStore mv(map);		// Lock a vertex marker to compute volume center
	CellMarker mv(map, VERTEX);
196 197 198

	typename PFP::VEC3 volCenter;
	unsigned count = 0 ;
199 200 201 202 203 204 205 206 207 208

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

209
	mf.markOrbit(FACE, old) ;
210

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

untereiner's avatar
untereiner committed
227
			// add all face neighbours to the table
228 229 230 231
			Dart ee = map.phi2(e) ;
			if(!mf.isMarked(ee)) // not already marked
			{
				visitedFaces.push_back(ee) ;
232
				mf.markOrbit(FACE, ee) ;
233
			}
234

235 236 237 238
			e = map.phi1(e) ;
		} while(e != *face) ;
	}

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

untereiner's avatar
untereiner committed
241
	/*
242
	 * Subdivision
untereiner's avatar
untereiner committed
243
	 */
244

untereiner's avatar
untereiner committed
245
	//Store the darts from quadrangulated faces
untereiner's avatar
untereiner committed
246 247
	std::vector<std::pair<Dart,Dart> > subdividedfaces;
	subdividedfaces.reserve(25);
248

untereiner's avatar
untereiner committed
249
	int i = 0;
250 251 252 253 254 255
	//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;

256
		//if needed subdivide face
untereiner's avatar
untereiner committed
257
		if(!map.faceIsSubdivided(d))
untereiner's avatar
untereiner committed
258 259
		{
			++i;
untereiner's avatar
untereiner committed
260
			Algo::IHM::subdivideFace<PFP>(map, d, position);
untereiner's avatar
untereiner committed
261 262 263 264 265
		}


		std::cout << "CHECK FACES " << std::endl;
		map.check();
266

267 268
		//save a dart from the subdivided face
		unsigned int cur = map.getCurrentLevel() ;
untereiner's avatar
untereiner committed
269

untereiner's avatar
untereiner committed
270 271 272 273 274 275
		map.setCurrentLevel(map.getMaxLevel());
		Dart old = map.faceOldestDart(d);
		std::cout << "                  Oldest dart Face = " << old << std::endl;
		unsigned int fLevel = map.faceLevel(old); //puisque dans tous les cas, la face est subdivisee
		std::cout << "FACE LEVEL = " << fLevel << std::endl;

276
		map.setCurrentLevel(fLevel) ;
untereiner's avatar
untereiner committed
277

untereiner's avatar
untereiner committed
278 279

		//le brin est forcement du niveau cur
280 281 282 283
		Dart cf = map.phi1(d);
		Dart e = cf;
		do
		{
untereiner's avatar
untereiner committed
284
			subdividedfaces.push_back(std::pair<Dart,Dart>(e,map.phi2(e)));
285 286
			e = map.phi2(map.phi1(e));
		}while (e != cf);
untereiner's avatar
untereiner committed
287

288 289
		map.setCurrentLevel(cur);
	}
untereiner's avatar
untereiner committed
290

untereiner's avatar
untereiner committed
291 292


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

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

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

untereiner's avatar
untereiner committed
303
		Dart f1 = map.phi1(*edge);
untereiner's avatar
untereiner committed
304
		int i  = 0;
305 306
		do
		{
untereiner's avatar
untereiner committed
307 308 309
			std::cout << "corner #" << i << "  degree = " << map.faceDegree(e) << std::endl;
			if(map.phi2(map.phi1(map.phi1(e))) != map.phi1(map.phi1(e)))
				map.unsewFaces(map.phi1(map.phi1(e)));
untereiner's avatar
untereiner committed
310 311

			//TODO utile ?
untereiner's avatar
untereiner committed
312
			if(map.phi2(map.phi1(e)) != map.phi1(e))
untereiner's avatar
untereiner committed
313 314
				map.unsewFaces(map.phi1(e));

untereiner's avatar
untereiner committed
315
			++i;
316
			e = map.phi2(map.phi_1(e));
untereiner's avatar
untereiner committed
317 318
		}
		while(e != *edge);
untereiner's avatar
untereiner committed
319

untereiner's avatar
untereiner committed
320
		map.closeHole(f1);
untereiner's avatar
untereiner committed
321

untereiner's avatar
untereiner committed
322 323 324 325 326 327 328 329 330
		std::cout << "CHECK CLOSE HOLE " << std::endl;
		map.check();

		std::cout << "corner degree = " << i << std::endl;

		std::cout << "face degree = " << map.faceDegree(map.phi2(f1)) << std::endl;
//		if(map.faceDegree(map.phi2(f1)) > 6)
//			return Dart::nil();

untereiner's avatar
untereiner committed
331 332 333
		Dart old = map.phi2(map.phi1(e));
		Dart dd = map.phi1(map.phi1(old)) ;
		map.splitFace(old,dd) ;
334

untereiner's avatar
untereiner committed
335
		Dart ne = map.phi1(map.phi1(old)) ;
336

untereiner's avatar
untereiner committed
337 338
		map.cutEdge(ne);
		position[map.phi1(ne)] = volCenter; //plonger a la fin de la boucle ????
339 340
		newEdges.push_back(ne);
		newEdges.push_back(map.phi1(ne));
untereiner's avatar
untereiner committed
341

untereiner's avatar
untereiner committed
342 343 344 345

		Dart stop = map.phi2(map.phi1(ne));
		ne = map.phi2(ne);
		do
346
		{
untereiner's avatar
untereiner committed
347
			dd = map.phi1(map.phi1(map.phi1(ne)));
untereiner's avatar
untereiner committed
348

untereiner's avatar
untereiner committed
349 350
			//A Verifier !!
			map.splitFace(ne, dd) ;
untereiner's avatar
untereiner committed
351

untereiner's avatar
untereiner committed
352 353 354 355
			newEdges.push_back(map.phi1(dd));

			ne = map.phi2(map.phi_1(ne));
			dd = map.phi1(map.phi1(dd));
356
		}
untereiner's avatar
untereiner committed
357
		while(dd != stop);
358
	}
untereiner's avatar
untereiner committed
359

360
	//Third step : 3-sew internal faces
untereiner's avatar
untereiner committed
361
	for (std::vector<std::pair<Dart,Dart> >::iterator it = subdividedfaces.begin(); it != subdividedfaces.end(); ++it)
362
	{
untereiner's avatar
untereiner committed
363 364 365 366
		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))
367
		{
untereiner's avatar
untereiner committed
368 369 370 371 372
				//id pour toutes les faces interieures
				map.sewVolumes(map.phi2(f1), map.phi2(f2));

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

untereiner's avatar
untereiner committed
376
		//FAIS a la couture !!!!!!!
377
		//id pour toutes les aretes exterieurs des faces quadrangulees
untereiner's avatar
untereiner committed
378
		unsigned int idedge = map.getEdgeId(f1);
379 380
		map.setEdgeId(map.phi2(f1), idedge, DART);
		map.setEdgeId( map.phi2(f2), idedge, DART);
381 382
	}

untereiner's avatar
untereiner committed
383 384
	//LA copie de L'id est a gerer avec le sewVolumes normalement !!!!!!
	//id pour les aretes interieurs : (i.e. 6 pour un hexa)
385 386 387 388 389 390
	DartMarker mne(map);
	for(std::vector<Dart>::iterator it = newEdges.begin() ; it != newEdges.end() ; ++it)
	{
		if(!mne.isMarked(*it))
		{
			unsigned int idedge = map.getNewEdgeId();
391 392
			map.setEdgeId(*it, idedge, EDGE);
			mne.markOrbit(EDGE,*it);
393 394
		}
	}
untereiner's avatar
untereiner committed
395

396
	map.setCurrentLevel(cur) ;
397

untereiner's avatar
untereiner committed
398 399
	std::cout << std::endl;

400
	return subdividedfaces.begin()->first;
401
}
untereiner's avatar
untereiner committed
402

untereiner's avatar
untereiner committed
403

404
template <typename PFP>
untereiner's avatar
untereiner committed
405
void subdivideLoop(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position)
406
{
untereiner's avatar
untereiner committed
407 408
	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
409

untereiner's avatar
untereiner committed
410 411
	unsigned int vLevel = map.volumeLevel(d) ;
	Dart old = map.volumeOldestDart(d) ;
untereiner's avatar
untereiner committed
412

untereiner's avatar
untereiner committed
413 414
	unsigned int cur = map.getCurrentLevel() ;
	map.setCurrentLevel(vLevel) ;		// go to the level of the face to subdivide its edges
untereiner's avatar
untereiner committed
415 416


untereiner's avatar
untereiner committed
417 418 419 420 421
	/*
	 * 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
422

untereiner's avatar
untereiner committed
423 424
	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
425

untereiner's avatar
untereiner committed
426 427
	typename PFP::VEC3 volCenter;
	unsigned count = 0 ;
untereiner's avatar
untereiner committed
428

untereiner's avatar
untereiner committed
429 430 431 432
	//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
433

untereiner's avatar
untereiner committed
434 435 436
	//Store the edges before the cutEdge
	std::vector<Dart> oldEdges;
	oldEdges.reserve(20);
untereiner's avatar
untereiner committed
437

438
	mf.markOrbit(FACE, old) ;
untereiner's avatar
untereiner committed
439

untereiner's avatar
untereiner committed
440
	for(std::vector<Dart>::iterator face = visitedFaces.begin(); face != visitedFaces.end(); ++face)
441
	{
untereiner's avatar
untereiner committed
442 443 444 445 446 447 448 449 450
		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;
451
				mv.markOrbit(VERTEX, e);
untereiner's avatar
untereiner committed
452 453 454 455 456 457 458 459
				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) ;
460
				mf.markOrbit(FACE, ee) ;
untereiner's avatar
untereiner committed
461 462 463 464
			}

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

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

untereiner's avatar
untereiner committed
469 470 471 472 473 474
	/*
	 * Subdivision
	 */
	//Store the darts from quadrangulated faces
		std::vector<std::pair<Dart,Dart> > subdividedfaces;
		subdividedfaces.reserve(25);
475

untereiner's avatar
untereiner committed
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 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
		//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();
566
				map.setFaceId(map.phi2(f1),idface, FACE);
untereiner's avatar
untereiner committed
567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589
			}

		}

		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();
590
					map.setFaceId(map.phi2(f3),idface, FACE);
untereiner's avatar
untereiner committed
591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607


					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);
608 609
			map.setEdgeId(map.phi2(f1), idedge, DART);
			map.setEdgeId( map.phi2(f2), idedge, DART);
untereiner's avatar
untereiner committed
610 611 612 613 614 615 616 617 618 619 620

		}

		//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();
621 622
				map.setEdgeId(*it, idedge, EDGE);
				mne.markOrbit(EDGE,*it);
untereiner's avatar
untereiner committed
623 624 625 626 627
			}
		}


		map.setCurrentLevel(cur) ;
628 629
}

untereiner's avatar
untereiner committed
630 631 632 633 634 635 636 637 638

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
639
	map.uncutEdge(d) ;
untereiner's avatar
untereiner committed
640 641 642 643 644 645 646
	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
647
	assert(map.faceIsSubdividedOnce(d) || !"Trying to coarsen a non-subdivided face or a more than once subdivided face") ;
untereiner's avatar
untereiner committed
648

untereiner's avatar
untereiner committed
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
	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
688 689 690 691 692 693 694 695
}

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
696 697 698 699 700 701 702 703 704 705 706 707 708 709 710
	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);

711
	mf.markOrbit(FACE, d) ;
untereiner's avatar
untereiner committed
712 713 714 715 716 717 718 719 720 721 722

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

			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
775 776
}

untereiner's avatar
untereiner committed
777
/***********************************************************************************
untereiner's avatar
ihm3  
untereiner committed
778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849
 *												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
850 851 852
 *
 */

853
template <typename PFP>
untereiner's avatar
untereiner committed
854
void subdivideVolume(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position, SubdivideType sType)
855 856 857 858 859 860 861 862 863 864
{
	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
865

untereiner's avatar
untereiner committed
866
	/*
untereiner's avatar
untereiner committed
867
	 * au niveau du volume courant i
868
	 * stockage d'un brin de chaque face de celui-ci
untereiner's avatar
untereiner committed
869
	 * avec calcul du centroid
untereiner's avatar
untereiner committed
870
	 */
871

untereiner's avatar
untereiner committed
872 873 874 875 876
	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 ;
877 878 879 880 881

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

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

887
	mf.markOrbit(FACE, old) ;
untereiner's avatar
untereiner committed
888

889
	for(std::vector<Dart>::iterator face = visitedFaces.begin(); face != visitedFaces.end(); ++face)
890
	{
891
		Dart e = *face ;
untereiner's avatar
untereiner committed
892
		do
893
		{
untereiner's avatar
untereiner committed
894 895 896 897 898 899
			//add one old edge per vertex to the old edge list
			//compute volume centroid
			if(!mv.isMarked(e))
			{
				volCenter += position[e];
				++count;
900
				mv.markOrbit(VERTEX, e);
untereiner's avatar
untereiner committed
901 902
				oldEdges.push_back(e);
			}
903

untereiner's avatar
untereiner committed
904
			// add all face neighbours to the table
905 906 907 908
			Dart ee = map.phi2(e) ;
			if(!mf.isMarked(ee)) // not already marked
			{
				visitedFaces.push_back(ee) ;
909
				mf.markOrbit(FACE, ee) ;
910
			}
untereiner's avatar
untereiner committed
911

912 913
			e = map.phi1(e) ;
		} while(e != *face) ;
914 915
	}

untereiner's avatar
untereiner committed
916 917 918 919 920 921 922 923 924 925 926 927 928
	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);

929 930 931 932 933 934
	//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
935
		//if needed subdivide face
936
		if(!map.faceIsSubdivided(d))
untereiner's avatar
untereiner committed
937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958
			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
959
		{
untereiner's avatar
untereiner committed
960 961 962 963 964 965 966 967
			//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);
968
		}
untereiner's avatar
untereiner committed
969 970

		map.setCurrentLevel(cur);
971 972
	}

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

untereiner's avatar
untereiner committed
975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003
	//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));
1004
			map.setEdgeId(e, idedge, EDGE);
untereiner's avatar
untereiner committed
1005 1006 1007 1008 1009 1010
			e = map.phi1(e);
		}while(e != d);


		//Identifiant de face pour les 2 faces orientees
		unsigned int idface = map.getNewFaceId();
1011
		map.setFaceId(map.phi2(f1),idface, FACE);
untereiner's avatar
untereiner committed
1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022
	}

	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;
1023
//
untereiner's avatar
untereiner committed
1024 1025 1026
//		//if(!map.isMarked(f))
//		//{
//			map.splitFace(map.phi2(f), map.phi_1(map.phi_1(map.phi2(f))));
1027
//			//mv.markOrbit(VERTEX(map.phi2(f));
untereiner's avatar
untereiner committed
1028
//		//}
1029
//
untereiner's avatar
untereiner committed
1030 1031 1032 1033
//		inFaces.push_back(map.phi1(map.phi3(map.phi2(f))));
//
//
//		unsigned int idface = map.getNewFaceId();
1034
//		map.setFaceId(map.phi2(f),idface, FACE);
untereiner's avatar
untereiner committed
1035 1036
//
//		idface = map.getNewFaceId();
1037
//		map.setFaceId(map.phi2(map.phi_1(map.phi2(f))),idface, FACE);
untereiner's avatar
untereiner committed
1038 1039 1040
//	}
//
//	for(std::vector<Dart>::iterator inFace = inFaces.begin() ; inFace != inFaces.end() ; ++inFace)
1041
//	{
untereiner's avatar
untereiner committed
1042 1043
//		Dart e = *inFace;
//		Dart e2 = map.phi2(*inFace);
1044 1045 1046
//
//		do
//		{
untereiner's avatar
untereiner committed
1047 1048 1049
//			map.unsewFaces(e);
//			e = map.phi1(map.phi2(map.phi1(e)));
//		}while(e != *inFace);
1050
//
untereiner's avatar
untereiner committed
1051 1052 1053 1054 1055 1056 1057
//		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();
1058
//		map.setFaceId(map.phi2(*inFace),idface, FACE);
untereiner's avatar
untereiner committed
1059 1060
//
//		//unsigned int idedge = map.getEdgeId(map.phi2(map.phi1(map.phi2(*inFace))));
1061
//		//map.setEdgeId(map.phi1(map.phi2(*inFace)), idedge, EDGE);
untereiner's avatar
untereiner committed
1062 1063 1064 1065 1066 1067 1068 1069
//
//	}
//
//	for(std::vector<Dart>::iterator inFace = inFaces.begin() ; inFace != inFaces.end() ; ++inFace)
//	{
//		Dart e = *inFace;
//
//		unsigned int idedge = map.getNewEdgeId();
1070
//		map.setEdgeId(e, idedge, EDGE);
untereiner's avatar
untereiner committed
1071 1072
//
//		idedge = map.getEdgeId(map.phi2(map.phi1(map.phi1(map.phi2(*inFace)))));
1073
//		map.setEdgeId(map.phi1(map.phi1(map.phi2(*inFace))), idedge, EDGE);
untereiner's avatar
untereiner committed
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 1103 1104 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 1131 1132 1133 1134 1135 1136 1137 1138
//
//	}

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