manolas
/
MySources
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed unused headers

This commit is contained in:
iasonmanolas 2021-03-15 19:06:53 +02:00
parent 5aaf4f5242 262eb959f1
commit fd67b1b4c9
1 changed files with 50 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
edgemesh.hpp
View File

@ -2,9 +2,7 @@
#define EDGEMESH_HPP #define EDGEMESH_HPP
#include "beam.hpp" #include "beam.hpp"
#include "mesh.hpp" #include "mesh.hpp"
//#include "polymesh.hpp"
#include "utilities.hpp" #include "utilities.hpp"
//#include "vcgtrimesh.hpp"
#include <vcg/complex/complex.h> #include <vcg/complex/complex.h>
#include <vector> #include <vector>
#include <wrap/io_trimesh/import.h> #include <wrap/io_trimesh/import.h>
@ -15,75 +13,75 @@ class VCGEdgeMeshEdgeType;
class VCGEdgeMeshVertexType; class VCGEdgeMeshVertexType;
struct VCGEdgeMeshUsedTypes struct VCGEdgeMeshUsedTypes
: public vcg::UsedTypes<vcg::Use<VCGEdgeMeshVertexType>::AsVertexType, : public vcg::UsedTypes<vcg::Use<VCGEdgeMeshVertexType>::AsVertexType,
vcg::Use<VCGEdgeMeshEdgeType>::AsEdgeType> {}; vcg::Use<VCGEdgeMeshEdgeType>::AsEdgeType> {};
class VCGEdgeMeshVertexType class VCGEdgeMeshVertexType
: public vcg::Vertex<VCGEdgeMeshUsedTypes, vcg::vertex::Coord3d, : public vcg::Vertex<VCGEdgeMeshUsedTypes, vcg::vertex::Coord3d,
vcg::vertex::Normal3d, vcg::vertex::BitFlags, vcg::vertex::Normal3d, vcg::vertex::BitFlags,
vcg::vertex::Color4b, vcg::vertex::VEAdj> {}; vcg::vertex::Color4b, vcg::vertex::VEAdj> {};
class VCGEdgeMeshEdgeType class VCGEdgeMeshEdgeType
: public vcg::Edge<VCGEdgeMeshUsedTypes, vcg::edge::VertexRef, : public vcg::Edge<VCGEdgeMeshUsedTypes, vcg::edge::VertexRef,
vcg::edge::BitFlags, vcg::edge::EEAdj, vcg::edge::BitFlags, vcg::edge::EEAdj,
vcg::edge::VEAdj> {}; vcg::edge::VEAdj> {};
class VCGEdgeMesh : public vcg::tri::TriMesh<std::vector<VCGEdgeMeshVertexType>, class VCGEdgeMesh : public vcg::tri::TriMesh<std::vector<VCGEdgeMeshVertexType>,
std::vector<VCGEdgeMeshEdgeType>>, std::vector<VCGEdgeMeshEdgeType>>,
Mesh { Mesh {
protected: protected:
Eigen::MatrixX2i eigenEdges; Eigen::MatrixX2i eigenEdges;
Eigen::MatrixX3d eigenVertices; Eigen::MatrixX3d eigenVertices;
Eigen::MatrixX3d eigenEdgeNormals; Eigen::MatrixX3d eigenEdgeNormals;
std::string label{"No_name"}; std::string label{"No_name"};
void getEdges(Eigen::MatrixX2i &edges); void getEdges(Eigen::MatrixX2i &edges);
void getVertices(Eigen::MatrixX3d &vertices); void getVertices(Eigen::MatrixX3d &vertices);
public: public:
VCGEdgeMesh(); VCGEdgeMesh();
template <typename MeshElement> template <typename MeshElement>
size_t getIndex(const MeshElement &meshElement) { size_t getIndex(const MeshElement &meshElement) {
return vcg::tri::Index<VCGEdgeMesh>(*this, meshElement); return vcg::tri::Index<VCGEdgeMesh>(*this, meshElement);
} }
void updateEigenEdgeAndVertices(); void updateEigenEdgeAndVertices();
virtual void copy(VCGEdgeMesh &mesh); virtual void copy(VCGEdgeMesh &mesh);
void getEdges(Eigen::MatrixX3d &edgeStartingPoints, void getEdges(Eigen::MatrixX3d &edgeStartingPoints,
Eigen::MatrixX3d &edgeEndingPoints) const; 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 squareGridDimension);
bool createSpanGrid(const size_t desiredWidth, const size_t desiredHeight); bool createSpanGrid(const size_t desiredWidth, const size_t desiredHeight);
void createSpiral(const float &degreesOfArm, const size_t &numberOfSamples); void createSpiral(const float &degreesOfArm, const size_t &numberOfSamples);
Eigen::MatrixX2i getEigenEdges() const; Eigen::MatrixX2i getEigenEdges() const;
Eigen::MatrixX3d getEigenVertices() const; Eigen::MatrixX3d getEigenVertices() const;
Eigen::MatrixX3d getEigenEdgeNormals() const; Eigen::MatrixX3d getEigenEdgeNormals() const;
void printVertexCoordinates(const size_t &vi) const; void printVertexCoordinates(const size_t &vi) const;
#ifdef POLYSCOPE_DEFINED #ifdef POLYSCOPE_DEFINED
void registerForDrawing( void registerForDrawing(
const std::optional<glm::vec3> &desiredColor = std::nullopt, const std::optional<glm::vec3> &desiredColor = std::nullopt,
const bool &shouldEnable = true) const; const bool &shouldEnable = true) const;
void unregister() const; void unregister() const;
#endif #endif
std::string getLabel() const; std::string getLabel() const;
void setLabel(const std::string &value); void setLabel(const std::string &value);
private: private:
void GeneratedRegularSquaredPattern( void GeneratedRegularSquaredPattern(
const double angleDeg, std::vector<std::vector<vcg::Point2d>> &pattern, const double angleDeg, std::vector<std::vector<vcg::Point2d>> &pattern,
const size_t &desiredNumberOfSamples); const size_t &desiredNumberOfSamples);
}; };
using VectorType = VCGEdgeMesh::CoordType; using VectorType = VCGEdgeMesh::CoordType;
using CoordType = VCGEdgeMesh::CoordType; using CoordType = VCGEdgeMesh::CoordType;