diff --git a/include/Algo/Tiling/Surface/hexagonal.h b/include/Algo/Tiling/Surface/hexagonal.h index fdc403b5db4e3d5dcda4f38e7a3d38a8fcfddf45..5d0bd9f234b9e4dbf1e3fb6615f1dd98c9226fdb 100644 --- a/include/Algo/Tiling/Surface/hexagonal.h +++ b/include/Algo/Tiling/Surface/hexagonal.h @@ -58,8 +58,10 @@ public: } Grid(MAP& map, unsigned int x, unsigned int y): - Grid(map,x,y,-1,true) - { } + Tiling(map,x,y,-1) + { + grid(x,y,true); + } /*! @name Embedding Operators * Tiling creation diff --git a/include/Algo/Tiling/Surface/square.h b/include/Algo/Tiling/Surface/square.h index 6292a3c968223d1b7835b3b379ece1c2d4b6e18a..ee0c33c99856df1b52f38e0f52743d6be2e65449 100644 --- a/include/Algo/Tiling/Surface/square.h +++ b/include/Algo/Tiling/Surface/square.h @@ -59,8 +59,10 @@ public: } Grid(MAP& map, unsigned int x, unsigned int y): - Grid(map,x,y,-1,true) - { } + Tiling(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(map,n,z,true,true) - { } + Tiling(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 diff --git a/include/Algo/Tiling/Surface/triangular.h b/include/Algo/Tiling/Surface/triangular.h index a09be80489a52d3937959b484676b7a707abae10..0f77d3d3a0200f936adb4c4925a509f73493b1ac 100644 --- a/include/Algo/Tiling/Surface/triangular.h +++ b/include/Algo/Tiling/Surface/triangular.h @@ -59,8 +59,10 @@ public: } Grid(MAP& map, unsigned int x, unsigned int y): - Grid(map,x,y,-1,true) - { } + Tiling(map,x,y,-1) + { + grid(x,y,true); + } /*! @name Embedding Operators * Tiling creation