Support larger custom meshes.

Vertex index was limited to unsigned short, meaning even slightly
complex meshes couldn't be used. Changed to unsigned int.

Also removed unused vertex indexer methods.

Change-Id: Iebe62bd3a501dc79ee2857cca28ac0d05bd4a55e
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

9 files changed, 14 insertions, 117 deletions

diff --git a/src/datavisualization/utils/abstractobjecthelper.cpp b/src/datavisualization/utils/abstractobjecthelper.cpp
index c3d0e7bb..245b77d1 100644
--- a/src/datavisualization/utils/abstractobjecthelper.cpp
+++ b/src/datavisualization/utils/abstractobjecthelper.cpp
@@ -74,9 +74,4 @@ GLuint AbstractObjectHelper::indexCount()
     return m_indexCount;
 }
 
-GLuint AbstractObjectHelper::indicesType()
-{
-    return m_indicesType;
-}
-
 QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/utils/abstractobjecthelper_p.h b/src/datavisualization/utils/abstractobjecthelper_p.h
index bca765d7..b141a132 100644
--- a/src/datavisualization/utils/abstractobjecthelper_p.h
+++ b/src/datavisualization/utils/abstractobjecthelper_p.h
@@ -45,7 +45,6 @@ public:
     virtual GLuint uvBuf();
     GLuint elementBuf();
     GLuint indexCount();
-    GLuint indicesType();
 
 public:
     GLuint m_vertexbuffer;
@@ -55,8 +54,6 @@ public:
 
     GLuint m_indexCount;
     GLboolean m_meshDataLoaded;
-
-    GLuint m_indicesType;
 };
 
 QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/utils/objecthelper.cpp b/src/datavisualization/utils/objecthelper.cpp
index 0237708f..6441aae2 100644
--- a/src/datavisualization/utils/objecthelper.cpp
+++ b/src/datavisualization/utils/objecthelper.cpp
@@ -25,7 +25,6 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 ObjectHelper::ObjectHelper(const QString &objectFile)
     : m_objectFile(objectFile)
 {
-    m_indicesType = GL_UNSIGNED_SHORT;
     load();
 }
 
@@ -158,7 +157,7 @@ void ObjectHelper::load()
 
     glGenBuffers(1, &m_elementbuffer);
     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_elementbuffer);
