diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-05-15 11:56:27 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-05-15 14:01:11 +0200 |
| commit | 859cbb9092536a44724a4c36a469e329bacb53ca (patch) | |
| tree | 8dd23f14222fc570e625251e50ecadebf8eb239f /chart2/source/view | |
| parent | dfefcc2b89718971c0d63b42d796c5e20394be05 (diff) | |
no reason that this is a member variable
Change-Id: I125c85418bc19cc6bcf2d106ebd22f94d9ecd390
Diffstat (limited to 'chart2/source/view')
| -rw-r--r-- | chart2/source/view/inc/GL3DRenderer.hxx | 2 | ||||
| -rw-r--r-- | chart2/source/view/main/GL3DRenderer.cxx | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/chart2/source/view/inc/GL3DRenderer.hxx b/chart2/source/view/inc/GL3DRenderer.hxx index 2154f7d9809a..f2c57321f80a 100644 --- a/chart2/source/view/inc/GL3DRenderer.hxx +++ b/chart2/source/view/inc/GL3DRenderer.hxx @@ -283,8 +283,6 @@ private: glm::mat4 m_View; // Model matrix : an identity matrix (model will be at the origin glm::mat4 m_Model; - // Our ModelViewProjection : multiplication of our 3 matrices - glm::mat4 m_MVP; sal_Int32 m_iWidth; diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx index 029383fae394..fd6abf249fc3 100644 --- a/chart2/source/view/main/GL3DRenderer.cxx +++ b/chart2/source/view/main/GL3DRenderer.cxx @@ -1316,7 +1316,7 @@ void OpenGL3DRenderer::RenderTextShape() PosVecf3 angle = {0.0f, 0.0f, 0.0f}; PosVecf3 scale = {1.0, 1.0, 1.0f}; MoveModelf(trans, angle, scale); - m_MVP = m_3DProjection * m_3DView * m_Model; + glm::mat4 aMVP = m_3DProjection * m_3DView * m_Model; glBindBuffer(GL_ARRAY_BUFFER, m_VertexBuffer); CHECK_GL_ERROR(); glBufferData(GL_ARRAY_BUFFER, sizeof(textInfo.vertex), textInfo.vertex, GL_STATIC_DRAW); @@ -1324,7 +1324,7 @@ void OpenGL3DRenderer::RenderTextShape() glUseProgram(maResources.m_TextProID); CHECK_GL_ERROR(); - glUniformMatrix4fv(maResources.m_TextMatrixID, 1, GL_FALSE, &m_MVP[0][0]); + glUniformMatrix4fv(maResources.m_TextMatrixID, 1, GL_FALSE, &aMVP[0][0]); // 1rst attribute buffer : vertices glEnableVertexAttribArray(maResources.m_TextVertexID); glBindBuffer(GL_ARRAY_BUFFER, m_VertexBuffer); |