Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Etienne Schmitt
CGoGN
Commits
5a0855ad
Commit
5a0855ad
authored
Jan 30, 2014
by
untereiner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erasing delegating constructors (c++11 not ready)
parent
daa19158
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
15 deletions
+20
-15
include/Algo/Tiling/Surface/hexagonal.h
include/Algo/Tiling/Surface/hexagonal.h
+4
-2
include/Algo/Tiling/Surface/square.h
include/Algo/Tiling/Surface/square.h
+12
-11
include/Algo/Tiling/Surface/triangular.h
include/Algo/Tiling/Surface/triangular.h
+4
-2
No files found.
include/Algo/Tiling/Surface/hexagonal.h
View file @
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
...
...
include/Algo/Tiling/Surface/square.h
View file @
5a0855ad
...
...
@@ -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
...
...
include/Algo/Tiling/Surface/triangular.h
View file @
5a0855ad
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment