*misc

1 files changed, 10 insertions, 8 deletions

diff --git a/source/modules/asura-core/graphics/gl.cpp b/source/modules/asura-core/graphics/gl.cpp
index 13c623f..08c50c3 100644
--- a/source/modules/asura-core/graphics/gl.cpp
+++ b/source/modules/asura-core/graphics/gl.cpp
@@ -5,6 +5,7 @@
 #include "gl.h"
 #include "shader.h"
 #include "matrix_stack.h"
+#include "color.h"
 
 using namespace AEMath;
 
@@ -70,13 +71,10 @@ namespace AsuraEngine
 
 		void OpenGL::SetDrawColor(float r, float g, float b, float a)
 		{
-			state.drawColor.x = r;
-			state.drawColor.y = g;
-			state.drawColor.z = b;
-			state.drawColor.w = a;
+			state.drawColor.Set(r, g, b, a);
 		}
 
-		AEMath::Vector4f& OpenGL::GetDrawColor()
+		Color& OpenGL::GetDrawColor()
 		{
 			return state.drawColor;
 		}
@@ -119,9 +117,6 @@ namespace AsuraEngine
 		void OpenGL::DrawArrays(GLenum mode, GLint first, GLsizei count)
 		{
 			glDrawArrays(mode, first, count);
-			// shader disableAttributeArray 
-			if (state.shader)
-				state.shader->DisableAttribArraies();
 #if ASURA_GL_PROFILE
 			++stats.drawCall;
 #endif
@@ -179,6 +174,13 @@ namespace AsuraEngine
 			return state.matrix[mode].GetTop();
 		}
 
+		AEMath::Matrix44 OpenGL::GetMVPMatrix()
+		{
+			return state.matrix[MATRIX_MODE_MODEL].GetTop()
+			     * state.matrix[MATRIX_MODE_MODEL].GetTop()
+			     * state.matrix[MATRIX_MODE_MODEL].GetTop();
+		}
+
 		uint OpenGL::GetMatrixDepth()
 		{
 			return state.matrix[state.matrixMode].GetCapacity();