+widgets

1 files changed, 68 insertions, 22 deletions

diff --git a/Source/Asura.Engine/Graphics/Shader.h b/Source/Asura.Engine/Graphics/Shader.h
index e22fc66..02d9f46 100644
--- a/Source/Asura.Engine/Graphics/Shader.h
+++ b/Source/Asura.Engine/Graphics/Shader.h
@@ -1,62 +1,108 @@
 #ifndef __ASURA_ENGINE_SHADER_H__
 #define __ASURA_ENGINE_SHADER_H__
 
-#include "luax/luax.h"
+#include <map>
+#include <string>
 
-#include "Map.h"
+#include "luax/luax.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"
 
 namespace AsuraEngine
 {
 	namespace Graphics
 	{
 
-		class Material;
-
 		///
-		/// һ��shader��һ���ڲ��ʼ乲���ij���Shader����������uniforms�Ͷ������ݣ�ֻ����uniforms location��
+		/// һ��shader��һ���ڲ��ʼ乲���ij���Shader����������uniforms�Ͷ������ݣ�ֻ�ṩ����uniforms��use��ɫ���ķ������༭�����ÿ��
+		/// shader����ͨ��shader�����ҵ�������uniforms����������¶��framework��material���á�
 		///
-		class Shader
+		class Shader : virtual public Object
 		{
 		public:
 
 			Shader();
 			~Shader();
+			
+			///
+			/// �Ӵ������shader������ʱ���ȼ���Ƿ����ϴλ����uniforms location map
+			///
+			void Load(const std::string& vertexShader, const std::string& fragmentShader);
 
-		private:
+			///
+			/// ������shader����Ϊ�
+			///
+			void Use(); 
 
-			friend class Material;
+			///
+			/// ������shader����Ϊ�ǻ
+			///
+			void UnUse(); 
 
 			///
-			/// ����������shader��uniforms������IDӳ�䡣
+			/// һϵ������uniforms�����ķ���
 			///
-			static StringMap<int> sUniformsID;
+			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);
 
 			///
-			/// ���uniform������ID��
+			/// ���Ѿ�֪��uniform location������£�����ֵ��
 			///
-			static int GetUniformID(const String& name);
+			void SetUniformFloat(uint loc, float value);
+			void SetUniformTexture(uint loc, const Texture& texture);
+			void SetUniformVector2(uint loc, const Math::Vector2& vec2);
+			void SetUniformVector3(uint loc, const Math::Vector3& vec3);
+			void SetUniformVector4(uint loc, const Math::Vector4& vec4);
 
+/*
 			///
-			/// ����������
-			///	 vec2	Asura_Time			 xֵΪ���뵱ǰ������ʼ��ʱ�䣬yֵΪ��һ֡��ʱ����
-			///	 vec2	Asura_RenderTargetSize RT�Ĵ�С��������Ϊ��λ
-			///	 Texture Asura_MainTexture	  ������
+			/// ע����������������ܷ���framework����ʵ�֣������㣬����shader��editor��Ҳ���õ���
+			/// ��ջ����unifrom location���������±���shader���������µ�uniform location
 			///
-			void SetBuiltInUniforms();
+			void ClearUniformLocation();
+*/
+			///
+			/// ���program id
+			///
+			GLint GetNativeHandle();
+
+			uint GetUniformLocation(const std::string& uniform);
+
+		private:
 
 			///
-			/// ӳ��uniforms ID��location��
+			/// ����������
+			///	    vec2	Asura_Time             xֵΪ���뵱ǰ������ʼ��ʱ�䣬yֵΪ��һ֡��ʱ����
+			///	    vec2	Asura_RenderTargetSize RT�Ĵ�С��������Ϊ��λ
+			///	    Texture Asura_MainTexture	   ������
 			///
-			Map<int, int> mLocations;
+			void SetBuiltInUniforms();
 
-		};
+			// OpenGL��ɫ����ʶ��program id
+			GLuint mPID;
+			//// Uniform��locations
+			//StringMap<uint> mUniformLocation;
 
-		class ShaderManager final : public Manager
-		{
+			////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+			LUAX_DECL_FACTORY(SimShader);
+
+			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);
 
 		};