*misc

1 files changed, 23 insertions, 11 deletions

diff --git a/source/modules/asura-core/graphics/gl.h b/source/modules/asura-core/graphics/gl.h
index f28b983..6bb1ee0 100644
--- a/source/modules/asura-core/graphics/gl.h
+++ b/source/modules/asura-core/graphics/gl.h
@@ -8,6 +8,7 @@
 #include <asura-utils/scripting/portable.hpp>
 #include <asura-utils/math/rect.hpp>
 #include <asura-utils/math/matrix44.h>
+#include <asura-utils/math/vector4.h>
 
 #include "matrix_stack.h"
 
@@ -18,7 +19,6 @@ namespace AsuraEngine
 
 		class Profiler;
 		class Shader;
-		class GPUBuffer;
 
 		enum MatrixMode
 		{
@@ -27,7 +27,7 @@ namespace AsuraEngine
 			MATRIX_MODE_VIEW       = 2,
 		};
 
-		enum GLPrams
+		enum GLParams
 		{
 			GL_PARAM_MAX_TEXTURE_UNIT = 1,
 		};
@@ -48,7 +48,7 @@ namespace AsuraEngine
 			///
 			/// ��ó���ֵ
 			///
-			int GetParam(GLPrams param);
+			int GetParam(GLParams param);
 
 			///
 			/// ��ʼ��OpenGL�����IJ����������ڴ���OpenGL������֮�󡣴˺�����ע��OpenGL�����ĵ�ַ��
@@ -84,6 +84,9 @@ namespace AsuraEngine
 			uint GetMatrixDepth();
 			uint GetMatrixIndex();
 
+			void SetDrawColor(float r, float g, float b, float a);
+			AEMath::Vector4f& GetDrawColor();
+
 			///
 			/// ����������ʾ
 			///
@@ -100,23 +103,32 @@ namespace AsuraEngine
 			/// 
 			struct
 			{
-				Shader*       shader;     ///< ��ǰʹ�õ�shader
-				AEMath::Recti viewport;   ///< ��ǰ�����������л�HDC���߱����ڴ�С�ı���߲���ˢ��ʱ�䶯
-				MatrixStack   matrix[3];  ///< model, view, projection���� 
-				MatrixMode    matrixMode; ///< ��ǰ�����ľ���
-				uint          drawcall;   ///< ͳ��drawcall
+				Shader*          shader;     ///< ��ǰʹ�õ�shader
+				AEMath::Recti    viewport;   ///< ��ǰ�����������л�HDC���߱����ڴ�С�ı���߲���ˢ��ʱ�䶯
+				MatrixStack      matrix[3];  ///< model, view, projection���� 
+				MatrixMode       matrixMode; ///< ��ǰ�����ľ���
+				AEMath::Vector4f drawColor;  ///< ���Ƶ���ɫ
 			} state;
 
+#if ASURA_GL_PROFILE
+			struct
+			{
+				uint drawCall;      ///< ͳ��drawcall
+				uint canvasSwitch;  ///< �л�texture�Ĵ���
+				uint shaderSwitch;  ///< �л�shader�Ĵ���
+			} stats;
+#endif
+
 		private:
 
 			friend class Profiler;
 
-			LUAX_DECL_SINGLETON(OpenGL);
-
 			//----------------------------------------------------------------------------//
 
+			LUAX_DECL_SINGLETON(OpenGL);
+
 			LUAX_DECL_ENUM(MatrixMode, 1);
-			LUAX_DECL_ENUM(GLPrams, 1);
+			LUAX_DECL_ENUM(GLParams, 1);
 
 			LUAX_DECL_METHOD(_SetMatrixMode);
 			LUAX_DECL_METHOD(_GetMatrixMode);