Commit e375dc60 authored by CGoGN's avatar CGoGN

Merge /home/untereiner/CGoGN

parents 65fc15da 5a0855ad
......@@ -58,8 +58,10 @@ public:
}
Grid(MAP& map, unsigned int x, unsigned int y):
Grid<PFP>(map,x,y,-1,true)
{ }
Tiling<PFP>(map,x,y,-1)
{
grid(x,y,true);
}
/*! @name Embedding Operators
* Tiling creation
......
......@@ -59,8 +59,10 @@ public:
}
Grid(MAP& map, unsigned int x, unsigned int y):
Grid<PFP>(map,x,y,-1,true)
{ }
Tiling<PFP>(map,x,y,-1)
{
grid(x,y,true);
}
/*! @name Embedding Operators
* Tiling creation
......@@ -134,8 +136,14 @@ public:
}
Cylinder(MAP& map, unsigned int n, unsigned int z):
Cylinder<PFP>(map,n,z,true,true)
{ }
Tiling<PFP>(map, n, -1, z),
m_top_closed(true),
m_bottom_closed(true),
m_top_triangulated(false),
m_bottom_triangulated(false)
{
cylinder(n,z);
}
/*! @name Embedding Operators
* Tiling creation
......@@ -182,13 +190,6 @@ public:
//! Triangulate the bottom face with triangles fan
void triangleBottom();
//! Create a subdivided 2D cone
/*! @param n nb of squares around circumference (must be >= 3)
* @param z nb of squares in height (must be >= 1)
* @param bottom_closed close the bottom (with triangles fan)
*/
void cone(unsigned int x, unsigned int y);
protected:
//! Create a subdivided 2D cylinder
/*! @param n nb of squares around circumference
......
......@@ -59,8 +59,10 @@ public:
}
Grid(MAP& map, unsigned int x, unsigned int y):
Grid<PFP>(map,x,y,-1,true)
{ }
Tiling<PFP>(map,x,y,-1)
{
grid(x,y,true);
}
/*! @name Embedding Operators
* Tiling creation
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment