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