1 files changed, 49 insertions, 43 deletions

diff --git a/Source/Asura.Engine/Graphics/Shader.h b/Source/Asura.Engine/Graphics/Shader.h
index 02d9f46..2cc482b 100644
--- a/Source/Asura.Engine/Graphics/Shader.h
+++ b/Source/Asura.Engine/Graphics/Shader.h
@@ -4,16 +4,18 @@
 #include <map>
 #include <string>
 
-#include "luax/luax.h"
+#include "Scripting/Luax.hpp"
+#include "Math/Vector2.h"
+#include "Math/Vector3.h"
+#include "Math/Vector4.h"
+#include "Math/Matrix44.h"
 #include "StringMap.hpp"
 #include "Object.h"
 #include "Color.h"
 #include "Manager.hpp"
 #include "Texture.h"
-#include "Math/Vector2.h"
-#include "Math/Vector3.h"
-#include "Math/Vector4.h"
 #include "GL.h"
+#include "SimClass.h"
 
 namespace AsuraEngine
 {
@@ -21,10 +23,10 @@ namespace AsuraEngine
 	{
 
 		///
-		/// һ��shader��һ���ڲ��ʼ乲���ij���Shader����������uniforms�Ͷ������ݣ�ֻ�ṩ����uniforms��use��ɫ���ķ������༭�����ÿ��
-		/// shader����ͨ��shader�����ҵ�������uniforms����������¶��framework��material���á�
+		/// һ��shader��һ���ڲ��ʼ乲���ij���Shader����������uniforms�Ͷ������ݣ�ֻ�ṩ����uniforms��use��ɫ���ķ������༭
+		/// �����ÿ��shader����ͨ��shader�����ҵ�������uniforms����������¶��framework��material���á�
 		///
-		class Shader : virtual public Object
+		class Shader final : virtual public Object, public SimClass
 		{
 		public:
 
@@ -32,9 +34,10 @@ namespace AsuraEngine
 			~Shader();
 			
 			///
-			/// �Ӵ������shader������ʱ���ȼ���Ƿ����ϴλ����uniforms location map
+			/// �Ӵ������shader������ʱ���ȼ���Ƿ����ϴλ����uniforms location map��ʹ��glAttachShader���±���������ɫ����
+			/// ��������������ɫ������
 			///
-			void Load(const std::string& vertexShader, const std::string& fragmentShader);
+			bool Load(const std::string& vertexShader, const std::string& fragmentShader);
 
 			///
 			/// ������shader����Ϊ�
@@ -44,16 +47,7 @@ namespace AsuraEngine
 			///
 			/// ������shader����Ϊ�ǻ
 			///
-			void UnUse(); 
-
-			///
-			/// һϵ������uniforms�����ķ���
-			///
-			void SetUniformFloat(const std::string& uniform, float value);
-			void SetUniformTexture(const std::string& uniform, const Texture& texture);
-			void SetUniformVector2(const std::string& uniform, const Math::Vector2& vec2);
-			void SetUniformVector3(const std::string& uniform, const Math::Vector3& vec3);
-			void SetUniformVector4(const std::string& uniform, const Math::Vector4& vec4);
+			void Unuse(); 
 
 			///
 			/// ���Ѿ�֪��uniform location������£�����ֵ��
@@ -63,46 +57,58 @@ namespace AsuraEngine
 			void SetUniformVector2(uint loc, const Math::Vector2& vec2);
 			void SetUniformVector3(uint loc, const Math::Vector3& vec3);
 			void SetUniformVector4(uint loc, const Math::Vector4& vec4);
-
-/*
-			///
-			/// ע����������������ܷ���framework����ʵ�֣������㣬����shader��editor��Ҳ���õ���
-			/// ��ջ����unifrom location���������±���shader���������µ�uniform location
-			///
-			void ClearUniformLocation();
-*/
-			///
-			/// ���program id
-			///
-			GLint GetNativeHandle();
+			void SetUniformColor(uint loc, const Color& color);
+			void SetUniformMatrix44(uint loc, const Math::Matrix44& mat44);
 
 			uint GetUniformLocation(const std::string& uniform);
 
-		private:
+			bool HasUniform(const std::string& uniform);
+
+			GLuint GetGLProgramHandle();
 
 			///
-			/// ����������
-			///	    vec2	Asura_Time             xֵΪ���뵱ǰ������ʼ��ʱ�䣬yֵΪ��һ֡��ʱ����
-			///	    vec2	Asura_RenderTargetSize RT�Ĵ�С��������Ϊ��λ
-			///	    Texture Asura_MainTexture	   ������
+			/// ���texture unit������һ��Ϊ16��
 			///
-			void SetBuiltInUniforms();
-
-			// OpenGL��ɫ����ʶ��program id
-			GLuint mPID;
-			//// Uniform��locations
-			//StringMap<uint> mUniformLocation;
+			static uint GetGLTextureUnitCount();
 
-			////////////////////////////////////////////////////////////////////////////////////////////////////////////
+			//----------------------------------------------------------------------------------------------------------
 
 			LUAX_DECL_FACTORY(SimShader);
 
+			LUAX_DECL_METHOD(l_Use);
+			LUAX_DECL_METHOD(l_Unuse);
+			LUAX_DECL_METHOD(l_Load);
+			LUAX_DECL_METHOD(l_HasUniform);
+			LUAX_DECL_METHOD(l_GetUniformLocation);
 			LUAX_DECL_METHOD(l_SetBuiltInUniforms);
 			LUAX_DECL_METHOD(l_SetUniformFloat);
 			LUAX_DECL_METHOD(l_SetUniformTexture);
 			LUAX_DECL_METHOD(l_SetUniformVector2);
 			LUAX_DECL_METHOD(l_SetUniformVector3);
 			LUAX_DECL_METHOD(l_SetUniformVector4);
+			LUAX_DECL_METHOD(l_SetUniformColor);
+
+			//----------------------------------------------------------------------------------------------------------
+
+		private:
+
+			///
+			/// ��ǰ���shader
+			///
+			static Shader* mCurrentShader;
+
+			///
+			/// ����������
+			///	    vec2	Asura_Time             xֵΪ���뵱ǰ������ʼ��ʱ�䣬yֵΪ��һ֡��ʱ����
+			///	    vec2	Asura_RenderTargetSize RT�Ĵ�С��������Ϊ��λ
+			///	    Texture Asura_MainTexture	   ������
+			///
+			void SetBuiltInUniforms();
+
+			///
+			/// OpenGL shader program handle.
+			/// 
+			GLuint mProgramHandle;
 
 		};