Optimize Edge import and rendering a bit.

2 files changed, 11 insertions, 32 deletions

diff --git a/model.cpp b/model.cpp
index f0c64c5..54cfc36 100644
--- a/model.cpp
+++ b/model.cpp
@@ -1,32 +1,11 @@
 #include "model.h"
 
 #include <QFile>
-#include <QSet>
 #include <QTextStream>
 #include <QVarLengthArray>
 
 #include <QtOpenGL>
 
-struct Edge
-{
-    Edge() : pointA(0), pointB(0) {}
-    Edge(int pa, int pb) : pointA(pa), pointB(pb) {}
-
-    int pointA;
-    int pointB;
-};
-
-uint qHash(const Edge &edge)
-{
-    return qHash(edge.pointA) ^ qHash(edge.pointB);
-}
-
-bool operator==(const Edge &a, const Edge &b)
-{
-    return (a.pointA == b.pointA && a.pointB == b.pointB)
-        || (a.pointA == b.pointB && a.pointB == b.pointA);
-}
-
 Model::Model()
 {
 }
@@ -37,9 +16,6 @@ Model::Model(const QString &filename)
     if (!file.open(QIODevice::ReadOnly))
         return;
 
-    // use a set to avoid duplicate edges
-    QSet<Edge> edges;
-
     Point3d boundsMin( 1e9, 1e9, 1e9);
     Point3d boundsMax(-1e9,-1e9,-1e9);
 
@@ -74,8 +50,14 @@ Model::Model(const QString &filename)
                     p.append(vertexIndex - 1);
             }
 
-            for (int i = 0; i < p.size(); ++i)
-                edges << Edge(p[i], p[(i + 1) % p.size()]);
+            for (int i = 0; i < p.size(); ++i) {
+                const int edgeA = p[i];
+                const int edgeB = p[(i + 1) % p.size()];
+
+                // avoid duplicate edges
+                if (edgeA < edgeB)
+                    m_edgeIndices << edgeA << edgeB;
+            }
 
             for (int i = 0; i < 3; ++i)
                 m_pointIndices << p[i];
@@ -105,9 +87,6 @@ Model::Model(const QString &filename)
 
     for (int i = 0; i < m_normals.size(); ++i)
         m_normals[i] = m_normals[i].normalize();
-
-    foreach (const Edge &edge, QVector<Edge>::fromList(edges.toList()))
-        m_edges << m_points.at(edge.pointA) << m_points.at(edge.pointB);
 }
 
 void Model::render(bool wireframe, bool normals) const
@@ -115,8 +94,8 @@ void Model::render(bool wireframe, bool normals) const
     glEnable(GL_DEPTH_TEST);
     glEnableClientState(GL_VERTEX_ARRAY);
     if (wireframe) {
-        glVertexPointer(3, GL_FLOAT, 0, m_edges.data());
-        glDrawArrays(GL_LINES, 0, m_edges.size());
+        glVertexPointer(3, GL_FLOAT, 0, (float *)m_points.data());
+        glDrawElements(GL_LINES, m_edgeIndices.size(), GL_UNSIGNED_INT, m_edgeIndices.data());
     } else {
         glEnable(GL_LIGHTING);
         glEnable(GL_LIGHT0);
diff --git a/model.h b/model.h
index bdd6cdf..fbc7aa8 100644
--- a/model.h
+++ b/model.h
@@ -18,7 +18,7 @@ public:
 private:
     QVector<Point3d> m_points;
     QVector<Point3d> m_normals;
-    QVector<Point3d> m_edges;
+    QVector<int> m_edgeIndices;
     QVector<int> m_pointIndices;
 };