Commit b2edcaec authored by Jan Möbius's avatar Jan Möbius

Cosmetics to primitives generator



git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@17253 383ad7c9-94d9-4d36-a494-682f7c89f535
parent abd2fab5
...@@ -59,7 +59,7 @@ void TetrahedralCuboidGenerator::add_vertices(Vector const& position, Vector con ...@@ -59,7 +59,7 @@ void TetrahedralCuboidGenerator::add_vertices(Vector const& position, Vector con
} }
void TetrahedralCuboidGenerator::get_cube_vertices(std::size_t i, std::size_t j, std::size_t k, void TetrahedralCuboidGenerator::get_cube_vertices(std::size_t i, std::size_t j, std::size_t k,
std::vector<OpenVolumeMesh::VertexHandle>& v) std::vector<OpenVolumeMesh::VertexHandle>& v) const
{ {
v[0] = vertices_[k * (size_[0] + 1) * (size_[1] + 1) + j * (size_[0] + 1) + i]; v[0] = vertices_[k * (size_[0] + 1) * (size_[1] + 1) + j * (size_[0] + 1) + i];
v[1] = vertices_[k * (size_[0] + 1) * (size_[1] + 1) + j * (size_[0] + 1) + i + 1]; v[1] = vertices_[k * (size_[0] + 1) * (size_[1] + 1) + j * (size_[0] + 1) + i + 1];
...@@ -89,7 +89,7 @@ void TetrahedralCuboidGenerator::add_faces() ...@@ -89,7 +89,7 @@ void TetrahedralCuboidGenerator::add_faces()
} }
void TetrahedralCuboidGenerator::add_cube_type_1_faces(std::size_t i, std::size_t j, std::size_t k, void TetrahedralCuboidGenerator::add_cube_type_1_faces(std::size_t i, std::size_t j, std::size_t k,
std::vector<OpenVolumeMesh::VertexHandle>& v) std::vector<OpenVolumeMesh::VertexHandle> const& v)
{ {
std::vector<OpenVolumeMesh::VertexHandle> fv(3); std::vector<OpenVolumeMesh::VertexHandle> fv(3);
...@@ -147,7 +147,7 @@ void TetrahedralCuboidGenerator::add_cube_type_1_faces(std::size_t i, std::size_ ...@@ -147,7 +147,7 @@ void TetrahedralCuboidGenerator::add_cube_type_1_faces(std::size_t i, std::size_
} }
void TetrahedralCuboidGenerator::add_cube_type_2_faces(std::size_t i, std::size_t j, std::size_t k, void TetrahedralCuboidGenerator::add_cube_type_2_faces(std::size_t i, std::size_t j, std::size_t k,
std::vector<OpenVolumeMesh::VertexHandle>& v) std::vector<OpenVolumeMesh::VertexHandle> const& v)
{ {
std::vector<OpenVolumeMesh::VertexHandle> fv(3); std::vector<OpenVolumeMesh::VertexHandle> fv(3);
...@@ -222,7 +222,7 @@ void TetrahedralCuboidGenerator::add_cells() ...@@ -222,7 +222,7 @@ void TetrahedralCuboidGenerator::add_cells()
} }
void TetrahedralCuboidGenerator::add_cube_type_1_cells(std::size_t i, std::size_t j, std::size_t k, void TetrahedralCuboidGenerator::add_cube_type_1_cells(std::size_t i, std::size_t j, std::size_t k,
std::vector<OpenVolumeMesh::VertexHandle>& v) std::vector<OpenVolumeMesh::VertexHandle> const& v)
{ {
std::vector<OpenVolumeMesh::FaceHandle> f(4); std::vector<OpenVolumeMesh::FaceHandle> f(4);
std::vector<OpenVolumeMesh::HalfFaceHandle> hf(4); std::vector<OpenVolumeMesh::HalfFaceHandle> hf(4);
...@@ -280,7 +280,7 @@ void TetrahedralCuboidGenerator::add_cube_type_1_cells(std::size_t i, std::size_ ...@@ -280,7 +280,7 @@ void TetrahedralCuboidGenerator::add_cube_type_1_cells(std::size_t i, std::size_
} }
void TetrahedralCuboidGenerator::add_cube_type_2_cells(std::size_t i, std::size_t j, std::size_t k, void TetrahedralCuboidGenerator::add_cube_type_2_cells(std::size_t i, std::size_t j, std::size_t k,
std::vector<OpenVolumeMesh::VertexHandle>& v) std::vector<OpenVolumeMesh::VertexHandle> const& v)
{ {
std::vector<OpenVolumeMesh::FaceHandle> f(4); std::vector<OpenVolumeMesh::FaceHandle> f(4);
std::vector<OpenVolumeMesh::HalfFaceHandle> hf(4); std::vector<OpenVolumeMesh::HalfFaceHandle> hf(4);
......
...@@ -81,20 +81,19 @@ public: ...@@ -81,20 +81,19 @@ public:
private: private:
void add_vertices(Vector const& position, Vector const& length); void add_vertices(Vector const& position, Vector const& length);
void get_cube_vertices(std::size_t i, std::size_t j, std::size_t k, void get_cube_vertices(std::size_t i, std::size_t j, std::size_t k,
std::vector<OpenVolumeMesh::VertexHandle>& v); std::vector<OpenVolumeMesh::VertexHandle>& v) const;
void add_faces(); void add_faces();
void add_cube_type_1_faces(std::size_t i, std::size_t j, std::size_t k, void add_cube_type_1_faces(std::size_t i, std::size_t j, std::size_t k,
std::vector<OpenVolumeMesh::VertexHandle>& v); std::vector<OpenVolumeMesh::VertexHandle> const& v);
void add_cube_type_2_faces(std::size_t i, std::size_t j, std::size_t k, void add_cube_type_2_faces(std::size_t i, std::size_t j, std::size_t k,
std::vector<OpenVolumeMesh::VertexHandle>& v); std::vector<OpenVolumeMesh::VertexHandle> const& v);
void add_cells(); void add_cells();
void add_cube_type_1_cells(std::size_t i, std::size_t j, std::size_t k, void add_cube_type_1_cells(std::size_t i, std::size_t j, std::size_t k,
std::vector<OpenVolumeMesh::VertexHandle>& v); std::vector<OpenVolumeMesh::VertexHandle> const& v);
void add_cube_type_2_cells(std::size_t i, std::size_t j, std::size_t k, void add_cube_type_2_cells(std::size_t i, std::size_t j, std::size_t k,
std::vector<OpenVolumeMesh::VertexHandle>& v); std::vector<OpenVolumeMesh::VertexHandle> const& v);
PolyhedralMesh* mesh_; PolyhedralMesh* mesh_;
......
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