diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-04-10 13:30:02 +0300 |
|---|---|---|
| committer | Mika Salmela <mika.salmela@digia.com> | 2013-04-10 18:21:01 +0300 |
| commit | 268f96670c05719d14775aeb3c80b58b9421c990 (patch) | |
| tree | cdfb42975f928e88653c47c8bce4d35e65991ba0 /src/datavis3d/utils/objecthelper.cpp | |
| parent | d54dad5da5aca15230889dd801a591b35a0afcb0 (diff) | |
Preliminary texture support added
Change-Id: Ic52800160b10bbc9d4e7df7159d8891373623fbf
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavis3d/utils/objecthelper.cpp')
| -rw-r--r-- | src/datavis3d/utils/objecthelper.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/datavis3d/utils/objecthelper.cpp b/src/datavis3d/utils/objecthelper.cpp index e854836a..b6193bfe 100644 --- a/src/datavis3d/utils/objecthelper.cpp +++ b/src/datavis3d/utils/objecthelper.cpp @@ -113,15 +113,15 @@ void ObjectHelper::load() , &indexed_normals.at(0) , GL_STATIC_DRAW); - //m_caller->glGenBuffers(1, &m_uvbuffer); - //m_caller->glBindBuffer(GL_ARRAY_BUFFER, m_uvbuffer); - //m_caller->glBufferData(GL_ARRAY_BUFFER, indexed_uvs.size() * sizeof(QVector2D), &indexed_uvs.at(0) - // , GL_STATIC_DRAW); + m_caller->glGenBuffers(1, &m_uvbuffer); + m_caller->glBindBuffer(GL_ARRAY_BUFFER, m_uvbuffer); + m_caller->glBufferData(GL_ARRAY_BUFFER, indexed_uvs.size() * sizeof(QVector2D) + , &indexed_uvs.at(0), GL_STATIC_DRAW); m_caller->glGenBuffers(1, &m_elementbuffer); m_caller->glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_elementbuffer); - m_caller->glBufferData(GL_ELEMENT_ARRAY_BUFFER, indices.size() * sizeof(unsigned short), &indices.at(0) - , GL_STATIC_DRAW); + m_caller->glBufferData(GL_ELEMENT_ARRAY_BUFFER, indices.size() * sizeof(unsigned short) + , &indices.at(0), GL_STATIC_DRAW); m_caller->glBindBuffer(GL_ARRAY_BUFFER, 0); m_caller->glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); |