Skip to content
Snippets Groups Projects
Commit d9704580 authored by Philip Trettner's avatar Philip Trettner
Browse files

fixed type

parent 0f05bb95
No related branches found
No related tags found
No related merge requests found
...@@ -413,8 +413,6 @@ std::shared_ptr<PolyMeshDefinition> make_mesh_definition(std::vector<tg::tube<D, ...@@ -413,8 +413,6 @@ std::shared_ptr<PolyMeshDefinition> make_mesh_definition(std::vector<tg::tube<D,
auto pm = std::make_shared<PolyMeshDefinition>(); auto pm = std::make_shared<PolyMeshDefinition>();
pm->info.type = MeshType::PolygonList; pm->info.type = MeshType::PolygonList;
auto to_glm = [](tg::pos3 p) { return glm::vec3(p.x, p.y, p.z); };
for (auto const& c : tubes) for (auto const& c : tubes)
{ {
auto dir = normalize(c.axis.pos1 - c.axis.pos0); auto dir = normalize(c.axis.pos1 - c.axis.pos0);
...@@ -425,7 +423,7 @@ std::shared_ptr<PolyMeshDefinition> make_mesh_definition(std::vector<tg::tube<D, ...@@ -425,7 +423,7 @@ std::shared_ptr<PolyMeshDefinition> make_mesh_definition(std::vector<tg::tube<D,
[&](pm::vertex_handle v, float x, float y) { [&](pm::vertex_handle v, float x, float y) {
auto [sx, cx] = tg::sin_cos(x * 360_deg); auto [sx, cx] = tg::sin_cos(x * 360_deg);
auto& p = pm->pos[v]; auto& p = pm->pos[v];
p = to_glm(c.axis[y] + (t0 * sx + t1 * cx) * c.radius); p = c.axis[y] + (t0 * sx + t1 * cx) * c.radius;
}, },
32, false); 32, false);
} }
...@@ -452,8 +450,6 @@ std::shared_ptr<PolyMeshDefinition> make_mesh_definition(std::vector<tg::cone<D, ...@@ -452,8 +450,6 @@ std::shared_ptr<PolyMeshDefinition> make_mesh_definition(std::vector<tg::cone<D,
auto pm = std::make_shared<PolyMeshDefinition>(); auto pm = std::make_shared<PolyMeshDefinition>();
pm->info.type = MeshType::PolygonList; pm->info.type = MeshType::PolygonList;
auto to_glm = [](tg::pos3 p) { return glm::vec3(p.x, p.y, p.z); };
for (auto const& c : cones) for (auto const& c : cones)
{ {
auto dir = c.base.normal; auto dir = c.base.normal;
...@@ -465,9 +461,9 @@ std::shared_ptr<PolyMeshDefinition> make_mesh_definition(std::vector<tg::cone<D, ...@@ -465,9 +461,9 @@ std::shared_ptr<PolyMeshDefinition> make_mesh_definition(std::vector<tg::cone<D,
auto [sx, cx] = tg::sin_cos(x * 360_deg); auto [sx, cx] = tg::sin_cos(x * 360_deg);
auto& p = pm->pos[v]; auto& p = pm->pos[v];
if (y == 0) if (y == 0)
p = to_glm(c.base.center + (t0 * sx + t1 * cx) * c.base.radius); p = c.base.center + (t0 * sx + t1 * cx) * c.base.radius;
else else
p = to_glm(c.base.center + c.base.normal * c.height); p = c.base.center + c.base.normal * c.height;
}, },
32); 32);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment