diff --git a/edgemesh.hpp b/edgemesh.hpp index cfb6796..85497ec 100755 --- a/edgemesh.hpp +++ b/edgemesh.hpp @@ -2,9 +2,7 @@ #define EDGEMESH_HPP #include "beam.hpp" #include "mesh.hpp" -//#include "polymesh.hpp" #include "utilities.hpp" -//#include "vcgtrimesh.hpp" #include #include #include @@ -15,75 +13,75 @@ class VCGEdgeMeshEdgeType; class VCGEdgeMeshVertexType; struct VCGEdgeMeshUsedTypes - : public vcg::UsedTypes::AsVertexType, - vcg::Use::AsEdgeType> {}; +: public vcg::UsedTypes::AsVertexType, + vcg::Use::AsEdgeType> {}; class VCGEdgeMeshVertexType - : public vcg::Vertex {}; +: public vcg::Vertex {}; class VCGEdgeMeshEdgeType - : public vcg::Edge {}; +: public vcg::Edge {}; class VCGEdgeMesh : public vcg::tri::TriMesh, - std::vector>, - Mesh { + std::vector>, + Mesh { -protected: - Eigen::MatrixX2i eigenEdges; - Eigen::MatrixX3d eigenVertices; - Eigen::MatrixX3d eigenEdgeNormals; - std::string label{"No_name"}; + protected: + Eigen::MatrixX2i eigenEdges; + Eigen::MatrixX3d eigenVertices; + Eigen::MatrixX3d eigenEdgeNormals; + std::string label{"No_name"}; - void getEdges(Eigen::MatrixX2i &edges); - void getVertices(Eigen::MatrixX3d &vertices); + void getEdges(Eigen::MatrixX2i &edges); + void getVertices(Eigen::MatrixX3d &vertices); -public: - VCGEdgeMesh(); - template - size_t getIndex(const MeshElement &meshElement) { - return vcg::tri::Index(*this, meshElement); - } - void updateEigenEdgeAndVertices(); - virtual void copy(VCGEdgeMesh &mesh); + public: + VCGEdgeMesh(); + template + size_t getIndex(const MeshElement &meshElement) { + return vcg::tri::Index(*this, meshElement); + } + void updateEigenEdgeAndVertices(); + virtual void copy(VCGEdgeMesh &mesh); - void getEdges(Eigen::MatrixX3d &edgeStartingPoints, - Eigen::MatrixX3d &edgeEndingPoints) const; + void getEdges(Eigen::MatrixX3d &edgeStartingPoints, + Eigen::MatrixX3d &edgeEndingPoints) const; - Eigen::MatrixX3d getNormals() const; + Eigen::MatrixX3d getNormals() const; - bool plyFileHasAllRequiredFields(const std::string &plyFilename); + bool plyFileHasAllRequiredFields(const std::string &plyFilename); - bool loadUsingNanoply(const std::string &plyFilename); + bool loadUsingNanoply(const std::string &plyFilename); - bool load(const std::string &plyFilename) override; + bool load(const std::string &plyFilename) override; - bool savePly(const std::string plyFilename); + bool savePly(const std::string plyFilename); - bool createSpanGrid(const size_t squareGridDimension); - bool createSpanGrid(const size_t desiredWidth, const size_t desiredHeight); - void createSpiral(const float °reesOfArm, const size_t &numberOfSamples); + bool createSpanGrid(const size_t squareGridDimension); + bool createSpanGrid(const size_t desiredWidth, const size_t desiredHeight); + void createSpiral(const float °reesOfArm, const size_t &numberOfSamples); - Eigen::MatrixX2i getEigenEdges() const; - Eigen::MatrixX3d getEigenVertices() const; - Eigen::MatrixX3d getEigenEdgeNormals() const; - void printVertexCoordinates(const size_t &vi) const; + Eigen::MatrixX2i getEigenEdges() const; + Eigen::MatrixX3d getEigenVertices() const; + Eigen::MatrixX3d getEigenEdgeNormals() const; + void printVertexCoordinates(const size_t &vi) const; #ifdef POLYSCOPE_DEFINED - void registerForDrawing( - const std::optional &desiredColor = std::nullopt, - const bool &shouldEnable = true) const; - void unregister() const; + void registerForDrawing( + const std::optional &desiredColor = std::nullopt, + const bool &shouldEnable = true) const; + void unregister() const; #endif - std::string getLabel() const; - void setLabel(const std::string &value); + std::string getLabel() const; + void setLabel(const std::string &value); -private: - void GeneratedRegularSquaredPattern( - const double angleDeg, std::vector> &pattern, - const size_t &desiredNumberOfSamples); -}; + private: + void GeneratedRegularSquaredPattern( + const double angleDeg, std::vector> &pattern, + const size_t &desiredNumberOfSamples); + }; using VectorType = VCGEdgeMesh::CoordType; using CoordType = VCGEdgeMesh::CoordType;