diff options
Diffstat (limited to 'src/libjin/Graphics/je_shapes.cpp')
| -rw-r--r-- | src/libjin/Graphics/je_shapes.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/libjin/Graphics/je_shapes.cpp b/src/libjin/Graphics/je_shapes.cpp index 486c506..2a9fd25 100644 --- a/src/libjin/Graphics/je_shapes.cpp +++ b/src/libjin/Graphics/je_shapes.cpp @@ -24,8 +24,8 @@ namespace JinEngine Shader* shader = Shader::getCurrentShader(); shader->setVertexPointer(2, GL_FLOAT, 0, verts); - gl.ModelMatrix.setIdentity(); - shader->sendMatrix4(SHADER_MODEL_MATRIX, &(gl.getMatrix() * gl.ModelMatrix)); + static Matrix modelMatrix = gl.getModelMatrix(); + shader->sendMatrix4(SHADER_MODEL_MATRIX, &modelMatrix); shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.ProjectionMatrix); glDrawArrays(GL_POINTS, 0, 1); @@ -35,8 +35,8 @@ namespace JinEngine { Shader* shader = Shader::getCurrentShader(); shader->setVertexPointer(2, GL_SHORT, 0, p); - gl.ModelMatrix.setIdentity(); - shader->sendMatrix4(SHADER_MODEL_MATRIX, &(gl.getMatrix() * gl.ModelMatrix)); + static Matrix modelMatrix = gl.getModelMatrix(); + shader->sendMatrix4(SHADER_MODEL_MATRIX, &modelMatrix); shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.ProjectionMatrix); glDrawArrays(GL_POINTS, 0, n); @@ -51,8 +51,8 @@ namespace JinEngine Shader* shader = Shader::getCurrentShader(); shader->setVertexPointer(2, GL_FLOAT, 0, verts); - gl.ModelMatrix.setIdentity(); - shader->sendMatrix4(SHADER_MODEL_MATRIX, &(gl.getMatrix() * gl.ModelMatrix)); + static Matrix modelMatrix = gl.getModelMatrix(); + shader->sendMatrix4(SHADER_MODEL_MATRIX, &modelMatrix); shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.ProjectionMatrix); glDrawArrays(GL_LINES, 0, 2); @@ -98,8 +98,8 @@ namespace JinEngine void polygon_line(float* p, int count) { Shader* shader = Shader::getCurrentShader(); - gl.ModelMatrix.setIdentity(); - shader->sendMatrix4(SHADER_MODEL_MATRIX, &(gl.getMatrix() * gl.ModelMatrix)); + static Matrix modelMatrix = gl.getModelMatrix(); + shader->sendMatrix4(SHADER_MODEL_MATRIX, &modelMatrix); shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.ProjectionMatrix); shader->setVertexPointer(2, GL_FLOAT, 0, p); @@ -115,8 +115,8 @@ namespace JinEngine else if (mode == FILL) { Shader* shader = Shader::getCurrentShader(); - gl.ModelMatrix.setIdentity(); - shader->sendMatrix4(SHADER_MODEL_MATRIX, &(gl.getMatrix() * gl.ModelMatrix)); + static Matrix modelMatrix = gl.getModelMatrix(); + shader->sendMatrix4(SHADER_MODEL_MATRIX, &modelMatrix); shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.ProjectionMatrix); shader->setVertexPointer(2, GL_FLOAT, 0, p); |