From: Matt Keeter Date: Fri, 7 Mar 2014 19:22:03 +0000 (-0600) Subject: Remove dependancy on eigen X-Git-Tag: v0.9.0~32^2~1 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fc0f4d267cb6a204f6b65af07a2c9f8333cf5cac;p=fstl Remove dependancy on eigen --- diff --git a/src/canvas.cpp b/src/canvas.cpp index 290885b..a5509c0 100644 --- a/src/canvas.cpp +++ b/src/canvas.cpp @@ -1,6 +1,8 @@ #include #include +#include + #include "canvas.h" #include "backdrop.h" #include "glmesh.h" @@ -21,6 +23,7 @@ Canvas::~Canvas() void Canvas::load_mesh(Mesh* m) { mesh = new GLMesh(m); + /* center = QVector3D(m->xmin() + m->xmax(), m->ymin() + m->ymax(), m->zmin() + m->zmax()) / 2; @@ -28,7 +31,7 @@ void Canvas::load_mesh(Mesh* m) pow(m->xmax() - m->xmin(), 2) + pow(m->ymax() - m->ymin(), 2) + pow(m->zmax() - m->zmin(), 2)); - + */ update(); delete m; diff --git a/src/fstl.pro b/src/fstl.pro index a5a0f0f..2033575 100644 --- a/src/fstl.pro +++ b/src/fstl.pro @@ -22,7 +22,5 @@ HEADERS += \ CONFIG += c++11 -INCLUDEPATH += /usr/local/include/eigen3 - RESOURCES += \ resources.qrc diff --git a/src/mesh.cpp b/src/mesh.cpp index d7266e7..3a97120 100644 --- a/src/mesh.cpp +++ b/src/mesh.cpp @@ -1,11 +1,29 @@ #include #include +#include #include #include "mesh.h" -Mesh::Mesh(const Eigen::Matrix3Xf& v, const Eigen::Matrix3Xi& i) +struct Vec3 +{ + GLfloat x, y, z; + bool operator!=(const Vec3& rhs) const + { + return x != rhs.x || y != rhs.y || z != rhs.z; + } + bool operator<(const Vec3& rhs) const + { + if (x != rhs.x) return x < rhs.x; + else if (y != rhs.y) return y < rhs.y; + else if (z != rhs.z) return z < rhs.z; + else return false; + } +}; + + +Mesh::Mesh(std::vector v, std::vector i) : vertices(v), indices(i) { // Nothing to do here @@ -20,67 +38,65 @@ Mesh* Mesh::load_stl(const QString& filename) data.setByteOrder(QDataStream::LittleEndian); data.setFloatingPointPrecision(QDataStream::SinglePrecision); + // Skip .stl file header data.skipRawData(80); + + // Load the triangle count from the .stl file uint32_t tri_count; data >> tri_count; - // Extract vertices into a vector of Vector4d objects - std::vector verts(tri_count*3); - for (unsigned i=0; i < tri_count; ++i) + // Extract vertices into an array of xyz, unsigned pairs + QVector> verts(tri_count*3); + + // Store vertices in the array, processing one triangle at a time. + for (auto v=verts.begin(); v != verts.end(); v += 3) { + // Skip face's normal vector data.skipRawData(3*sizeof(float)); - for (int j=0; j < 3; ++j) - { - float x, y, z; - data >> x >> y >> z; - verts[3*i + j] << x, y, z, 3*i + j; - } + + // Load vertex data from .stl file into vertices + data >> v[0].first.x >> v[0].first.y >> v[0].first.z; + data >> v[1].first.x >> v[1].first.y >> v[1].first.z; + data >> v[2].first.x >> v[2].first.y >> v[2].first.z; + + // Skip face attribute data.skipRawData(sizeof(uint16_t)); } - // Sort the set of vertices (to deduplicate) - std::sort(verts.begin(), verts.end(), - [](const Eigen::Vector4d& lhs, const Eigen::Vector4d& rhs) - { - if (lhs[0] != rhs[0]) return lhs[0] < rhs[0]; - else if (lhs[1] != rhs[1]) return lhs[1] < rhs[1]; - else if (lhs[2] != rhs[2]) return lhs[2] < rhs[2]; - else return false; - } - ); + // Save indicies as the second element in the array + // (so that we can reconstruct triangle order after sorting) + for (size_t i=0; i < tri_count*3; ++i) + { + verts[i].second = i; + } - // This list will store unique vertices - std::list unique; + // Sort the set of vertices (to deduplicate) + std::sort(verts.begin(), verts.end()); - // This vector will store triangles as rows of indices - Eigen::Matrix3Xi indices; - indices.resize(Eigen::NoChange, tri_count); + // This vector will store triangles as sets of 3 indices + std::vector indices(tri_count*3); // Go through the sorted vertex list, deduplicating and creating // an indexed geometry representation for the triangles. + // Unique vertices are moved so that they occupy the first vertex_count + // positions in the verts array. + size_t vertex_count = 0; for (auto v : verts) { - if (!unique.size() || v[0] != unique.back()[0] || - v[1] != unique.back()[1] || - v[2] != unique.back()[2]) + if (!vertex_count || v.first != verts[vertex_count-1].first) { - // Switch to a float vector and save in the list. - Eigen::Vector3f v_; - v_ << v[0], v[1], v[2]; - unique.push_back(v_); + verts[vertex_count++] = v; } - indices(int(v[3]) % 3, int(v[3]) / 3) = unique.size() - 1; + indices[v.second] = vertex_count - 1; } - // Finally, pack unique vertices into a matrix. - Eigen::Matrix3Xf unique_verts; - unique_verts.resize(Eigen::NoChange, unique.size()); + // Finally, pack unique vertices into a flat array. + std::vector unique_verts(vertex_count*3); + for (size_t i=0; i < vertex_count; ++i) { - auto v = unique.begin(); - for (unsigned i=0; i < unique.size(); ++i) - { - unique_verts.col(i) = *(v++); - } + unique_verts[3*i] = verts[i].first.x; + unique_verts[3*i + 1] = verts[i].first.y; + unique_verts[3*i + 2] = verts[i].first.z; } return new Mesh(unique_verts, indices); diff --git a/src/mesh.h b/src/mesh.h index 064d276..f8da3e3 100644 --- a/src/mesh.h +++ b/src/mesh.h @@ -2,25 +2,26 @@ #define MESH_H #include +#include -#include +#include class Mesh { public: - Mesh(const Eigen::Matrix3Xf &vertices, const Eigen::Matrix3Xi &indices); + Mesh(std::vector vertices, std::vector indices); static Mesh* load_stl(const QString& filename); - +/* float xmin() const { return vertices.row(0).minCoeff(); } float xmax() const { return vertices.row(0).maxCoeff(); } float ymin() const { return vertices.row(1).minCoeff(); } float ymax() const { return vertices.row(1).maxCoeff(); } float zmin() const { return vertices.row(2).minCoeff(); } float zmax() const { return vertices.row(2).maxCoeff(); } - +*/ private: - const Eigen::Matrix3Xf vertices; - const Eigen::Matrix3Xi indices; + std::vector vertices; + std::vector indices; friend class GLMesh; };