1 files changed, 39 insertions, 20 deletions

diff --git a/src/libjin/Graphics/Shapes.cpp b/src/libjin/Graphics/Shapes.cpp
index 2cb33a2..cf47e00 100644
--- a/src/libjin/Graphics/Shapes.cpp
+++ b/src/libjin/Graphics/Shapes.cpp
@@ -1,6 +1,7 @@
-#include "../modules.h"
+#include "../jin_configuration.h"
 #if LIBJIN_MODULES_RENDER
 
+#include "Shader.h"
 #include "Shapes.h" 
 #include "../math/matrix.h"
 #include "../math/constant.h"
@@ -11,21 +12,30 @@ namespace jin
 namespace graphics
 {
 
+	using namespace math;
+
     void point(int x, int y)
     {
-        float vers[] = { x + 0.5f , y + 0.5f };
-        glEnableClientState(GL_VERTEX_ARRAY);
-        glVertexPointer(2, GL_FLOAT, 0, (GLvoid*)vers);
+        float verts[] = { x + 0.5f , y + 0.5f };
+
+		Shader* shader = Shader::getCurrentJSL();
+		shader->bindVertexPointer(2, GL_FLOAT, 0, verts);
+        gl.ModelMatrix.setIdentity();
+		shader->sendMatrix4(Shader::MODEL_MATRIX, &gl.ModelMatrix);
+		shader->sendMatrix4(Shader::PROJECTION_MATRIX, &gl.ProjectionMatrix);
+
         glDrawArrays(GL_POINTS, 0, 1);
-        glDisableClientState(GL_VERTEX_ARRAY);
     }
 
     void points(int n, GLshort* p)
     {
-        glEnableClientState(GL_VERTEX_ARRAY);
-        glVertexPointer(2, GL_SHORT, 0, (GLvoid*)p);
-        glDrawArrays(GL_POINTS, 0, n);
-        glDisableClientState(GL_VERTEX_ARRAY);
+		Shader* shader = Shader::getCurrentJSL();
+		shader->bindVertexPointer(2, GL_SHORT, 0, p);
+        gl.ModelMatrix.setIdentity();
+		shader->sendMatrix4(Shader::MODEL_MATRIX, &gl.ModelMatrix);
+		shader->sendMatrix4(Shader::PROJECTION_MATRIX, &gl.ProjectionMatrix);
+        
+		glDrawArrays(GL_POINTS, 0, n);
     }
 
     void line(int x1, int y1, int x2, int y2)
@@ -34,11 +44,14 @@ namespace graphics
             x1, y1,
             x2, y2
         };
-
-        glEnableClientState(GL_VERTEX_ARRAY);
-        glVertexPointer(2, GL_FLOAT, 0, (const GLvoid*)verts);
-        glDrawArrays(GL_LINES, 0, 2);
-        glDisableClientState(GL_VERTEX_ARRAY);
+		
+		Shader* shader = Shader::getCurrentJSL();
+		shader->bindVertexPointer(2, GL_FLOAT, 0, verts);
+        gl.ModelMatrix.setIdentity();
+		shader->sendMatrix4(Shader::MODEL_MATRIX, &gl.ModelMatrix);
+		shader->sendMatrix4(Shader::PROJECTION_MATRIX, &gl.ProjectionMatrix);
+        
+		glDrawArrays(GL_LINES, 0, 2);
     }
 
     void circle(RenderMode mode, int x, int y, int r)
@@ -80,10 +93,13 @@ namespace graphics
 
     void polygon_line(float* p, int count)
     {
-        glEnableClientState(GL_VERTEX_ARRAY);
-        glVertexPointer(2, GL_FLOAT, 0, (const GLvoid*)p);
+		Shader* shader = Shader::getCurrentJSL();
+        gl.ModelMatrix.setIdentity();
+		shader->sendMatrix4(Shader::MODEL_MATRIX, &gl.ModelMatrix);
+		shader->sendMatrix4(Shader::PROJECTION_MATRIX, &gl.ProjectionMatrix);
+		shader->bindVertexPointer(2, GL_FLOAT, 0, p);
+
         glDrawArrays(GL_LINE_LOOP, 0, count);
-        glDisableClientState(GL_VERTEX_ARRAY);
     }
 
     void polygon(RenderMode mode, float* p, int count)
@@ -94,10 +110,13 @@ namespace graphics
         }
         else if (mode == FILL)
         {
-            glEnableClientState(GL_VERTEX_ARRAY);
-            glVertexPointer(2, GL_FLOAT, 0, (const GLvoid*)p);
+			Shader* shader = Shader::getCurrentJSL();
+            gl.ModelMatrix.setIdentity();
+			shader->sendMatrix4(Shader::MODEL_MATRIX, &gl.ModelMatrix);
+			shader->sendMatrix4(Shader::PROJECTION_MATRIX, &gl.ProjectionMatrix);
+			shader->bindVertexPointer(2, GL_FLOAT, 0, p);
+
             glDrawArrays(GL_POLYGON, 0, count);
-            glDisableClientState(GL_VERTEX_ARRAY);
         }
     }