summaryrefslogtreecommitdiff
path: root/vcl/opengl/program.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-04-20 10:34:01 +0200
committerNoel Grandin <noel@peralex.com>2016-04-21 08:32:47 +0200
commit5abc669599001bf888b97c4d3c2715e1fb7523b9 (patch)
tree2407c6fc040a795e6ffc69de02ba940285c04c7f /vcl/opengl/program.cxx
parent5bb308a9ad16f6002486a60e4a753693818580b6 (diff)
new plugin stylepolice
check for local variables which follow our member field naming convention, which is highly confusing Change-Id: Idacedf7145d09843e96a584237b385f7662eea10
Diffstat (limited to 'vcl/opengl/program.cxx')
-rw-r--r--vcl/opengl/program.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/opengl/program.cxx b/vcl/opengl/program.cxx
index 340b10f6bb8f..c8b0583f56a2 100644
--- a/vcl/opengl/program.cxx
+++ b/vcl/opengl/program.cxx
@@ -278,8 +278,8 @@ void OpenGLProgram::SetTransform(
(float) aYRel.getX()/nTexHeight, (float) aYRel.getY()/nTexHeight, 0, 0,
0, 0, 1, 0,
(float) rNull.getX(), (float) rNull.getY(), 0, 1 };
- glm::mat4 mMatrix = glm::make_mat4( aValues );
- glUniformMatrix4fv( nUniform, 1, GL_FALSE, glm::value_ptr( mMatrix ) );
+ glm::mat4 aMatrix = glm::make_mat4( aValues );
+ glUniformMatrix4fv( nUniform, 1, GL_FALSE, glm::value_ptr( aMatrix ) );
CHECK_GL_ERROR();
}
@@ -296,12 +296,12 @@ void OpenGLProgram::ApplyMatrix(float fWidth, float fHeight, float fPixelOffset)
OString sProjectionMatrix("mvp");
GLuint nUniform = GetUniformLocation(sProjectionMatrix);
- glm::mat4 mMVP = glm::ortho(0.0f, fWidth, fHeight, 0.0f, 0.0f, 1.0f);
+ glm::mat4 aMVP = glm::ortho(0.0f, fWidth, fHeight, 0.0f, 0.0f, 1.0f);
if (fPixelOffset != 0.0f)
- mMVP = glm::translate(mMVP, glm::vec3(fPixelOffset, fPixelOffset, 0.0f));
+ aMVP = glm::translate(aMVP, glm::vec3(fPixelOffset, fPixelOffset, 0.0f));
- glUniformMatrix4fv(nUniform, 1, GL_FALSE, glm::value_ptr(mMVP));
+ glUniformMatrix4fv(nUniform, 1, GL_FALSE, glm::value_ptr(aMVP));
CHECK_GL_ERROR();
}