-    glBufferData(GL_ELEMENT_ARRAY_BUFFER, m_indices.size() * sizeof(unsigned short),
+    glBufferData(GL_ELEMENT_ARRAY_BUFFER, m_indices.size() * sizeof(GLuint),
                  &m_indices.at(0), GL_STATIC_DRAW);
 
     glBindBuffer(GL_ARRAY_BUFFER, 0);
diff --git a/src/datavisualization/utils/objecthelper_p.h b/src/datavisualization/utils/objecthelper_p.h
index 92de3838..7e13e2a3 100644
--- a/src/datavisualization/utils/objecthelper_p.h
+++ b/src/datavisualization/utils/objecthelper_p.h
@@ -48,7 +48,7 @@ public:
     static void releaseObjectHelper(const Abstract3DRenderer *cacheId, ObjectHelper *&obj);
     inline const QString &objectFile() { return m_objectFile; }
 
-    inline const QVector<unsigned short> &indices() const { return m_indices; }
+    inline const QVector<GLuint> &indices() const { return m_indices; }
     inline const QVector<QVector3D> &indexedvertices() const { return m_indexedVertices; }
     inline const QVector<QVector2D> &indexedUVs() const { return m_indexedUVs; }
     inline const QVector<QVector3D> &indexedNormals() const { return m_indexedNormals; }
@@ -59,7 +59,7 @@ private:
     void load();
 
     QString m_objectFile;
-    QVector<unsigned short> m_indices;
+    QVector<GLuint> m_indices;
     QVector<QVector3D> m_indexedVertices;
     QVector<QVector2D> m_indexedUVs;
     QVector<QVector3D> m_indexedNormals;
diff --git a/src/datavisualization/utils/scatterobjectbufferhelper.cpp b/src/datavisualization/utils/scatterobjectbufferhelper.cpp
index faa3c164..99b17a96 100644
--- a/src/datavisualization/utils/scatterobjectbufferhelper.cpp
+++ b/src/datavisualization/utils/scatterobjectbufferhelper.cpp
@@ -29,7 +29,6 @@ const GLfloat itemScaler = 3.0f;
 ScatterObjectBufferHelper::ScatterObjectBufferHelper()
     : m_scaleY(0.0f)
 {
-    m_indicesType = GL_UNSIGNED_INT;
 }
 
 ScatterObjectBufferHelper::~ScatterObjectBufferHelper()
@@ -64,7 +63,7 @@ void ScatterObjectBufferHelper::fullLoad(ScatterSeriesRenderCache *cache, qreal
     }
 
     // Index vertices
-    const QVector<unsigned short> indices = dotObj->indices();
+    const QVector<GLuint> indices = dotObj->indices();
     const QVector<QVector3D> indexed_vertices = dotObj->indexedvertices();
     const QVector<QVector2D> indexed_uvs = dotObj->indexedUVs();
     const QVector<QVector3D> indexed_normals = dotObj->indexedNormals();
diff --git a/src/datavisualization/utils/scatterpointbufferhelper.cpp b/src/datavisualization/utils/scatterpointbufferhelper.cpp
index 08793fef..139d3fc9 100644
--- a/src/datavisualization/utils/scatterpointbufferhelper.cpp
+++ b/src/datavisualization/utils/scatterpointbufferhelper.cpp
@@ -27,7 +27,6 @@ ScatterPointBufferHelper::ScatterPointBufferHelper()
     : m_pointbuffer(0),
       m_oldRemoveIndex(-1)
 {
-    m_indicesType = GL_UNSIGNED_INT;
 }
 
 ScatterPointBufferHelper::~ScatterPointBufferHelper()
diff --git a/src/datavisualization/utils/surfaceobject.cpp b/src/datavisualization/utils/surfaceobject.cpp
index 34f50bf1..6f9ace19 100644
--- a/src/datavisualization/utils/surfaceobject.cpp
+++ b/src/datavisualization/utils/surfaceobject.cpp
@@ -36,7 +36,6 @@ SurfaceObject::SurfaceObject(Surface3DRenderer *renderer)
       m_dataDimension(0),
       m_oldDataDimension(-1)
 {
-    m_indicesType = GL_UNSIGNED_INT;
     glGenBuffers(1, &m_vertexbuffer);
     glGenBuffers(1, &m_normalbuffer);
     glGenBuffers(1, &m_uvbuffer);
diff --git a/src/datavisualization/utils/vertexindexer.cpp b/src/datavisualization/utils/vertexindexer.cpp
index c34203da..90528d05 100644
--- a/src/datavisualization/utils/vertexindexer.cpp
+++ b/src/datavisualization/utils/vertexindexer.cpp
@@ -24,45 +24,11 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 int unique_vertices = 0;
 
-// Returns true if v1 can be considered equal to v2
-bool VertexIndexer::is_near(float v1, float v2)
-{
-    return qAbs(v1 - v2) < 0.01f;
-}
-
-// Searches through all already exported vertices for a similar one.
-// Similar = same position + same UVs + same normal
-bool VertexIndexer::getSimilarVertexIndex(const QVector3D &in_vertex,
-                                          const QVector2D &in_uv,
-                                          const QVector3D &in_normal,
-                                          QVector<QVector3D> &out_vertices,
-                                          QVector<QVector2D> &out_uvs,
-                                          QVector<QVector3D> &out_normals,
-                                          unsigned short &result)
-{
-    // Linear search
-    for (int i = 0; i < out_vertices.size(); i++) {
-        if (is_near(in_vertex.x() , out_vertices[i].x())
-                && is_near(in_vertex.y() , out_vertices[i].y())
-                && is_near(in_vertex.z() , out_vertices[i].z())
-                && is_near(in_uv.x()     , out_uvs     [i].x())
-                && is_near(in_uv.y()     , out_uvs     [i].y())
-                && is_near(in_normal.x() , out_normals [i].x())
-                && is_near(in_normal.y() , out_normals [i].y())
-                && is_near(in_normal.z() , out_normals [i].z())) {
-            result = i;
-            return true;
-        }
-    }
-    // No other vertex could be used instead
-    return false;
-}
-
 bool VertexIndexer::getSimilarVertexIndex_fast(const PackedVertex &packed,
-                                               QMap<PackedVertex, unsigned short> &VertexToOutIndex,
-                                               unsigned short &result)
+                                               QMap<PackedVertex, GLuint> &VertexToOutIndex,
+                                               GLuint &result)
 {
-    QMap<PackedVertex, unsigned short>::iterator it = VertexToOutIndex.find(packed);
+    QMap<PackedVertex, GLuint>::iterator it = VertexToOutIndex.find(packed);
     if (it == VertexToOutIndex.end()) {
         return false;
     } else {
@@ -74,20 +40,20 @@ bool VertexIndexer::getSimilarVertexIndex_fast(const PackedVertex &packed,
 void VertexIndexer::indexVBO(const QVector<QVector3D> &in_vertices,
                              const QVector<QVector2D> &in_uvs,
                              const QVector<QVector3D> &in_normals,
-                             QVector<unsigned short> &out_indices,
+                             QVector<GLuint> &out_indices,
                              QVector<QVector3D> &out_vertices,
                              QVector<QVector2D> &out_uvs,
                              QVector<QVector3D> &out_normals)
 {
     unique_vertices = 0;
-    QMap<PackedVertex, unsigned short> VertexToOutIndex;
+    QMap<PackedVertex, GLuint> VertexToOutIndex;
 
     // For each input vertex
     for (int i = 0; i < in_vertices.size(); i++) {
         PackedVertex packed = {in_vertices[i], in_uvs[i], in_normals[i]};
 
         // Try to find a similar vertex in out_XXXX
-        unsigned short index;
+        GLuint index;
         bool found = getSimilarVertexIndex_fast(packed, VertexToOutIndex, index);
 
         if (found) {
@@ -97,48 +63,11 @@ void VertexIndexer::indexVBO(const QVector<QVector3D> &in_vertices,
             out_vertices.append(in_vertices[i]);
             out_uvs.append(in_uvs[i]);
             out_normals.append(in_normals[i]);
-            unsigned short newindex = (unsigned short)out_vertices.size() - 1;
+            GLuint newindex = (GLuint)out_vertices.size() - 1;
             out_indices.append(newindex);
             VertexToOutIndex[packed] = newindex;
         }
     }
 }
 
-void VertexIndexer::indexVBO_TBN(const QVector<QVector3D> &in_vertices,
-                                 const QVector<QVector2D> &in_uvs,
-                                 const QVector<QVector3D> &in_normals,
-                                 const QVector<QVector3D> &in_tangents,
-                                 const QVector<QVector3D> &in_bitangents,
-                                 QVector<unsigned short> &out_indices,
-                                 QVector<QVector3D> &out_vertices,
-                                 QVector<QVector2D> &out_uvs,
-                                 QVector<QVector3D> &out_normals,
-                                 QVector<QVector3D> &out_tangents,
-                                 QVector<QVector3D> &out_bitangents)
-{
-    unique_vertices = 0;
-    // For each input vertex
-    for (int i = 0; i < in_vertices.size(); i++) {
-        // Try to find a similar vertex in out_XXXX
-        unsigned short index;
-        bool found = getSimilarVertexIndex(in_vertices[i], in_uvs[i], in_normals[i],
-                                           out_vertices, out_uvs, out_normals, index);
-
-        if (found) {
-            out_indices.append(index);
-            // Average the tangents and the bitangents
-            out_tangents[index] += in_tangents[i];
-            out_bitangents[index] += in_bitangents[i];
-        } else {
-            unique_vertices++;
-            out_vertices.append(in_vertices[i]);
-            out_uvs.append(in_uvs[i]);
-            out_normals.append(in_normals[i]);
-            out_tangents.append(in_tangents[i]);
-            out_bitangents.append(in_bitangents[i]);
-            out_indices.append((unsigned short)out_vertices.size() - 1);
-        }
-    }
-}
-
 QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualization/utils/vertexindexer_p.h b/src/datavisualization/utils/vertexindexer_p.h
index 2e878fbe..e2e7a7da 100644
--- a/src/datavisualization/utils/vertexindexer_p.h
+++ b/src/datavisualization/utils/vertexindexer_p.h
@@ -51,35 +51,15 @@ public:
     static void indexVBO(const QVector<QVector3D> &in_vertices,
                          const QVector<QVector2D> &in_uvs,
                          const QVector<QVector3D> &in_normals,
-                         QVector<unsigned short> &out_indices,
+                         QVector<GLuint> &out_indices,
                          QVector<QVector3D> &out_vertices,
                          QVector<QVector2D> &out_uvs,
                          QVector<QVector3D> &out_normals);
 
-    static void indexVBO_TBN(const QVector<QVector3D> &in_vertices,
-                             const QVector<QVector2D> &in_uvs,
-                             const QVector<QVector3D> &in_normals,
-                             const QVector<QVector3D> &in_tangents,
-                             const QVector<QVector3D> &in_bitangents,
-                             QVector<unsigned short> &out_indices,
-                             QVector<QVector3D> &out_vertices,
-                             QVector<QVector2D> &out_uvs,
-                             QVector<QVector3D> &out_normals,
-                             QVector<QVector3D> &out_tangents,
-                             QVector<QVector3D> &out_bitangents);
-
 private:
-    static bool is_near(float v1, float v2);
-    static bool getSimilarVertexIndex(const QVector3D &in_vertex,
-                                      const QVector2D &in_uv,
-                                      const QVector3D &in_normal,
-                                      QVector<QVector3D> &out_vertices,
-                                      QVector<QVector2D> &out_uvs,
-                                      QVector<QVector3D> &out_normals,
-                                      unsigned short &result);
     static bool getSimilarVertexIndex_fast(const PackedVertex &packed,
-                                           QMap<PackedVertex, unsigned short> &VertexToOutIndex,
-                                           unsigned short &result);
+                                           QMap<PackedVertex, GLuint> &VertexToOutIndex,
+                                           GLuint &result);
 };
 
 QT_END_NAMESPACE_DATAVISUALIZATION