Merge branch 'master' of warmcat.org:/home/git-repo/Jin

1 files changed, 15 insertions, 5 deletions

diff --git a/src/libjin/graphics/je_shapes.cpp b/src/libjin/graphics/je_shapes.cpp
index ce5c7e7..493e173 100644
--- a/src/libjin/graphics/je_shapes.cpp
+++ b/src/libjin/graphics/je_shapes.cpp
@@ -25,12 +25,14 @@ namespace JinEngine
             Matrix modelMatrix = gl.getModelViewMatrix();
 
             Shader* shader = gl.getShader();
-            shader->prepare()
+            shader->begin()
                 .uploadVertices(2, GL_FLOAT, 0, verts)
                 .sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelMatrix)
                 .sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix());
 
             gl.drawArrays(GL_POINTS, 0, 1);
+
+            shader->end();
         }
 
         void points(int n, GLshort* p)
@@ -38,12 +40,14 @@ namespace JinEngine
             Matrix modelMatrix = gl.getModelViewMatrix();
 
             Shader* shader = gl.getShader();
-            shader->prepare()
+            shader->begin()
                 .uploadVertices(2, GL_SHORT, 0, p)
                 .sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelMatrix)
                 .sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix());
         
             gl.drawArrays(GL_POINTS, 0, n);
+
+            shader->end();
         }
 
         void line(int x1, int y1, int x2, int y2)
@@ -56,12 +60,14 @@ namespace JinEngine
             Matrix modelMatrix = gl.getModelViewMatrix();
         
             Shader* shader = gl.getShader();
-            shader->prepare()
+            shader->begin()
                 .uploadVertices(2, GL_FLOAT, 0, verts)
                 .sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelMatrix)
                 .sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix());
         
             gl.drawArrays(GL_LINES, 0, 2);
+
+            shader->end();
         }
 
         void circle(RenderMode mode, int x, int y, int r)
@@ -105,12 +111,14 @@ namespace JinEngine
         {
             Shader* shader = gl.getShader();
             Matrix modelMatrix = gl.getModelViewMatrix();
-            shader->prepare()
+            shader->begin()
                 .sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelMatrix)
                 .sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix())
                 .uploadVertices(2, GL_FLOAT, 0, p);
 
             gl.drawArrays(GL_LINE_LOOP, 0, count);
+
+            shader->end();
         }
 
         void polygon(RenderMode mode, float* p, int count)
@@ -123,12 +131,14 @@ namespace JinEngine
             {
                 Shader* shader = gl.getShader();
                 Matrix modelMatrix = gl.getModelViewMatrix();
-                shader->prepare()
+                shader->begin()
                     .sendMatrix4(SHADER_MODELVIEW_MATRIX, &modelMatrix)
                     .sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.getProjectionMatrix())
                     .uploadVertices(2, GL_FLOAT, 0, p);
 
                 gl.drawArrays(GL_POLYGON, 0, count);
+
+                shader->end();
             }
         }