diff options
| author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-11-18 11:21:41 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-11-18 11:22:45 +0200 |
| commit | 79bcab5c2a2be73d20364e7ccd718856659510cc (patch) | |
| tree | d54bde658b37021d254167cc1de96d43c810f9f6 /src/datavisualization/utils/vertexindexer_p.h | |
| parent | 4a8a1e06f12a8b9d16696a4c559c325f771cad0c (diff) | |
| parent | 11ed44c13c227c73d9b2ec416aed54b00bda2a0a (diff) | |
Merge branch 'develop'
Change-Id: I6f95e28fa94127ddf2380794323fa5ef0ddfe2c4
Diffstat (limited to 'src/datavisualization/utils/vertexindexer_p.h')
| -rw-r--r-- | src/datavisualization/utils/vertexindexer_p.h | 26 |
1 files changed, 3 insertions, 23 deletions
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 |