diff options
| author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-11-18 09:49:02 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-11-18 10:59:39 +0200 |
| commit | 11ed44c13c227c73d9b2ec416aed54b00bda2a0a (patch) | |
| tree | d54bde658b37021d254167cc1de96d43c810f9f6 /src/datavisualization/utils/scatterobjectbufferhelper.cpp | |
| parent | d22799efdb445a120c636bfe27ab55c11dc0f43b (diff) | |
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>
Diffstat (limited to 'src/datavisualization/utils/scatterobjectbufferhelper.cpp')
| -rw-r--r-- | src/datavisualization/utils/scatterobjectbufferhelper.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
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(); |