polyhedron.hpp 30.3 KB
Newer Older
Pierre Kraemer's avatar
Pierre Kraemer committed
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           *
Pierre Kraemer's avatar
Pierre Kraemer committed
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/                                         *
Pierre Kraemer's avatar
Pierre Kraemer committed
21 22 23 24 25 26 27 28 29 30 31 32 33
* Contact information: cgogn@unistra.fr                                        *
*                                                                              *
*******************************************************************************/

namespace CGoGN
{

namespace Algo
{

namespace Modelisation
{

untereiner's avatar
untereiner committed
34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119
template <typename PFP>
void explodPolyhedron(typename PFP::MAP& map, Dart d, typename PFP::TVEC3 position)
{
	map.unsewVertexUmbrella(d);
	unsigned int newFaceDegree = map.closeHole(map.phi1(d));


	if(newFaceDegree != 3)
	{
		//chercher le brin ou demarer

		std::multimap<Dart, int> edges ;
		typename std::multimap<Dart, int>::iterator it ;

		Dart d12 = map.phi2(map.phi1(d));
		Dart fit = d12;
		int i;

		do
		{
			i = map.faceDegree(map.phi2(fit));

			std::cout << "edge(" << fit << "," << i << ")" << std::endl;

			edges.insert(std::make_pair(fit, i));

			fit  = map.phi1(fit);
		}
		while(fit != d12);

		do
		{
			//44 44
			if(edges.find(fit)->second == 4 && edges.find(map.phi1(fit))->second == 4
				&& !map.sameFace(map.phi2(fit), map.phi2(map.phi1(fit))))
			{
				map.splitFace(fit, map.phi1(map.phi1(fit)));
				fit = map.phi2(map.phi_1(fit));
				int i = map.faceDegree(fit);
				edges.insert(std::make_pair(fit, i));

//				Dart fit2 = map.phi2(fit) ;
//				typename PFP::VEC3 p1 = position[fit] ;
//				typename PFP::VEC3 p2 = position[fit2] ;
//
//				map.cutEdge(fit) ;
//				position[map.phi1(fit)] = typename PFP::REAL(0.5) * (p1 + p2);


				std::cout << "flip cas quad quad " << std::endl;
			}

			//3 3
			if(edges.find(fit)->second == 3 && edges.find(map.phi1(fit))->second == 3
				&& !map.sameFace(map.phi2(fit), map.phi2(map.phi1(fit))))
			{
				map.splitFace(fit, map.phi1(fit));
				fit = map.phi2(map.phi_1(fit));
				int i = map.faceDegree(fit);
				edges.insert(std::make_pair(fit, i));

				std::cout << "flip cas tri tri" << std::endl;
			}

			//3 44 ou 44 3
			if( ((edges.find(fit)->second == 4 && edges.find(map.phi1(fit))->second == 3)
				|| (edges.find(fit)->second == 3 && edges.find(map.phi1(fit))->second == 4))
					&& !map.sameFace(map.phi2(fit), map.phi2(map.phi1(fit))))
			{
				map.splitFace(fit, map.phi1(map.phi1(fit)));
				fit = map.phi2(map.phi_1(fit));
				int i = map.faceDegree(fit);
				edges.insert(std::make_pair(fit, i));

				std::cout << "flip cas quad tri" << std::endl;
			}



			fit = map.phi1(fit);
		}
		while(map.faceDegree(fit) > 4 && fit != d12);

	}
}

Pierre Kraemer's avatar
Pierre Kraemer committed
120 121 122 123 124 125 126 127 128 129 130
template <typename PFP>
Polyhedron<PFP>::Polyhedron(const Polyhedron<PFP>& p1, const Polyhedron<PFP>& p2):
m_map(p1.m_map),
m_dart(p1.m_dart),
m_kind(COMPOSED),
m_nx(-1), m_ny(-1), m_nz(-1),
m_top_closed(false), m_bottom_closed(false),
m_positions(p1.m_positions)
{
	if (&(p1.map) != &(p2.map))
	{
131
		CGoGNerr << "Warning, can not merge to Polyhedrons of different maps"<< CGoGNendl;
Pierre Kraemer's avatar
Pierre Kraemer committed
132 133 134 135 136 137 138 139 140 141 142 143 144 145 146
	}

	m_tableVertDarts.reserve(p1.m_tableVertDarts.size() + p2.m_tableVertDarts.size()); // can be too much but ...

	typename PFP::VEC3 center(0);

	for(typename std::vector<Dart>::const_iterator di=p1.m_tableVertDarts.begin(); di!=p1.m_tableVertDarts.end(); ++di)
	{
		m_tableVertDarts.push_back(*di);
		center += m_positions[*di];
	}

	// O(n2) pas terrible !!
	for(typename std::vector<Dart>::const_iterator di=p2.m_tableVertDarts.begin(); di!=p2.m_tableVertDarts.end(); ++di)
	{
147
		unsigned int em = m_map.getEmbedding(*di,VERTEX);
Pierre Kraemer's avatar
Pierre Kraemer committed
148 149 150 151 152

		typename std::vector<Dart>::const_iterator dj=p1.m_tableVertDarts.begin();
		bool found = false;
		while ((dj !=p1.m_tableVertDarts.end()) && (!found))
		{
153
			unsigned int xm = m_map.getEmbedding(*dj,VERTEX);
Pierre Kraemer's avatar
Pierre Kraemer committed
154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171
			if ( xm == em)
				found = true;
			else
				++dj;
		}
		if (!found)
		{
			m_tableVertDarts.push_back(*di);
			center += m_positions[*di];
		}
	}

	m_center = center / typename PFP::REAL(m_tableVertDarts.size());
}

template <typename PFP>
Dart Polyhedron<PFP>::createOrientedTetra(typename PFP::MAP& the_map)
{
172
	Dart base = the_map.newFace(3,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
173

174 175
	Dart side1 = the_map.newFace(3,false);
	the_map.sewFaces(base,side1,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
176

177 178 179
	Dart side2 = the_map.newFace(3,false);
	the_map.sewFaces(the_map.phi1(base),side2,false);
	the_map.sewFaces(the_map.phi_1(side1), the_map.phi1(side2),false);
Pierre Kraemer's avatar
Pierre Kraemer committed
180

181 182 183
	Dart side3 = the_map.newFace(3,false);
	the_map.sewFaces(the_map.phi_1(base),side3,false);
	the_map.sewFaces(the_map.phi_1(side2), the_map.phi1(side3),false);
Pierre Kraemer's avatar
Pierre Kraemer committed
184

185
	the_map.sewFaces(the_map.phi_1(side3), the_map.phi1(side1),false);
Pierre Kraemer's avatar
Pierre Kraemer committed
186 187 188 189 190 191 192

	return base;
}

template <typename PFP>
Dart Polyhedron<PFP>::createOrientedPyra(typename PFP::MAP& the_map)
{
193
	Dart base = the_map.newFace(4,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
194

195 196
	Dart side1 = the_map.newFace(3,false);
	the_map.sewFaces(base,side1,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
197

198 199 200
	Dart side2 = the_map.newFace(3,false);
	the_map.sewFaces(the_map.phi1(base),side2,false);
	the_map.sewFaces(the_map.phi_1(side1), the_map.phi1(side2),false);
Pierre Kraemer's avatar
Pierre Kraemer committed
201

202 203 204
	Dart side3 = the_map.newFace(3,false);
	the_map.sewFaces(the_map.phi1(the_map.phi1(base)),side3,false);
	the_map.sewFaces(the_map.phi_1(side2), the_map.phi1(side3),false);
Pierre Kraemer's avatar
Pierre Kraemer committed
205

206 207 208
	Dart side4 = the_map.newFace(3,false);
	the_map.sewFaces(the_map.phi_1(base),side4,false);
	the_map.sewFaces(the_map.phi_1(side3), the_map.phi1(side4),false);
Pierre Kraemer's avatar
Pierre Kraemer committed
209

210
	the_map.sewFaces(the_map.phi_1(side4), the_map.phi1(side1),false);
Pierre Kraemer's avatar
Pierre Kraemer committed
211 212 213 214 215 216 217

	return base;
}

template <typename PFP>
Dart Polyhedron<PFP>::createOrientedHexa(typename PFP::MAP& the_map)
{
218
	Dart base = the_map.newFace(4,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
219

220 221
	Dart side1 = the_map.newFace(4,false);
	the_map.sewFaces(base,side1,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
222

223 224 225
	Dart side2 = the_map.newFace(4,false);
	the_map.sewFaces(the_map.phi1(base),side2,false);
	the_map.sewFaces(the_map.phi_1(side1), the_map.phi1(side2),false);
Pierre Kraemer's avatar
Pierre Kraemer committed
226

227 228 229
	Dart side3 = the_map.newFace(4,false);
	the_map.sewFaces(the_map.phi1(the_map.phi1(base)),side3,false);
	the_map.sewFaces(the_map.phi_1(side2), the_map.phi1(side3),false);
Pierre Kraemer's avatar
Pierre Kraemer committed
230

231 232 233
	Dart side4 = the_map.newFace(4,false);
	the_map.sewFaces(the_map.phi_1(base),side4,false);
	the_map.sewFaces(the_map.phi_1(side3), the_map.phi1(side4),false);
Pierre Kraemer's avatar
Pierre Kraemer committed
234

235
	the_map.sewFaces(the_map.phi_1(side4), the_map.phi1(side1),false);
Pierre Kraemer's avatar
Pierre Kraemer committed
236

237 238 239 240 241
	Dart top = the_map.newFace(4,false);
	the_map.sewFaces(top,the_map.phi1(the_map.phi1(side1)),false);
	the_map.sewFaces(the_map.phi_1(top),the_map.phi1(the_map.phi1(side2)),false);
	the_map.sewFaces(the_map.phi1(the_map.phi1(top)),the_map.phi1(the_map.phi1(side3)),false);
	the_map.sewFaces(the_map.phi1(top),the_map.phi1(the_map.phi1(side4)),false);
Pierre Kraemer's avatar
Pierre Kraemer committed
242 243 244 245 246 247 248

	return base;
}

template <typename PFP>
Dart  Polyhedron<PFP>::createOrientedPrism(typename PFP::MAP& the_map)
{
249
	Dart base = the_map.newFace(3,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
250

251 252
	Dart side1 = the_map.newFace(4,false);
	the_map.sewFaces(base,side1,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
253

254 255 256
	Dart side2 = the_map.newFace(4,false);
	the_map.sewFaces(the_map.phi1(base),side2,false);
	the_map.sewFaces(the_map.phi_1(side1), the_map.phi1(side2),false);
Pierre Kraemer's avatar
Pierre Kraemer committed
257

258 259 260
	Dart side3 = the_map.newFace(4,false);
	the_map.sewFaces(the_map.phi1(the_map.phi1(base)),side3,false);
	the_map.sewFaces(the_map.phi_1(side2), the_map.phi1(side3),false);
Pierre Kraemer's avatar
Pierre Kraemer committed
261

262
	the_map.sewFaces(the_map.phi_1(side3), the_map.phi1(side1),false);
Pierre Kraemer's avatar
Pierre Kraemer committed
263

264 265 266 267
	Dart top = the_map.newFace(3,false);
	the_map.sewFaces(top,the_map.phi1(the_map.phi1(side1)),false);
	the_map.sewFaces(the_map.phi_1(top),the_map.phi1(the_map.phi1(side2)),false);
	the_map.sewFaces(the_map.phi1(top),the_map.phi1(the_map.phi1(side3)),false);
Pierre Kraemer's avatar
Pierre Kraemer committed
268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290

	return base;
}

template <typename PFP>
Dart Polyhedron<PFP>::createOrientedPolyhedron(typename PFP::MAP& the_map, int n)
{
	Dart d;

	switch (n)
	{
		case 4 : d = createOrientedTetra(the_map);
				break;
		case 5 : d = createOrientedPyra(the_map);
				break;
		case 6 : d = createOrientedHexa(the_map);
				break;
	}

	return d;
}

template <typename PFP>
Pierre Kraemer's avatar
Pierre Kraemer committed
291
Dart Polyhedron<PFP>::grid_topo(unsigned int x, unsigned int y)
Pierre Kraemer's avatar
Pierre Kraemer committed
292 293 294 295 296 297 298 299 300 301 302 303 304
{
	if (m_kind != NONE) return m_dart;

	m_kind = GRID;
	m_nx = x;
	m_ny = y;
	// nb vertices
	int nb = (x+1)*(y+1);

	// vertice reservation
	m_tableVertDarts.reserve(nb);

	// creation of quads and storing vertices
Pierre Kraemer's avatar
Pierre Kraemer committed
305
	for (unsigned int i = 0; i < y; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
306
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
307
		for (unsigned int j = 1; j <= x; ++j)
Pierre Kraemer's avatar
Pierre Kraemer committed
308
		{
309
			Dart d = m_map.newFace(4,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
310
			m_tableVertDarts.push_back(d);
Pierre Kraemer's avatar
Pierre Kraemer committed
311
			if (j == x)
Pierre Kraemer's avatar
Pierre Kraemer committed
312 313 314
				m_tableVertDarts.push_back(m_map.phi1(d));
		}
	}
Pierre Kraemer's avatar
Pierre Kraemer committed
315

Pierre Kraemer's avatar
Pierre Kraemer committed
316
	// store last row of vertices
Pierre Kraemer's avatar
Pierre Kraemer committed
317
	for (unsigned int i = 0; i < x; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
318 319 320 321 322 323
	{
		m_tableVertDarts.push_back( m_map.phi_1(m_tableVertDarts[(y-1)*(x+1) + i]) );	
	}
	m_tableVertDarts.push_back( m_map.phi1(m_tableVertDarts[(y-1)*(x+1) +x]) );	

	//sewing the quads
Pierre Kraemer's avatar
Pierre Kraemer committed
324
	for (unsigned int i = 0; i < y; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
325
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
326
		for (unsigned int j = 0; j < x; ++j)
Pierre Kraemer's avatar
Pierre Kraemer committed
327
		{
Pierre Kraemer's avatar
Pierre Kraemer committed
328
			if (i > 0) // sew with preceeding row
Pierre Kraemer's avatar
Pierre Kraemer committed
329 330 331 332 333
			{
				int pos = i*(x+1)+j;
				Dart d = m_tableVertDarts[pos];
				Dart e = m_tableVertDarts[pos-(x+1)];
				e = m_map.phi1(m_map.phi1(e));
334
				m_map.sewFaces(d,e,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
335
			}
Pierre Kraemer's avatar
Pierre Kraemer committed
336
			if (j > 0) // sew with preceeding column
Pierre Kraemer's avatar
Pierre Kraemer committed
337 338 339 340 341 342
			{
				int pos = i*(x+1)+j;
				Dart d = m_tableVertDarts[pos];
				d = m_map.phi_1(d);
				Dart e = m_tableVertDarts[pos-1];
				e = m_map.phi1(e);
343
				m_map.sewFaces(d,e,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
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 374 375 376
			}
		}
	}

	// store & return reference dart
	m_dart = m_tableVertDarts[0]; // util ?
	return m_dart;
}

template <typename PFP>
Dart Polyhedron<PFP>::cylinder_topo(int n, int z, bool top_closed, bool bottom_closed)
{
	if (m_kind != NONE) return m_dart;

	m_kind = CYLINDER;
	m_nx = n;
	m_nz = z;

	m_bottom_closed=bottom_closed;
	m_top_closed=top_closed;

	int nb = (n)*(z+1);
	if (bottom_closed) nb++;
	if (top_closed) nb++;

	// vertice reservation
	m_tableVertDarts.reserve(nb);

	// creation of quads and storing vertices
	for (int i=0;i<z;++i)
	{
		for (int j=0;j<n;++j)
		{
377
			Dart d = m_map.newFace(4,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396
			m_tableVertDarts.push_back(d);
		}
	}
	for (int i=0;i<n;++i)
	{
		m_tableVertDarts.push_back( m_map.phi_1(m_tableVertDarts[(z-1)*n+i]) );	
	}

	//sewing the quads
	for (int i=0;i<z;++i)
	{
		for (int j=0;j<n;++j)
		{
			if (i>0) // sew with preceeding row
			{
				int pos = i*n+j;
				Dart d = m_tableVertDarts[pos];
				Dart e = m_tableVertDarts[pos-n];
				e = m_map.phi1(m_map.phi1(e));
397
				m_map.sewFaces(d,e,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
398 399 400 401 402 403 404 405
			}
			if (j>0) // sew with preceeding column
			{
				int pos = i*n+j;
				Dart d = m_tableVertDarts[pos];
				d = m_map.phi_1(d);
				Dart e = m_tableVertDarts[pos-1];
				e = m_map.phi1(e);
406
				m_map.sewFaces(d,e,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
407 408 409 410 411 412 413 414
			}
			else 
			{
				int pos = i*n;
				Dart d = m_tableVertDarts[pos];
				d = m_map.phi_1(d);
				Dart e = m_tableVertDarts[pos+(n-1)];
				e = m_map.phi1(e);
415
				m_map.sewFaces(d,e,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
416 417 418 419 420 421 422
			}
		}
	}

	if (bottom_closed)
	{
		Dart d = m_tableVertDarts[0];
423
		if(m_map.closeHole(d,false))
Pierre Kraemer's avatar
Pierre Kraemer committed
424 425
		{
			d = m_map.phi2(d);
426
			if(m_map.faceDegree(d) > 3)
Pierre Kraemer's avatar
Pierre Kraemer committed
427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445
			{
				Algo::Modelisation::trianguleFace<PFP>(m_map,d);

				m_tableVertDarts.push_back(m_map.phi_1(d));
			}
		}
// 		// create bottom 
// 		Dart d = triangleFan_topo<PFP>(m_map,n);
// 		// store center vertex dart
// 		m_tableVertDarts.push_back(m_map.phi_1(d));
// 
// 		// sew it
// 		for (int i=0; i<n; ++i)
// 		{
// 			Dart e = m_tableVertDarts[i];
// 			m_map.sewFaces(d,e);
// 			d = precDV(d);
// 		}
	}
446 447
	else
		m_map.closeHole(m_tableVertDarts[0]);
Pierre Kraemer's avatar
Pierre Kraemer committed
448 449 450 451

	if (top_closed)
	{
		Dart d =  m_map.phi_1(m_tableVertDarts[n*z]);
452
		if(m_map.closeHole(d,true))
Pierre Kraemer's avatar
Pierre Kraemer committed
453 454
		{
			d = m_map.phi2(d);
455
			if(m_map.faceDegree(d) > 3)
Pierre Kraemer's avatar
Pierre Kraemer committed
456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475
			{
				Algo::Modelisation::trianguleFace<PFP>(m_map,d);

				m_tableVertDarts.push_back(m_map.phi_1(d));
			}
		}
// 		// create bottom 
// 		Dart d = triangleFan_topo<PFP>(m_map,n);
// 		// store center vertex dart
// 		m_tableVertDarts.push_back(m_map.phi_1(d));
// 
// 		// sew it
// 		for (int i=0; i<n; ++i)
// 		{
// 			Dart e = m_tableVertDarts[n*z+i];
// 			e = m_map.phi_1(e);
// 			m_map.sewFaces(d,e);
// 			d = nextDV(d);
// 		}
	}
476 477
	else
		m_map.closeHole(m_map.phi_1(m_tableVertDarts[n*z]));
Pierre Kraemer's avatar
Pierre Kraemer committed
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

	m_dart = m_tableVertDarts.front();
	return m_dart;
}

// template <typename PFP>
// Dart Polyhedron<PFP>::cone_topo(int n, int z, bool bottom_closed)
// {
// 	if (m_kind != NONE) return m_dart;
// 
// 	if (z>1)
// 	{
// 		if  (n>4) // normal case
// 		{
// 			Dart d = cylinder_topo(n,z-1,true,bottom_closed);
// 			m_kind = CONE;
// 			m_nz = z;
// 			return d;
// 		}
// 		else if (n==4)
// 		{
// 			Dart d = cylinder_topo(n,z-1,true,false);
// 			m_kind = CONE;
// 			m_nz = z;
// 			// close bottom with one quad not three triangles
// 			if (bottom_closed)
// 			{
505
// 				Dart t= m_map.newFace(4,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523
// 				m_map.sewFaces(m_tableVertDarts[0],t);
// 				t=m_map.phi_1(t);
// 				m_map.sewFaces(m_tableVertDarts[1],t);
// 				t=m_map.phi_1(t);
// 				m_map.sewFaces(m_tableVertDarts[2],t);
// 				t=m_map.phi_1(t);
// 				m_map.sewFaces(m_tableVertDarts[3],t);
// 			}
// 			return d;
// 		}
// 		else // n==3 (base is triangle)
// 		{
// 			Dart d = cylinder_topo(n,z-1,true,false);
// 			m_kind = CONE;
// 			m_nz = z;
// 			// close bottom with one triangle not three
// 			if (bottom_closed)
// 			{
524
// 				Dart t= m_map.newFace(3,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586
// 				m_map.sewFaces(d,t);
// 				d=nextDV(d); t=m_map.phi_1(t);
// 				m_map.sewFaces(d,t);
// 				d=nextDV(d); t=m_map.phi_1(t);
// 				m_map.sewFaces(d,t);
// 			}
// 			return d;
// 		}
// 	}
// 	else //z==1 only on slice
// 	{
// 		m_kind = CONE;		
// 		m_nx = n;
// 		m_nz = z;
// 		if  (n>4) // normal case
// 		{
// 			if (bottom_closed)
// 				m_tableVertDarts.reserve(n+2);
// 			else
// 				m_tableVertDarts.reserve(n+1);
// 
// 			Dart ref = triangleFan_topo<PFP>(m_map,n);
// 			Dart d = ref;
// 			for (int i=0;i<n;++i)
// 			{
// 				m_tableVertDarts.push_back(d);
// 				d = nextDV(d);
// 			}
// 
// 			if (bottom_closed)
// 			{
// 				m_bottom_closed=true;
// 				Dart dd = triangleFan_topo<PFP>(m_map,n);
// 				m_tableVertDarts.push_back(m_map.phi_1(dd));
// 				for (int i=0;i<n;++i)
// 				{
// 					m_map.sewFaces(d,dd);
// 					d=nextDV(d);
// 					dd=precDV(dd);
// 				}
// 			}
// 
// 			m_tableVertDarts.push_back(m_map.phi_1(ref));
// 
// 			m_dart=ref;
// 			return ref;
// 		}
// 		else if (n==4)
// 		{
// 			m_bottom_closed=false; // because no vertex in bottom
// 			m_tableVertDarts.reserve(4);
// 
// 			Dart dd = triangleFan_topo<PFP>(m_map,4);
// 			for (int i=0;i<4;++i)
// 			{
// 				m_tableVertDarts.push_back(dd);
// 				dd = nextDV(dd);
// 			}
// 			m_tableVertDarts.push_back(m_map.phi_1(dd));
// 
// 			if (bottom_closed)
// 			{
587
// 				Dart t= m_map.newFace(4,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613
// 				m_map.sewFaces(m_tableVertDarts[0],t);
// 				t=m_map.phi_1(t);
// 				m_map.sewFaces(m_tableVertDarts[1],t);
// 				t=m_map.phi_1(t);
// 				m_map.sewFaces(m_tableVertDarts[2],t);
// 				t=m_map.phi_1(t);
// 				m_map.sewFaces(m_tableVertDarts[3],t);
// 			}
// 			m_dart=dd;
// 			return dd;
// 		}
// 		else // n==3 (base is triangle, here we create a tetrahedron)
// 		{
// 			m_bottom_closed=false; // because no vertex in bottom
// 			m_tableVertDarts.reserve(4);
// 
// 			Dart dd = triangleFan_topo<PFP>(m_map,3);
// 			for (int i=0;i<3;++i)
// 			{
// 				m_tableVertDarts.push_back(dd);
// 				dd = nextDV(dd);
// 			}
// 			m_tableVertDarts.push_back(m_map.phi_1(dd));
// 
// 			if (bottom_closed)
// 			{
614
// 				Dart t= m_map.newFace(3,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
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
// 				m_map.sewFaces(m_tableVertDarts[0],t);
// 				t=m_map.phi_1(t);
// 				m_map.sewFaces(m_tableVertDarts[1],t);
// 				t=m_map.phi_1(t);
// 				m_map.sewFaces(m_tableVertDarts[2],t);
// 			}
// 			m_dart=dd;
// 			return dd;
// 		}
// 	}
// }

template <typename PFP>
Dart Polyhedron<PFP>::cube_topo(int x, int y,int z)
{
	if (m_kind != NONE) return m_dart;

	m_dart = cylinder_topo(2*(x+y),z, false,false);
	m_kind = CUBE;
	m_nx = x;
	m_ny = y;
	m_nz = z;

	int nb = 2*(x+y)*(z+1) + 2*(x-1)*(y-1);
	m_tableVertDarts.reserve(nb);
	
	// we now have the 4 sides, just need to create store and sew top & bottom
	// the top
643
	Polyhedron<PFP> primTop(m_map, m_positions);
Pierre Kraemer's avatar
Pierre Kraemer committed
644 645 646 647 648 649 650 651
	primTop.grid_topo(x,y);
	std::vector<Dart>& tableTop = primTop.getVertexDarts();

	int index_side = 2*(x+y)*z;
	for(int i=0;i<x;++i)
	{
		Dart d = m_map.phi_1(m_tableVertDarts[index_side++]);
		Dart e = tableTop[i];
652
		m_map.sewFaces(d,e,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
653 654 655 656 657
	}
	for(int i=0;i<y;++i)
	{
		Dart d = m_map.phi_1(m_tableVertDarts[index_side++]);
		Dart e = tableTop[x+i*(x+1)];
658
		m_map.sewFaces(d,e,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
659 660 661 662 663 664
	}
	for(int i=0;i<x;++i)
	{
		Dart d = m_map.phi_1(m_tableVertDarts[index_side++]);
		Dart e = tableTop[(x+1)*(y+1)-2 - i];
		e = m_map.phi_1(e);
665
		m_map.sewFaces(d,e,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
666 667 668 669 670 671
	}
	for(int i=0;i<y;++i)
	{
		Dart d = m_map.phi_1(m_tableVertDarts[index_side++]);
		Dart e = tableTop[(y-1-i)*(x+1)];
		e = m_map.phi_1(e);
672
		m_map.sewFaces(d,e,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
673 674 675
	}

	// the bottom
676
	Polyhedron<PFP> primBottom(m_map,m_positions);
Pierre Kraemer's avatar
Pierre Kraemer committed
677 678 679 680 681 682 683 684
	primBottom.grid_topo(x,y);
	std::vector<Dart>& tableBottom = primBottom.getVertexDarts();

	index_side = 3*(x+y)+(x-1);
	for(int i=0;i<x;++i)
	{
		Dart d = m_tableVertDarts[(index_side--)%(2*(x+y))];
		Dart e = tableBottom[i];
685
		m_map.sewFaces(d,e,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
686 687 688 689 690
	}
	for(int i=0;i<y;++i)
	{
		Dart d = m_tableVertDarts[(index_side--)%(2*(x+y))];
		Dart e = tableBottom[x+i*(x+1)];
691
		m_map.sewFaces(d,e,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
692 693 694 695 696 697
	}
	for(int i=0;i<x;++i)
	{
		Dart d = m_tableVertDarts[(index_side--)%(2*(x+y))];
		Dart e = tableBottom[(x+1)*(y+1)-2 - i];
		e = m_map.phi_1(e);
698
		m_map.sewFaces(d,e,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
699 700 701 702 703 704
	}
	for(int i=0;i<y;++i)
	{
		Dart d = m_tableVertDarts[(index_side--)%(2*(x+y))];
		Dart e = tableBottom[(y-1-i)*(x+1)];
		e = m_map.phi_1(e);
705
		m_map.sewFaces(d,e,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
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
	}

	// and add new vertex in m_tableVertDarts
	//top  first
	for(int i=1;i<y;++i)
	{
		for(int j=1;j<x;++j)
		{
			m_tableVertDarts.push_back(tableTop[i*(x+1)+j]);
		}
	}

	// then bottom
	for(int i=1;i<y;++i)
	{
		for(int j=1;j<x;++j)
		{
			m_tableVertDarts.push_back(tableBottom[i*(x+1)+j]);
		}
	}

	return m_dart;
}

template <typename PFP>
731
Dart Polyhedron<PFP>::tore_topo(int m, int n)
Pierre Kraemer's avatar
Pierre Kraemer committed
732 733 734 735 736 737 738 739 740 741 742 743 744 745
{
	if (m_kind != NONE) return m_dart;

	m_dart = cylinder_topo(n, m, false, false);
	m_nx=n;
	m_ny=m;
	m_kind = TORE;

	// juste finish to sew
	for(int i=0; i<n; ++i)
	{
		Dart d = m_tableVertDarts[i];
		Dart e = m_tableVertDarts[(m*n)+i];
		e = m_map.phi_1(e);
746
		m_map.sewFaces(d,e,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
747 748 749 750 751 752 753 754 755 756 757 758 759 760 761
	}

	// remove the last n vertex darts that are no more necessary (sewed with n first)
	// memory not freed (but will be when destroy the Polyhedron), not important ??
	m_tableVertDarts.resize(m*n); 

	return m_dart;
}

template <typename PFP>
void Polyhedron<PFP>::embedGrid( float x, float y,float z)
{
	typedef typename PFP::VEC3 VEC3 ;

	if (m_kind != GRID) {
762
		CGoGNerr << "Warning try to embedGrid something that is not a grid"<<CGoGNendl;
Pierre Kraemer's avatar
Pierre Kraemer committed
763 764 765 766 767 768 769 770 771 772 773 774 775
		return;
	}

	float dx = x/float(m_nx);
	float dy = y/float(m_ny);

	for(int i=0; i<=m_ny; ++i)
	{
		for(int j=0; j<=m_nx;++j)
		{
			VEC3 pos(-x/2 + dx*float(j), -y/2 + dy*float(i), z);
			unsigned int em = m_positions.insert(pos);
			Dart d = m_tableVertDarts[i*(m_nx+1)+j];
776
			m_map.embedOrbit(VERTEX,d,em);
Pierre Kraemer's avatar
Pierre Kraemer committed
777 778 779 780 781 782 783 784 785 786
		}
	}
}

template <typename PFP>
void Polyhedron<PFP>::embedCylinder( float bottom_radius, float top_radius, float height)
{
	typedef typename PFP::VEC3 VEC3 ;

	if (m_kind != CYLINDER) {
787
		CGoGNerr << "Warning try to embedCylinder something that is not a cylnder"<<CGoGNendl;
Pierre Kraemer's avatar
Pierre Kraemer committed
788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805
		return;
	}

	float alpha = float(2.0*M_PI/m_nx);
	float dz = height/float(m_nz);

	for(int i=0; i<=m_nz; ++i)
	{
		float a = float(i)/float(m_nz);
		float radius = a*top_radius + (1.0f-a)*bottom_radius;
		for(int j=0; j<m_nx;++j)
		{
	
			float x = radius*cos(alpha*float(j));
			float y = radius*sin(alpha*float(j));
			VEC3 pos(x, y, -height/2 + dz*float(i));
			unsigned int em = m_positions.insert(pos);
			Dart d = m_tableVertDarts[i*(m_nx)+j];
806
			m_map.embedOrbit(VERTEX,d,em);
Pierre Kraemer's avatar
Pierre Kraemer committed
807 808 809 810 811 812 813 814 815
		}
	}

	int indexUmbrella = m_nx*(m_nz+1);
	if (m_bottom_closed)
	{
		VEC3 pos(0.0f, 0.0f, -height/2 );
		unsigned int em = m_positions.insert(pos);
		Dart d = m_tableVertDarts[indexUmbrella++];
816
		m_map.embedOrbit(VERTEX,d,em);
Pierre Kraemer's avatar
Pierre Kraemer committed
817 818 819 820 821 822 823
	}

	if (m_top_closed)
	{
		VEC3 pos(0.0f ,0.0f, height/2 );
		unsigned int em = m_positions.insert(pos);
		Dart d = m_tableVertDarts[indexUmbrella];
824
		m_map.embedOrbit(VERTEX,d,em);
Pierre Kraemer's avatar
Pierre Kraemer committed
825 826 827 828 829 830 831 832 833
	}
}

template <typename PFP>
void Polyhedron<PFP>::embedCone( float radius, float height)
{
	typedef typename PFP::VEC3 VEC3 ;

	if (m_kind != CONE) {
834
		CGoGNerr << "Warning try to embedCone something that is not a cone"<<CGoGNendl;
Pierre Kraemer's avatar
Pierre Kraemer committed
835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854
		return;
	}

	float alpha = float(2.0*M_PI/m_nx);
	int zcyl = m_nz-1;
	float dz = height/float(m_nz);
	
	for(int i=0; i<=zcyl; ++i)
	{
		for(int j=0; j<m_nx;++j)
		{
			float rad = radius * float(m_nz-i)/float(m_nz);
			float h = -height/2 + dz*float(i);

			float x = rad*cos(alpha*float(j));
			float y = rad*sin(alpha*float(j));

			VEC3 pos(x, y, h);
			unsigned int em = m_positions.insert(pos);
			Dart d = m_tableVertDarts[i*(m_nx)+j];
855
			m_map.embedOrbit(VERTEX,d,em);
Pierre Kraemer's avatar
Pierre Kraemer committed
856 857 858 859 860 861 862 863 864
		}
	}

	int indexUmbrella = m_nx*(m_nz);
	if (m_bottom_closed)
	{
		VEC3 pos(0.0f, 0.0f, -height/2 );
		unsigned int em = m_positions.insert(pos);
		Dart d = m_tableVertDarts[indexUmbrella++];
865
		m_map.embedOrbit(VERTEX,d,em);
Pierre Kraemer's avatar
Pierre Kraemer committed
866 867 868 869 870 871
	}

	//  top always closed in cone 
	VEC3 pos(0.0f ,0.0f, height/2.0f );
	unsigned int em = m_positions.insert(pos);
	Dart d = m_tableVertDarts[indexUmbrella];
872
	m_map.embedOrbit(VERTEX,d,em);
Pierre Kraemer's avatar
Pierre Kraemer committed
873 874 875 876 877 878 879 880
}

template <typename PFP>
void Polyhedron<PFP>::embedSphere( float radius)
{
	typedef typename PFP::VEC3 VEC3 ;

	if (!((m_kind==CYLINDER)&&(m_top_closed)&&(m_bottom_closed))) {
881
		CGoGNerr << "Warning try to embedSphere something that is not a sphere (closed cylinder)"<<CGoGNendl;
Pierre Kraemer's avatar
Pierre Kraemer committed
882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899
		return;
	}

	float alpha = float(2.0*M_PI/m_nx);
	float beta = float(M_PI/(m_nz+2));

	for(int i=0; i<=m_nz; ++i)
	{
		for(int j=0; j<m_nx;++j)
		{
			float h = float(radius * sin(-M_PI/2.0+(i+1)*beta));
			float rad = float(radius * cos(-M_PI/2.0+(i+1)*beta));

			float x = rad*cos(alpha*float(j));
			float y = rad*sin(alpha*float(j));
			VEC3 pos(x, y, h );
			unsigned int em = m_positions.insert(pos);
			Dart d = m_tableVertDarts[i*(m_nx)+j];
900
			m_map.embedOrbit(VERTEX,d,em);
Pierre Kraemer's avatar
Pierre Kraemer committed
901 902 903 904 905 906 907
		}
	}

	// bottom  pole
	VEC3 pos(0.0f, 0.0f, -radius );
	unsigned int em = m_positions.insert(pos);
	Dart d = m_tableVertDarts[m_nx*(m_nz+1)];
908
	m_map.embedOrbit(VERTEX,d,em);
Pierre Kraemer's avatar
Pierre Kraemer committed
909 910 911 912 913

	//  top pole
	pos = VEC3(0.0f ,0.0f, radius );
	em = m_positions.insert(pos);
	d = m_tableVertDarts[m_nx*(m_nz+1)+1];
914
	m_map.embedOrbit(VERTEX,d,em);
Pierre Kraemer's avatar
Pierre Kraemer committed
915 916 917 918 919 920 921 922 923

}

template <typename PFP>
void Polyhedron<PFP>::embedTore( float big_radius, float small_radius)
{
	typedef typename PFP::VEC3 VEC3 ;

	if (m_kind !=TORE) {
924
		CGoGNerr << "Warning try to embedTore something that is not a tore"<<CGoGNendl;
Pierre Kraemer's avatar
Pierre Kraemer committed
925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941
		return;
	}

	float alpha = float(2.0*M_PI/m_nx);
	float beta = float(2.0*M_PI/m_ny);

	for (int i=0;i< m_nx; ++i)
	{
		for(int j=0; j<m_ny; ++j)
		{
			float z = small_radius*sin(beta*float(j));
			float r = big_radius + small_radius*cos(beta*float(j));
			float x = r*cos(alpha*float(i));
			float y = r*sin(alpha*float(i));
			VEC3 pos(x, y, z);
			unsigned int em = m_positions.insert(pos);
			Dart d = m_tableVertDarts[j*(m_nx)+i];
942
			m_map.embedOrbit(VERTEX,d,em);
Pierre Kraemer's avatar
Pierre Kraemer committed
943 944 945 946 947 948 949 950 951 952
		}
	}
}

template <typename PFP>
void Polyhedron<PFP>::embedCube( float sx, float sy, float sz)
{
	typedef typename PFP::VEC3 VEC3 ;

	if (m_kind != CUBE) {
953
		CGoGNerr << "Warning try to embedCube something that is not a cube"<<CGoGNendl;
Pierre Kraemer's avatar
Pierre Kraemer committed
954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971
		return;
	}

	float dz = sz/float(m_nz);
	float dy = sy/float(m_ny);
	float dx = sx/float(m_nx);

	// first embedding the sides
	int index = 0;
	for (int k=0; k<=m_nz; ++k)
	{
		float z = float(k)*dz - sz/2.0f;
		for (int i=0;i<m_nx;++i)
		{
			float x = float(i)*dx - sx/2.0f;
			VEC3 pos(x, -sy/2.0f, z);
			unsigned int em = m_positions.insert(pos);
			Dart d = m_tableVertDarts[index++];
972
			m_map.embedOrbit(VERTEX,d,em);
Pierre Kraemer's avatar
Pierre Kraemer committed
973 974 975 976 977 978 979
		}
		for (int i=0;i<m_ny;++i)
		{
			float y = float(i)*dy - sy/2.0f;
			VEC3 pos(sx/2.0f, y, z);
			unsigned int em = m_positions.insert(pos);
			Dart d = m_tableVertDarts[index++];
980
			m_map.embedOrbit(VERTEX,d,em);
Pierre Kraemer's avatar
Pierre Kraemer committed
981 982 983 984 985 986 987
		}
		for (int i=0;i<m_nx;++i)
		{
			float x = sx/2.0f-float(i)*dx;
			VEC3 pos(x, sy/2.0f, z);
			unsigned int em = m_positions.insert(pos);
			Dart d = m_tableVertDarts[index++];
988
			m_map.embedOrbit(VERTEX,d,em);
Pierre Kraemer's avatar
Pierre Kraemer committed
989 990 991 992 993 994 995
		}
		for (int i=0;i<m_ny;++i)
		{
			float y = sy/2.0f - float(i)*dy;
			VEC3 pos(-sx/2.0f, y, z);
			unsigned int em = m_positions.insert(pos);
			Dart d = m_tableVertDarts[index++];
996
			m_map.embedOrbit(VERTEX,d,em);
Pierre Kraemer's avatar
Pierre Kraemer committed
997 998 999 1000 1001 1002 1003 1004 1005 1006 1007
		}
	}

	// the top
	for(int i=1;i<m_ny;++i)
	{
		for(int j=1;j<m_nx;++j)
		{
			VEC3 pos(-sx/2.0f+float(j)*dx, -sy/2.0f+float(i)*dy, sz/2.0f);
			unsigned int em = m_positions.insert(pos);
			Dart d = m_tableVertDarts[index++];
1008
			m_map.embedOrbit(VERTEX,d,em);
Pierre Kraemer's avatar
Pierre Kraemer committed
1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019
		}
	}

	// the bottom
	for(int i=1;i<m_ny;++i)
	{
		for(int j=1;j<m_nx;++j)
		{
			VEC3 pos(-sx/2.0f+float(j)*dx, sy/2.0f-float(i)*dy, -sz/2.0f);
			unsigned int em = m_positions.insert(pos);
			Dart d = m_tableVertDarts[index++];
1020
			m_map.embedOrbit(VERTEX,d,em);
Pierre Kraemer's avatar
Pierre Kraemer committed
1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 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
		}
	}
}

template <typename PFP>
void Polyhedron<PFP>::computeCenter()
{
	typename PFP::VEC3 center(0);

	for(typename std::vector<Dart>::iterator di=m_tableVertDarts.begin(); di!=m_tableVertDarts.end(); ++di)
	{
		center += m_positions[*di];
	}

	m_center = center / typename PFP::REAL(m_tableVertDarts.size());
}

template <typename PFP>
//void Polyhedron<PFP>::transform(float* matrice)
void Polyhedron<PFP>::transform(const Geom::Matrix44f& matrice)
{
//	Geom::Vec4f v1(matrice[0],matrice[4],matrice[8], matrice[12]);
//	Geom::Vec4f v2(matrice[1],matrice[5],matrice[9], matrice[13]);
//	Geom::Vec4f v3(matrice[2],matrice[6],matrice[10],matrice[14]);
//	Geom::Vec4f v4(matrice[3],matrice[7],matrice[11],matrice[15]);

	for(typename std::vector<Dart>::iterator di=m_tableVertDarts.begin(); di!=m_tableVertDarts.end(); ++di)
	{

		typename PFP::VEC3& pos = m_positions[*di];
//
//		Geom::Vec4f VA(pos[0],pos[1],pos[2],1.0f);
//
//		Geom::Vec4f VB((VA*v1),(VA*v2),(VA*v3),(VA*v4));
//		VEC3 newPos(VB[0]/VB[3],VB[1]/VB[3],VB[2]/VB[3]);
		
		pos = Geom::transform(pos, matrice);
	}
	// transform the center
	m_center = Geom::transform(m_center, matrice);

}

template <typename PFP>
Sylvain Thery's avatar
Sylvain Thery committed
1065
void Polyhedron<PFP>::mark(CellMarker& m)
Pierre Kraemer's avatar
Pierre Kraemer committed
1066
{
Pierre Kraemer's avatar
Pierre Kraemer committed
1067
	for(typename std::vector<Dart>::iterator di = m_tableVertDarts.begin(); di != m_tableVertDarts.end(); ++di)
Pierre Kraemer's avatar
Pierre Kraemer committed
1068
	{
Sylvain Thery's avatar
Sylvain Thery committed
1069
		m.mark(*di);
Pierre Kraemer's avatar
Pierre Kraemer committed
1070 1071 1072
	}
}

Pierre Kraemer's avatar
Pierre Kraemer committed
1073 1074 1075 1076 1077 1078 1079 1080 1081
//template <typename PFP>
//void Polyhedron<PFP>::markEmbVertices(Mark m)
//{
//	AttributeHandler<Mark> markers(VERTEX << 24, m_map);
//	for(typename std::vector<Dart>::iterator di = m_tableVertDarts.begin(); di != m_tableVertDarts.end(); ++di)
//	{
//		markers[*di].setMark(m);
//	}
//}
Pierre Kraemer's avatar
Pierre Kraemer committed
1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104



template <typename PFP>
void Polyhedron<PFP>::embedTwistedStrip( float radius_min,  float radius_max, float turns)
{
	typedef typename PFP::VEC3 VEC3 ;

	float alpha = float(2.0*M_PI/m_ny);
	float beta = turns/float(m_ny);

	float radius = (radius_max + radius_min)/2.0f;
	float rdiff = (radius_max - radius_min)/2.0f;

	for(int i=0; i<=m_ny; ++i)
	{
		for(int j=0; j<=m_nx; ++j)
		{
			float rw = -rdiff + float(j)*2.0f*rdiff/float(m_nx);
			float r = radius + rw*cos(beta*float(i));
			VEC3 pos(r*cos(alpha*float(i)), r*sin(alpha*float(i)), rw*sin(beta*float(i)));
			unsigned int em = m_positions.insert(pos);
			Dart d = m_tableVertDarts[i*(m_nx+1)+j];
1105
			m_map.embedOrbit(VERTEX,d,em);
Pierre Kraemer's avatar
Pierre Kraemer committed
1106 1107 1108 1109 1110
		}
	}
}

template <typename PFP>
Pierre Kraemer's avatar
Pierre Kraemer committed
1111
void Polyhedron<PFP>::embedHelicoid(float radius_min, float radius_max, float maxHeight, float nbTurn, int orient)
Pierre Kraemer's avatar
Pierre Kraemer committed
1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126
{
	typedef typename PFP::VEC3 VEC3 ;

	float alpha = float(2.0*M_PI/m_nx)*nbTurn;
	float hS = maxHeight/m_nx;

// 	float radius = (radius_max + radius_min)/2.0f;
// 	float rdiff = (radius_max - radius_min)/2.0f;

	for(int i=0; i<=m_ny; ++i)
	{
		for(int j=0; j<=m_nx; ++j)
		{
// 			float r = radius_max + radius_min*cos(beta*float(j));
			float r,x,y;
Thomas's avatar
Thomas committed
1127 1128 1129 1130 1131 1132 1133 1134
// 			if(i==1) {
// 				r = radius_max;
// 			}
// 			else {
				r= radius_min+(radius_max-radius_min)*float(i)/float(m_ny);
// 			}
			x = orient*r*sin(alpha*float(j));
			y = orient*r*cos(alpha*float(j));
Pierre Kraemer's avatar
Pierre Kraemer committed
1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161

			VEC3 pos(x, y, j*hS);
			Dart d = m_tableVertDarts[i*(m_nx+1)+j];
			m_positions[d]=pos;
		}
	}
}

// template <typename PFP>
// void onlyTriangles(typename PFP::MAP& the_map, Dart primd)
// {
// 	DartMarker m(the_map);
// 
// 	// list of faces to process and processed(before pos iterator)
// 	std::list<Dart> ld;
// 	ld.push_back(primd);
// 	// current position in list
// 	typename std::list<Dart>::iterator pos = ld.begin();
// 	do
// 	{
// 		Dart d = *pos;
// 		
// 		// cut the face of first dart of list
// 		Dart d1 = the_map.phi1(d);
// 		Dart e = the_map.phi1(d1);
// 		Dart e1 = the_map.phi1(e);
// 		Dart f = the_map.phi1(e1);
1162
// 		m.markOrbit(FACE, d);
Pierre Kraemer's avatar
Pierre Kraemer committed
1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192
// 		if (f==d) // quad
// 		{
// 			Dart n = the_map.cutFace(d,e);
// 			Dart nn = the_map.phi2(n);
// 			// mark the face
// 			m.mark(n);
// 			m.mark(nn);
// 		}
// 
// 		// and store neighbours faces in the list
// 		d = the_map.phi2(d);
// 		e = the_map.phi2(e);
// 		d1 = the_map.phi1(the_map.phi2(d1));
// 		e1 = the_map.phi1(the_map.phi2(e1));
// 
// 		if (!m.isMarked(d))
// 			ld.push_back(d);
// 		if (!m.isMarked(e))
// 			ld.push_back(e);
// 		if (!m.isMarked(d1))
// 			ld.push_back(d1);
// 		if ((f==d) && (!m.isMarked(e1)))
// 			ld.push_back(e1);
// 		pos++;
// 	}while (pos!=ld.end()); // stop when no more face to process
// }

// template <typename PFP>
// Dart triangleFan_topo(typename PFP::MAP& the_map, int n)
// {
1193
// 	Dart d = the_map.newFace(3,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
1194 1195 1196
// 	Dart e = the_map.phi1(d);
// 	for(int i=1;i<n;++i)
// 	{
1197
// 		Dart f = the_map.newFace(3,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211
// 		the_map.sewFaces(the_map.phi_1(f),e);
// 		e = the_map.phi1(f);
// 	}
// 	the_map.sewFaces(the_map.phi_1(d),e);
// 	return d;
// }





}//end namespace
}//end namespace
}//end namespace