Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cmake source dir fixes #24

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
clang fixes
pgruenbacher committed Nov 23, 2024
commit c7fb3337cac797929803f37037d0fe35bfeda6bc
14 changes: 7 additions & 7 deletions include/generator/ExtrudeMesh.hpp
Original file line number Diff line number Diff line change
@@ -24,6 +24,13 @@ namespace generator {
/// u-texture coordinate is taken from the shape and v from the path.
template <typename Shape, typename Path>
class ExtrudeMesh {
private:

Shape shape_;

Path path_;

int shapeVertexCount_;
public:

class Triangles {
@@ -155,13 +162,6 @@ class ExtrudeMesh {
shapeVertexCount_{count(shape_.vertices())}
{ }

private:

Shape shape_;

Path path_;

int shapeVertexCount_;

};

22 changes: 12 additions & 10 deletions include/generator/LatheMesh.hpp
Original file line number Diff line number Diff line change
@@ -25,6 +25,18 @@ namespace generator {
/// the axis counterclockwise.
template <typename Shape>
class LatheMesh {

private:

gml::dvec3 axis_;

Shape shape_;

int slices_;

double start_;

double sweep_;
public:

class Triangles {
@@ -158,17 +170,7 @@ class LatheMesh {

Vertices vertices() const noexcept { return *this; }

private:

gml::dvec3 axis_;

Shape shape_;

int slices_;

double start_;

double sweep_;

};