From c78bd640228c0b6b9f7c294793c4f2f58b637c67 Mon Sep 17 00:00:00 2001 From: chai Date: Wed, 5 Dec 2018 12:34:26 +0800 Subject: =?UTF-8?q?*=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libjin/graphics/je_shapes.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/libjin/graphics/je_shapes.cpp') diff --git a/src/libjin/graphics/je_shapes.cpp b/src/libjin/graphics/je_shapes.cpp index 0b239e7..ee5e9e5 100644 --- a/src/libjin/graphics/je_shapes.cpp +++ b/src/libjin/graphics/je_shapes.cpp @@ -22,7 +22,7 @@ namespace JinEngine { float verts[] = { x + 0.5f , y + 0.5f }; - Shader* shader = Shader::getCurrentShader(); + Shader* shader = gl.getShader(); shader->setVertexPointer(2, GL_FLOAT, 0, verts); Matrix modelMatrix = gl.getModelViewMatrix(); shader->sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelMatrix); @@ -33,7 +33,7 @@ namespace JinEngine void points(int n, GLshort* p) { - Shader* shader = Shader::getCurrentShader(); + Shader* shader = gl.getShader(); shader->setVertexPointer(2, GL_SHORT, 0, p); Matrix modelMatrix = gl.getModelViewMatrix(); shader->sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelMatrix); @@ -49,7 +49,7 @@ namespace JinEngine x2 + 0.5f, y2 + 0.5f }; - Shader* shader = Shader::getCurrentShader(); + Shader* shader = gl.getShader(); shader->setVertexPointer(2, GL_FLOAT, 0, verts); Matrix modelMatrix = gl.getModelViewMatrix(); shader->sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelMatrix); @@ -97,7 +97,7 @@ namespace JinEngine void polygon_line(float* p, int count) { - Shader* shader = Shader::getCurrentShader(); + Shader* shader = gl.getShader(); Matrix modelMatrix = gl.getModelViewMatrix(); shader->sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelMatrix); shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix()); @@ -114,7 +114,7 @@ namespace JinEngine } else if (mode == FILL) { - Shader* shader = Shader::getCurrentShader(); + Shader* shader = gl.getShader(); Matrix modelMatrix = gl.getModelViewMatrix(); shader->sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelMatrix); shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix()); -- cgit v1.1-26-g67d0