LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-17 11:00:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Renamed the internal 'Matrix' class to 'Matrix4'.

Browse Source
This commit is contained in:
Alex Szpakowski
2015-06-26 19:34:05 -03:00
parent c3612acfde
commit d8fd1413d6
19 changed files with 79 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Shader.cpp
+4 -4
View File
@@ -51,7 +51,7 @@ namespace
~TemporaryAttacher()
{
if (prevShader != nullptr)
prevShader->attach(true);
prevShader->attach();
else
curShader->detach();
}
@@ -702,8 +702,8 @@ void Shader::checkSetBuiltinUniforms()
{
checkSetPointSize(gl.getPointSize());
const Matrix &curxform = gl.matrices.transform.back();
const Matrix &curproj = gl.matrices.projection.back();
const Matrix4 &curxform = gl.matrices.transform.back();
const Matrix4 &curproj = gl.matrices.projection.back();
TemporaryAttacher attacher(this);
@@ -735,7 +735,7 @@ void Shader::checkSetBuiltinUniforms()
GLint location = builtinUniforms[BUILTIN_TRANSFORM_PROJECTION_MATRIX];
if (location >= 0)
{
Matrix tp_matrix(curproj * curxform);
Matrix4 tp_matrix(curproj * curxform);
glUniformMatrix4fv(location, 1, GL_FALSE, tp_matrix.getElements());
}
}