polyhedron.hpp 31.7 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
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)
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
42
		// chercher le brin ou demarrer
untereiner's avatar
untereiner committed
43 44 45 46 47 48

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

		Dart d12 = map.phi2(map.phi1(d));
		Dart fit = d12;
Pierre Kraemer's avatar
Pierre Kraemer committed
49
		unsigned int i;
untereiner's avatar
untereiner committed
50 51 52 53 54 55

		do
		{
			i = map.faceDegree(map.phi2(fit));
			std::cout << "edge(" << fit << "," << i << ")" << std::endl;
			edges.insert(std::make_pair(fit, i));
Pierre Kraemer's avatar
Pierre Kraemer committed
56
			fit = map.phi1(fit);
untereiner's avatar
untereiner committed
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
		}
		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
114
template <typename PFP>
Pierre Kraemer's avatar
Pierre Kraemer committed
115 116 117 118 119 120 121
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)
Pierre Kraemer's avatar
Pierre Kraemer committed
122 123 124
{
	if (&(p1.map) != &(p2.map))
	{
125
		CGoGNerr << "Warning, can not merge to Polyhedrons of different maps"<< CGoGNendl;
Pierre Kraemer's avatar
Pierre Kraemer committed
126 127 128 129 130 131
	}

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

	typename PFP::VEC3 center(0);

Pierre Kraemer's avatar
Pierre Kraemer committed
132
	for(typename std::vector<Dart>::const_iterator di = p1.m_tableVertDarts.begin(); di != p1.m_tableVertDarts.end(); ++di)
Pierre Kraemer's avatar
Pierre Kraemer committed
133 134 135 136 137 138
	{
		m_tableVertDarts.push_back(*di);
		center += m_positions[*di];
	}

	// O(n2) pas terrible !!
Pierre Kraemer's avatar
Pierre Kraemer committed
139
	for(typename std::vector<Dart>::const_iterator di = p2.m_tableVertDarts.begin(); di != p2.m_tableVertDarts.end(); ++di)
Pierre Kraemer's avatar
Pierre Kraemer committed
140
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
141
		unsigned int em = m_map.getEmbedding(*di, VERTEX);
Pierre Kraemer's avatar
Pierre Kraemer committed
142 143 144 145 146

		typename std::vector<Dart>::const_iterator dj=p1.m_tableVertDarts.begin();
		bool found = false;
		while ((dj !=p1.m_tableVertDarts.end()) && (!found))
		{
Pierre Kraemer's avatar
Pierre Kraemer committed
147 148
			unsigned int xm = m_map.getEmbedding(*dj, VERTEX);
			if (xm == em)
Pierre Kraemer's avatar
Pierre Kraemer committed
149 150 151 152 153 154 155 156 157 158 159 160 161 162 163
				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>
164
Dart Polyhedron<PFP>::createTetra(typename PFP::MAP& the_map)
Pierre Kraemer's avatar
Pierre Kraemer committed
165
{
untereiner's avatar
untereiner committed
166
	Dart base = the_map.newFace(3, false);
Pierre Kraemer's avatar
Pierre Kraemer committed
167

untereiner's avatar
untereiner committed
168 169
	Dart side1 = the_map.newFace(3, false);
	the_map.sewFaces(base, side1, false);
Pierre Kraemer's avatar
Pierre Kraemer committed
170

untereiner's avatar
untereiner committed
171 172 173
	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
174

untereiner's avatar
untereiner committed
175 176 177
	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
178

untereiner's avatar
untereiner committed
179
	the_map.sewFaces(the_map.phi_1(side3), the_map.phi1(side1), false);
Pierre Kraemer's avatar
Pierre Kraemer committed
180 181 182 183 184

	return base;
}

template <typename PFP>
185
Dart Polyhedron<PFP>::createPyra(typename PFP::MAP& the_map)
Pierre Kraemer's avatar
Pierre Kraemer committed
186
{
Pierre Kraemer's avatar
Pierre Kraemer committed
187
	Dart base = the_map.newFace(4, false);
Pierre Kraemer's avatar
Pierre Kraemer committed
188

Pierre Kraemer's avatar
Pierre Kraemer committed
189 190
	Dart side1 = the_map.newFace(3, false);
	the_map.sewFaces(base, side1, false);
Pierre Kraemer's avatar
Pierre Kraemer committed
191

Pierre Kraemer's avatar
Pierre Kraemer committed
192 193 194
	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
195

Pierre Kraemer's avatar
Pierre Kraemer committed
196 197 198
	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
199

Pierre Kraemer's avatar
Pierre Kraemer committed
200 201 202
	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
203

Pierre Kraemer's avatar
Pierre Kraemer committed
204
	the_map.sewFaces(the_map.phi_1(side4), the_map.phi1(side1), false);
Pierre Kraemer's avatar
Pierre Kraemer committed
205 206 207 208 209

	return base;
}

template <typename PFP>
210
Dart Polyhedron<PFP>::createHexa(typename PFP::MAP& the_map)
Pierre Kraemer's avatar
Pierre Kraemer committed
211
{
Pierre Kraemer's avatar
Pierre Kraemer committed
212
	Dart base = the_map.newFace(4, false);
Pierre Kraemer's avatar
Pierre Kraemer committed
213

Pierre Kraemer's avatar
Pierre Kraemer committed
214 215
	Dart side1 = the_map.newFace(4, false);
	the_map.sewFaces(base, side1, false);
Pierre Kraemer's avatar
Pierre Kraemer committed
216

Pierre Kraemer's avatar
Pierre Kraemer committed
217 218 219
	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
220

Pierre Kraemer's avatar
Pierre Kraemer committed
221 222 223
	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
224

Pierre Kraemer's avatar
Pierre Kraemer committed
225 226 227
	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
228

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

Pierre Kraemer's avatar
Pierre Kraemer committed
231 232 233 234 235
	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
236 237 238 239

	return base;
}

240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268
//template <typename PFP>
//Dart  Polyhedron<PFP>::createPrism(typename PFP::MAP& the_map)
//{
//	Dart base = the_map.newFace(3, false);
//
//	Dart side1 = the_map.newFace(4, false);
//	the_map.sewFaces(base, side1, false);
//
//	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);
//
//	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);
//
//	the_map.sewFaces(the_map.phi_1(side3), the_map.phi1(side1), false);
//
//	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);
//
//	return base;
//}

/**
 * create a n-sided prism
 */
Pierre Kraemer's avatar
Pierre Kraemer committed
269
template <typename PFP>
270
Dart createPrism(typename PFP::MAP& map, unsigned int n)
Pierre Kraemer's avatar
Pierre Kraemer committed
271
{
272 273 274 275
	Dart dres = Dart::nil();
	unsigned int nb = n*2;
	std::vector<Dart> m_tableVertDarts;
	m_tableVertDarts.reserve(nb);
Pierre Kraemer's avatar
Pierre Kraemer committed
276

277 278 279 280 281 282
	// creation of quads around circunference and storing vertices
	for (unsigned int i = 0; i < n; ++i)
	{
		Dart d = map.newFace(4, false);
		m_tableVertDarts.push_back(d);
	}
Pierre Kraemer's avatar
Pierre Kraemer committed
283

284 285 286 287 288
	// storing a dart from the vertex pointed by phi1(phi1(d))
	for (unsigned int i = 0; i < n; ++i)
	{
		m_tableVertDarts.push_back(map.phi1(map.phi1(m_tableVertDarts[i])));
	}
Pierre Kraemer's avatar
Pierre Kraemer committed
289

290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312
	// sewing the quads
	for (unsigned int i = 0; i < n-1; ++i)
	{
		Dart d = m_tableVertDarts[i];
		d = map.phi_1(d);
		Dart e = m_tableVertDarts[i+1];
		e = map.phi1(e);
		map.sewFaces(d, e, false);
	}
	//sewing the last with the first
	map.sewFaces(map.phi1(m_tableVertDarts[0]), map.phi_1(m_tableVertDarts[n-1]), false);

	//sewing the top & bottom faces
	Dart d1 = map.newFace(n, false);
	Dart d2 = map.newFace(n, false);
	dres = d1;
	for(unsigned int i = 0; i < n ; ++i)
	{
		map.sewFaces(m_tableVertDarts[i], d1, false);
		map.sewFaces(m_tableVertDarts[n+i], d2, false);
		d1 = map.phi1(d1);
		d2 = map.phi_1(d2);
	}
Pierre Kraemer's avatar
Pierre Kraemer committed
313

314 315
	//return a dart from the base
	return dres;
Pierre Kraemer's avatar
Pierre Kraemer committed
316 317 318
}

template <typename PFP>
Pierre Kraemer's avatar
Pierre Kraemer committed
319
Dart Polyhedron<PFP>::createPolyhedron(typename PFP::MAP& the_map, unsigned int n)
Pierre Kraemer's avatar
Pierre Kraemer committed
320 321 322 323
{
	Dart d;
	switch (n)
	{
324
		case 4 : d = createTetra(the_map);
Pierre Kraemer's avatar
Pierre Kraemer committed
325
				break;
326
		case 5 : d = createPyra(the_map);
Pierre Kraemer's avatar
Pierre Kraemer committed
327
				break;
328
		case 6 : d = createHexa(the_map);
Pierre Kraemer's avatar
Pierre Kraemer committed
329 330 331 332 333 334
				break;
	}
	return d;
}

template <typename PFP>
Pierre Kraemer's avatar
Pierre Kraemer committed
335
Dart Polyhedron<PFP>::grid_topo(unsigned int x, unsigned int y)
Pierre Kraemer's avatar
Pierre Kraemer committed
336 337 338 339 340 341 342 343 344 345 346 347 348
{
	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
349
	for (unsigned int i = 0; i < y; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
350
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
351
		for (unsigned int j = 1; j <= x; ++j)
Pierre Kraemer's avatar
Pierre Kraemer committed
352
		{
353
			Dart d = m_map.newFace(4,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
354
			m_tableVertDarts.push_back(d);
Pierre Kraemer's avatar
Pierre Kraemer committed
355
			if (j == x)
Pierre Kraemer's avatar
Pierre Kraemer committed
356 357 358
				m_tableVertDarts.push_back(m_map.phi1(d));
		}
	}
Pierre Kraemer's avatar
Pierre Kraemer committed
359

Pierre Kraemer's avatar
Pierre Kraemer committed
360
	// store last row of vertices
Pierre Kraemer's avatar
Pierre Kraemer committed
361
	for (unsigned int i = 0; i < x; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
362 363 364 365 366 367
	{
		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
368
	for (unsigned int i = 0; i < y; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
369
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
370
		for (unsigned int j = 0; j < x; ++j)
Pierre Kraemer's avatar
Pierre Kraemer committed
371
		{
Pierre Kraemer's avatar
Pierre Kraemer committed
372
			if (i > 0) // sew with preceeding row
Pierre Kraemer's avatar
Pierre Kraemer committed
373 374 375 376 377
			{
				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));
378
				m_map.sewFaces(d,e,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
379
			}
Pierre Kraemer's avatar
Pierre Kraemer committed
380
			if (j > 0) // sew with preceeding column
Pierre Kraemer's avatar
Pierre Kraemer committed
381 382 383 384 385 386
			{
				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);
387
				m_map.sewFaces(d,e,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
388 389 390 391 392 393
			}
		}
	}

	// store & return reference dart
	m_dart = m_tableVertDarts[0]; // util ?
394 395 396

	m_map.closeHole(m_dart) ;

Pierre Kraemer's avatar
Pierre Kraemer committed
397 398 399 400
	return m_dart;
}

template <typename PFP>
Pierre Kraemer's avatar
Pierre Kraemer committed
401
Dart Polyhedron<PFP>::cylinder_topo(unsigned int n, unsigned int z, bool top_closed, bool bottom_closed)
Pierre Kraemer's avatar
Pierre Kraemer committed
402 403 404 405 406 407 408
{
	if (m_kind != NONE) return m_dart;

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

Pierre Kraemer's avatar
Pierre Kraemer committed
409 410
	m_bottom_closed = bottom_closed;
	m_top_closed = top_closed;
Pierre Kraemer's avatar
Pierre Kraemer committed
411 412 413 414 415 416 417 418 419

	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
Pierre Kraemer's avatar
Pierre Kraemer committed
420
	for (unsigned int i = 0; i < z; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
421
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
422
		for (unsigned int j = 0; j < n; ++j)
Pierre Kraemer's avatar
Pierre Kraemer committed
423
		{
Pierre Kraemer's avatar
Pierre Kraemer committed
424
			Dart d = m_map.newFace(4, false);
Pierre Kraemer's avatar
Pierre Kraemer committed
425 426 427
			m_tableVertDarts.push_back(d);
		}
	}
Pierre Kraemer's avatar
Pierre Kraemer committed
428
	for (unsigned int i = 0; i < n; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
429 430 431 432 433
	{
		m_tableVertDarts.push_back( m_map.phi_1(m_tableVertDarts[(z-1)*n+i]) );	
	}

	//sewing the quads
Pierre Kraemer's avatar
Pierre Kraemer committed
434
	for (unsigned int i = 0; i < z; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
435
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
436
		for (unsigned int j = 0; j < n; ++j)
Pierre Kraemer's avatar
Pierre Kraemer committed
437
		{
Pierre Kraemer's avatar
Pierre Kraemer committed
438
			if (i > 0) // sew with preceeding row
Pierre Kraemer's avatar
Pierre Kraemer committed
439 440 441 442 443
			{
				int pos = i*n+j;
				Dart d = m_tableVertDarts[pos];
				Dart e = m_tableVertDarts[pos-n];
				e = m_map.phi1(m_map.phi1(e));
Pierre Kraemer's avatar
Pierre Kraemer committed
444
				m_map.sewFaces(d, e, false);
Pierre Kraemer's avatar
Pierre Kraemer committed
445
			}
Pierre Kraemer's avatar
Pierre Kraemer committed
446
			if (j > 0) // sew with preceeding column
Pierre Kraemer's avatar
Pierre Kraemer committed
447 448 449 450 451 452
			{
				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);
Pierre Kraemer's avatar
Pierre Kraemer committed
453
				m_map.sewFaces(d, e, false);
Pierre Kraemer's avatar
Pierre Kraemer committed
454 455 456 457 458 459 460 461
			}
			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);
Pierre Kraemer's avatar
Pierre Kraemer committed
462
				m_map.sewFaces(d, e, false);
Pierre Kraemer's avatar
Pierre Kraemer committed
463 464 465 466 467 468 469
			}
		}
	}

	if (bottom_closed)
	{
		Dart d = m_tableVertDarts[0];
470
		if(m_map.closeHole(d, false))
Pierre Kraemer's avatar
Pierre Kraemer committed
471 472
		{
			d = m_map.phi2(d);
473
			if(m_map.faceDegree(d) > 3)
Pierre Kraemer's avatar
Pierre Kraemer committed
474
			{
475
				Algo::Modelisation::trianguleFace<PFP>(m_map, d);
Pierre Kraemer's avatar
Pierre Kraemer committed
476 477 478 479
				m_tableVertDarts.push_back(m_map.phi_1(d));
			}
		}
	}
480 481
	else
		m_map.closeHole(m_tableVertDarts[0]);
Pierre Kraemer's avatar
Pierre Kraemer committed
482 483 484 485

	if (top_closed)
	{
		Dart d =  m_map.phi_1(m_tableVertDarts[n*z]);
486
		if(m_map.closeHole(d, false))
Pierre Kraemer's avatar
Pierre Kraemer committed
487 488
		{
			d = m_map.phi2(d);
489
			if(m_map.faceDegree(d) > 3)
Pierre Kraemer's avatar
Pierre Kraemer committed
490
			{
491
				Algo::Modelisation::trianguleFace<PFP>(m_map, d);
Pierre Kraemer's avatar
Pierre Kraemer committed
492 493 494 495
				m_tableVertDarts.push_back(m_map.phi_1(d));
			}
		}
	}
496 497
	else
		m_map.closeHole(m_map.phi_1(m_tableVertDarts[n*z]));
Pierre Kraemer's avatar
Pierre Kraemer committed
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

	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)
// 			{
525
// 				Dart t= m_map.newFace(4,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543
// 				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)
// 			{
544
// 				Dart t= m_map.newFace(3,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606
// 				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)
// 			{
607
// 				Dart t= m_map.newFace(4,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633
// 				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)
// 			{
634
// 				Dart t= m_map.newFace(3,false);
Pierre Kraemer's avatar
Pierre Kraemer committed
635 636 637 638 639 640 641 642 643 644 645 646 647
// 				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>
Pierre Kraemer's avatar
Pierre Kraemer committed
648
Dart Polyhedron<PFP>::cube_topo(unsigned int x, unsigned int y, unsigned int z)
Pierre Kraemer's avatar
Pierre Kraemer committed
649 650 651
{
	if (m_kind != NONE) return m_dart;

Pierre Kraemer's avatar
Pierre Kraemer committed
652
	m_dart = cylinder_topo(2*(x+y), z, false, false);
Pierre Kraemer's avatar
Pierre Kraemer committed
653 654 655 656 657 658 659 660 661 662
	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
663
	Polyhedron<PFP> primTop(m_map, m_positions);
Pierre Kraemer's avatar
Pierre Kraemer committed
664 665 666 667
	primTop.grid_topo(x,y);
	std::vector<Dart>& tableTop = primTop.getVertexDarts();

	int index_side = 2*(x+y)*z;
Pierre Kraemer's avatar
Pierre Kraemer committed
668
	for(unsigned int i = 0; i < x; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
669 670 671
	{
		Dart d = m_map.phi_1(m_tableVertDarts[index_side++]);
		Dart e = tableTop[i];
Pierre Kraemer's avatar
Pierre Kraemer committed
672
		m_map.sewFaces(d, e, false);
Pierre Kraemer's avatar
Pierre Kraemer committed
673
	}
Pierre Kraemer's avatar
Pierre Kraemer committed
674
	for(unsigned int i = 0; i < y; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
675 676 677
	{
		Dart d = m_map.phi_1(m_tableVertDarts[index_side++]);
		Dart e = tableTop[x+i*(x+1)];
Pierre Kraemer's avatar
Pierre Kraemer committed
678
		m_map.sewFaces(d, e, false);
Pierre Kraemer's avatar
Pierre Kraemer committed
679
	}
Pierre Kraemer's avatar
Pierre Kraemer committed
680
	for(unsigned int i = 0; i < x; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
681 682 683 684
	{
		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);
Pierre Kraemer's avatar
Pierre Kraemer committed
685
		m_map.sewFaces(d, e, false);
Pierre Kraemer's avatar
Pierre Kraemer committed
686
	}
Pierre Kraemer's avatar
Pierre Kraemer committed
687
	for(unsigned int i = 0; i < y; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
688 689 690 691
	{
		Dart d = m_map.phi_1(m_tableVertDarts[index_side++]);
		Dart e = tableTop[(y-1-i)*(x+1)];
		e = m_map.phi_1(e);
Pierre Kraemer's avatar
Pierre Kraemer committed
692
		m_map.sewFaces(d, e, false);
Pierre Kraemer's avatar
Pierre Kraemer committed
693 694 695
	}

	// the bottom
696
	Polyhedron<PFP> primBottom(m_map,m_positions);
Pierre Kraemer's avatar
Pierre Kraemer committed
697 698 699 700
	primBottom.grid_topo(x,y);
	std::vector<Dart>& tableBottom = primBottom.getVertexDarts();

	index_side = 3*(x+y)+(x-1);
Pierre Kraemer's avatar
Pierre Kraemer committed
701
	for(unsigned int i = 0; i < x; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
702 703 704
	{
		Dart d = m_tableVertDarts[(index_side--)%(2*(x+y))];
		Dart e = tableBottom[i];
Pierre Kraemer's avatar
Pierre Kraemer committed
705
		m_map.sewFaces(d, e, false);
Pierre Kraemer's avatar
Pierre Kraemer committed
706
	}
Pierre Kraemer's avatar
Pierre Kraemer committed
707
	for(unsigned int i = 0; i < y; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
708 709 710
	{
		Dart d = m_tableVertDarts[(index_side--)%(2*(x+y))];
		Dart e = tableBottom[x+i*(x+1)];
Pierre Kraemer's avatar
Pierre Kraemer committed
711
		m_map.sewFaces(d, e, false);
Pierre Kraemer's avatar
Pierre Kraemer committed
712
	}
Pierre Kraemer's avatar
Pierre Kraemer committed
713
	for(unsigned int i = 0; i < x; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
714 715 716 717
	{
		Dart d = m_tableVertDarts[(index_side--)%(2*(x+y))];
		Dart e = tableBottom[(x+1)*(y+1)-2 - i];
		e = m_map.phi_1(e);
Pierre Kraemer's avatar
Pierre Kraemer committed
718
		m_map.sewFaces(d, e, false);
Pierre Kraemer's avatar
Pierre Kraemer committed
719
	}
Pierre Kraemer's avatar
Pierre Kraemer committed
720
	for(unsigned int i = 0; i < y; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
721 722 723 724
	{
		Dart d = m_tableVertDarts[(index_side--)%(2*(x+y))];
		Dart e = tableBottom[(y-1-i)*(x+1)];
		e = m_map.phi_1(e);
Pierre Kraemer's avatar
Pierre Kraemer committed
725
		m_map.sewFaces(d, e, false);
Pierre Kraemer's avatar
Pierre Kraemer committed
726 727 728 729
	}

	// and add new vertex in m_tableVertDarts
	//top  first
Pierre Kraemer's avatar
Pierre Kraemer committed
730
	for(unsigned int i = 1; i < y; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
731
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
732
		for(unsigned int j = 1; j < x; ++j)
Pierre Kraemer's avatar
Pierre Kraemer committed
733 734 735 736
			m_tableVertDarts.push_back(tableTop[i*(x+1)+j]);
	}

	// then bottom
Pierre Kraemer's avatar
Pierre Kraemer committed
737
	for(unsigned int i = 1; i < y; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
738
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
739
		for(unsigned int j = 1; j < x; ++j)
Pierre Kraemer's avatar
Pierre Kraemer committed
740 741 742 743 744 745 746
			m_tableVertDarts.push_back(tableBottom[i*(x+1)+j]);
	}

	return m_dart;
}

template <typename PFP>
Pierre Kraemer's avatar
Pierre Kraemer committed
747
Dart Polyhedron<PFP>::tore_topo(unsigned int m, unsigned int n)
Pierre Kraemer's avatar
Pierre Kraemer committed
748 749 750 751
{
	if (m_kind != NONE) return m_dart;

	m_dart = cylinder_topo(n, m, false, false);
Pierre Kraemer's avatar
Pierre Kraemer committed
752 753
	m_nx = n;
	m_ny = m;
Pierre Kraemer's avatar
Pierre Kraemer committed
754 755
	m_kind = TORE;

Pierre Kraemer's avatar
Pierre Kraemer committed
756
	// just finish to sew
Pierre Kraemer's avatar
Pierre Kraemer committed
757
	for(unsigned int i = 0; i < n; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
758 759 760 761
	{
		Dart d = m_tableVertDarts[i];
		Dart e = m_tableVertDarts[(m*n)+i];
		e = m_map.phi_1(e);
Pierre Kraemer's avatar
Pierre Kraemer committed
762
		m_map.sewFaces(d, e);
Pierre Kraemer's avatar
Pierre Kraemer committed
763 764 765 766 767 768 769 770 771 772
	}

	// 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>
Pierre Kraemer's avatar
Pierre Kraemer committed
773
void Polyhedron<PFP>::embedGrid(float x, float y, float z)
Pierre Kraemer's avatar
Pierre Kraemer committed
774 775 776
{
	typedef typename PFP::VEC3 VEC3 ;

Pierre Kraemer's avatar
Pierre Kraemer committed
777 778
	if (m_kind != GRID)
	{
779
		CGoGNerr << "Warning try to embedGrid something that is not a grid"<<CGoGNendl;
Pierre Kraemer's avatar
Pierre Kraemer committed
780 781 782 783 784 785
		return;
	}

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

Pierre Kraemer's avatar
Pierre Kraemer committed
786
	for(unsigned int i = 0; i <= m_ny; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
787
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
788
		for(unsigned int j = 0; j <= m_nx;++j)
Pierre Kraemer's avatar
Pierre Kraemer committed
789 790 791 792
		{
			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];
Pierre Kraemer's avatar
Pierre Kraemer committed
793
			m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
794 795 796 797 798
		}
	}
}

template <typename PFP>
Pierre Kraemer's avatar
Pierre Kraemer committed
799
void Polyhedron<PFP>::embedCylinder(float bottom_radius, float top_radius, float height)
Pierre Kraemer's avatar
Pierre Kraemer committed
800 801 802
{
	typedef typename PFP::VEC3 VEC3 ;

Pierre Kraemer's avatar
Pierre Kraemer committed
803 804
	if (m_kind != CYLINDER)
	{
805
		CGoGNerr << "Warning try to embedCylinder something that is not a cylnder"<<CGoGNendl;
Pierre Kraemer's avatar
Pierre Kraemer committed
806 807 808 809 810 811
		return;
	}

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

Pierre Kraemer's avatar
Pierre Kraemer committed
812
	for(unsigned int i = 0; i <= m_nz; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
813 814 815
	{
		float a = float(i)/float(m_nz);
		float radius = a*top_radius + (1.0f-a)*bottom_radius;
Pierre Kraemer's avatar
Pierre Kraemer committed
816
		for(unsigned int j = 0; j < m_nx; ++j)
Pierre Kraemer's avatar
Pierre Kraemer committed
817 818 819 820 821 822 823
		{
	
			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];
Pierre Kraemer's avatar
Pierre Kraemer committed
824
			m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
825 826 827 828 829 830 831 832 833
		}
	}

	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++];
Pierre Kraemer's avatar
Pierre Kraemer committed
834
		m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
835 836 837 838 839 840 841
	}

	if (m_top_closed)
	{
		VEC3 pos(0.0f ,0.0f, height/2 );
		unsigned int em = m_positions.insert(pos);
		Dart d = m_tableVertDarts[indexUmbrella];
Pierre Kraemer's avatar
Pierre Kraemer committed
842
		m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
843 844 845 846
	}
}

template <typename PFP>
Pierre Kraemer's avatar
Pierre Kraemer committed
847
void Polyhedron<PFP>::embedCone(float radius, float height)
Pierre Kraemer's avatar
Pierre Kraemer committed
848 849 850
{
	typedef typename PFP::VEC3 VEC3 ;

Pierre Kraemer's avatar
Pierre Kraemer committed
851 852
	if (m_kind != CONE)
	{
853
		CGoGNerr << "Warning try to embedCone something that is not a cone"<<CGoGNendl;
Pierre Kraemer's avatar
Pierre Kraemer committed
854 855 856 857 858 859 860
		return;
	}

	float alpha = float(2.0*M_PI/m_nx);
	int zcyl = m_nz-1;
	float dz = height/float(m_nz);
	
Pierre Kraemer's avatar
Pierre Kraemer committed
861
	for(unsigned int i = 0; i <= zcyl; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
862
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
863
		for(unsigned int j = 0; j < m_nx; ++j)
Pierre Kraemer's avatar
Pierre Kraemer committed
864 865 866 867 868 869 870 871 872 873
		{
			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];
Pierre Kraemer's avatar
Pierre Kraemer committed
874
			m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
875 876 877 878 879 880 881 882 883
		}
	}

	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++];
Pierre Kraemer's avatar
Pierre Kraemer committed
884
		m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
885 886 887 888 889 890
	}

	//  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];
Pierre Kraemer's avatar
Pierre Kraemer committed
891
	m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
892 893 894
}

template <typename PFP>
Pierre Kraemer's avatar
Pierre Kraemer committed
895
void Polyhedron<PFP>::embedSphere(float radius)
Pierre Kraemer's avatar
Pierre Kraemer committed
896 897 898
{
	typedef typename PFP::VEC3 VEC3 ;

Pierre Kraemer's avatar
Pierre Kraemer committed
899 900
	if (!((m_kind == CYLINDER) && (m_top_closed) && (m_bottom_closed)))
	{
901
		CGoGNerr << "Warning try to embedSphere something that is not a sphere (closed cylinder)"<<CGoGNendl;
Pierre Kraemer's avatar
Pierre Kraemer committed
902 903 904 905 906 907
		return;
	}

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

Pierre Kraemer's avatar
Pierre Kraemer committed
908
	for(unsigned int i = 0; i <= m_nz; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
909
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
910
		for(unsigned int j = 0; j < m_nx; ++j)
Pierre Kraemer's avatar
Pierre Kraemer committed
911 912 913 914 915 916 917 918 919
		{
			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];
Pierre Kraemer's avatar
Pierre Kraemer committed
920
			m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
921 922 923 924
		}
	}

	// bottom  pole
Pierre Kraemer's avatar
Pierre Kraemer committed
925
	VEC3 pos(0.0f, 0.0f, -radius);
Pierre Kraemer's avatar
Pierre Kraemer committed
926 927
	unsigned int em = m_positions.insert(pos);
	Dart d = m_tableVertDarts[m_nx*(m_nz+1)];
Pierre Kraemer's avatar
Pierre Kraemer committed
928
	m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
929 930

	//  top pole
Pierre Kraemer's avatar
Pierre Kraemer committed
931
	pos = VEC3(0.0f, 0.0f, radius);
Pierre Kraemer's avatar
Pierre Kraemer committed
932 933
	em = m_positions.insert(pos);
	d = m_tableVertDarts[m_nx*(m_nz+1)+1];
Pierre Kraemer's avatar
Pierre Kraemer committed
934
	m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
935 936 937
}

template <typename PFP>
Pierre Kraemer's avatar
Pierre Kraemer committed
938
void Polyhedron<PFP>::embedTore(float big_radius, float small_radius)
Pierre Kraemer's avatar
Pierre Kraemer committed
939 940 941
{
	typedef typename PFP::VEC3 VEC3 ;

Pierre Kraemer's avatar
Pierre Kraemer committed
942 943
	if (m_kind != TORE)
	{
944
		CGoGNerr << "Warning try to embedTore something that is not a tore"<<CGoGNendl;
Pierre Kraemer's avatar
Pierre Kraemer committed
945 946 947 948 949 950
		return;
	}

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

Pierre Kraemer's avatar
Pierre Kraemer committed
951
	for (unsigned int i = 0; i < m_nx; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
952
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
953
		for(unsigned int j = 0; j < m_ny; ++j)
Pierre Kraemer's avatar
Pierre Kraemer committed
954 955 956 957 958 959 960 961
		{
			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];
Pierre Kraemer's avatar
Pierre Kraemer committed
962
			m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
963 964 965 966 967
		}
	}
}

template <typename PFP>
Pierre Kraemer's avatar
Pierre Kraemer committed
968
void Polyhedron<PFP>::embedCube(float sx, float sy, float sz)
Pierre Kraemer's avatar
Pierre Kraemer committed
969 970 971
{
	typedef typename PFP::VEC3 VEC3 ;

Pierre Kraemer's avatar
Pierre Kraemer committed
972 973
	if (m_kind != CUBE)
	{
974
		CGoGNerr << "Warning try to embedCube something that is not a cube"<<CGoGNendl;
Pierre Kraemer's avatar
Pierre Kraemer committed
975 976 977 978 979 980 981 982 983
		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;
Pierre Kraemer's avatar
Pierre Kraemer committed
984
	for (unsigned int k = 0; k <= m_nz; ++k)
Pierre Kraemer's avatar
Pierre Kraemer committed
985 986
	{
		float z = float(k)*dz - sz/2.0f;
Pierre Kraemer's avatar
Pierre Kraemer committed
987
		for (unsigned int i = 0; i < m_nx; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
988 989 990 991 992
		{
			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++];
Pierre Kraemer's avatar
Pierre Kraemer committed
993
			m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
994
		}
Pierre Kraemer's avatar
Pierre Kraemer committed
995
		for (unsigned int i = 0; i < m_ny; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
996 997 998 999 1000
		{
			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++];
Pierre Kraemer's avatar
Pierre Kraemer committed
1001
			m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
1002
		}
Pierre Kraemer's avatar
Pierre Kraemer committed
1003
		for (unsigned int i = 0; i < m_nx; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
1004 1005 1006 1007 1008
		{
			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++];
Pierre Kraemer's avatar
Pierre Kraemer committed
1009
			m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
1010
		}
Pierre Kraemer's avatar
Pierre Kraemer committed
1011
		for (unsigned int i = 0; i < m_ny ;++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
1012 1013 1014 1015 1016
		{
			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++];
Pierre Kraemer's avatar
Pierre Kraemer committed
1017
			m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
1018 1019 1020 1021
		}
	}

	// the top
Pierre Kraemer's avatar
Pierre Kraemer committed
1022
	for(unsigned int i = 1; i  <m_ny; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
1023
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
1024
		for(unsigned int j = 1; j < m_nx; ++j)
Pierre Kraemer's avatar
Pierre Kraemer committed
1025 1026 1027 1028
		{
			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++];
Pierre Kraemer's avatar
Pierre Kraemer committed
1029
			m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
1030 1031 1032 1033
		}
	}

	// the bottom
Pierre Kraemer's avatar
Pierre Kraemer committed
1034
	for(unsigned int i = 1; i < m_ny; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
1035
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
1036
		for(unsigned int j = 1; j < m_nx; ++j)
Pierre Kraemer's avatar
Pierre Kraemer committed
1037 1038 1039 1040
		{
			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++];
Pierre Kraemer's avatar
Pierre Kraemer committed
1041
			m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
1042 1043 1044 1045 1046 1047 1048 1049 1050
		}
	}
}

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

Pierre Kraemer's avatar
Pierre Kraemer committed
1051
	for(typename std::vector<Dart>::iterator di = m_tableVertDarts.begin(); di != m_tableVertDarts.end(); ++di)
Pierre Kraemer's avatar
Pierre Kraemer committed
1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067
	{
		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]);

Pierre Kraemer's avatar
Pierre Kraemer committed
1068
	for(typename std::vector<Dart>::iterator di = m_tableVertDarts.begin(); di != m_tableVertDarts.end(); ++di)
Pierre Kraemer's avatar
Pierre Kraemer committed
1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085
	{

		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
1086
void Polyhedron<PFP>::mark(CellMarker& m)
Pierre Kraemer's avatar
Pierre Kraemer committed
1087
{
Pierre Kraemer's avatar
Pierre Kraemer committed
1088
	for(typename std::vector<Dart>::iterator di = m_tableVertDarts.begin(); di != m_tableVertDarts.end(); ++di)
Pierre Kraemer's avatar
Pierre Kraemer committed
1089
	{
Sylvain Thery's avatar
Sylvain Thery committed
1090
		m.mark(*di);
Pierre Kraemer's avatar
Pierre Kraemer committed
1091 1092 1093
	}
}

Pierre Kraemer's avatar
Pierre Kraemer committed
1094 1095 1096 1097 1098 1099 1100 1101 1102
//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
1103 1104

template <typename PFP>
Pierre Kraemer's avatar
Pierre Kraemer committed
1105
void Polyhedron<PFP>::embedTwistedStrip(float radius_min,  float radius_max, float turns)
Pierre Kraemer's avatar
Pierre Kraemer committed
1106 1107 1108 1109 1110 1111 1112 1113 1114
{
	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;

Pierre Kraemer's avatar
Pierre Kraemer committed
1115
	for(unsigned int i = 0; i <= m_ny; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
1116
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
1117
		for(unsigned int j = 0; j <= m_nx; ++j)
Pierre Kraemer's avatar
Pierre Kraemer committed
1118 1119 1120 1121 1122 1123
		{
			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];
Pierre Kraemer's avatar
Pierre Kraemer committed
1124
			m_map.embedOrbit(VERTEX, d, em);
Pierre Kraemer's avatar
Pierre Kraemer committed
1125 1126 1127 1128 1129
		}
	}
}

template <typename PFP>
Pierre Kraemer's avatar
Pierre Kraemer committed
1130
void Polyhedron<PFP>::embedHelicoid(float radius_min, float radius_max, float maxHeight, float nbTurn, int orient)
Pierre Kraemer's avatar
Pierre Kraemer committed
1131 1132 1133 1134 1135 1136 1137 1138 1139
{
	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;

Pierre Kraemer's avatar
Pierre Kraemer committed
1140
	for(unsigned int i = 0; i <= m_ny; ++i)
Pierre Kraemer's avatar
Pierre Kraemer committed
1141
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
1142
		for(unsigned int j = 0; j <= m_nx; ++j)
Pierre Kraemer's avatar
Pierre Kraemer committed
1143 1144 1145
		{
// 			float r = radius_max + radius_min*cos(beta*float(j));
			float r,x,y;
Thomas's avatar
Thomas committed
1146 1147 1148 1149
// 			if(i==1) {
// 				r = radius_max;
// 			}
// 			else {
Pierre Kraemer's avatar
Pierre Kraemer committed
1150
				r = radius_min+(radius_max-radius_min)*float(i)/float(m_ny);
Thomas's avatar
Thomas committed
1151 1152 1153
// 			}
			x = orient*r*sin(alpha*float(j));
			y = orient*r*cos(alpha*float(j));
Pierre Kraemer's avatar
Pierre Kraemer committed
1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180

			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);
1181
// 		m.markOrbit(FACE, d);
Pierre Kraemer's avatar
Pierre Kraemer committed
1182 1183 1184 1185 1186 1187