*misc

1 files changed, 13 insertions, 39 deletions

diff --git a/source/modules/asura-core/graphics/shader.h b/source/modules/asura-core/graphics/shader.h
index f4bce25..9cf9653 100644
--- a/source/modules/asura-core/graphics/shader.h
+++ b/source/modules/asura-core/graphics/shader.h
@@ -14,7 +14,6 @@
 #include <asura-utils/stringmap.hpp>
 #include <asura-utils/manager.hpp>
 
-#include "shader_source.h"
 #include "color.h"
 #include "texture.h"
 #include "gl.h"
@@ -35,31 +34,14 @@ namespace AsuraEngine
 		{
 		public:
 
-			LUAX_DECL_FACTORY(Shader);
-
-			Shader() asura_throw(Exception);
+			Shader();
 
 			~Shader();
 
-			///
-			/// �Ӵ������shader������ʱ���ȼ���Ƿ����ϴλ����uniforms location map��ʹ��
-			/// glAttachShader���±���������ɫ������������������ɫ������
-			///
-			bool Update(AEIO::DecodedData* decodeData) override;
-
-			///
-			/// ������shader����Ϊ�
-			///
-			void Use();
-
-			///
-			/// ������shader����Ϊ�ǻ
-			///
-			void Unuse();
-
-			///
-			/// ���Ѿ�֪��uniform location������£�����ֵ��
-			///
+			bool Load(const std::string& vert, const std::string& frag);
+
+			uint GetAttributeLocation(const std::string& name);
+
 			void SetUniformFloat(uint loc, float value);
 			void SetUniformTexture(uint loc, const Texture& texture);
 			void SetUniformVector2(uint loc, const Math::Vector2f& vec2);
@@ -68,40 +50,32 @@ namespace AsuraEngine
 			void SetUniformColor(uint loc, const Color& color);
 			void SetUniformMatrix44(uint loc, const Math::Matrix44& mat44);
 
+			float            GetUniformFloat(uint loc);
+			AEMath::Vector2f GetUniformVector2(uint loc);
+			AEMath::Vector3f GetUniformVector3(uint loc);
+			AEMath::Vector4f GetUniformVector4s(uint loc);
+			AEMath::Matrix44 GetUniformMatrix44(uint loc);
+
 			uint GetUniformLocation(const std::string& uniform);
 
 			bool HasUniform(const std::string& uniform);
 
 			GLuint GetGLProgramHandle();
 
-			///
-			/// ���texture unit������һ��Ϊ16��
-			///
 			static uint GetGLTextureUnitCount();
 
 		private:
 
-			///
-			/// ����������
-			///	    vec2	Asura_Time             xֵΪ���뵱ǰ������ʼ��ʱ�䣬yֵΪ��һ֡��ʱ����
-			///	    vec2	Asura_RenderTargetSize RT�Ĵ�С��������Ϊ��λ
-			///	    Texture Asura_MainTexture	   ������
-			///
-			void SetBuiltInUniforms();
-
-			///
-			/// OpenGL shader program handle.
-			/// 
 			GLuint mProgram;
 			GLuint mVertShader;
 			GLuint mFragShader;
 
-			Luax::LuaxMemberRef mCodeRef;
-
 		private:
 
 			//----------------------------------------------------------------------------//
 
+			LUAX_DECL_FACTORY(Shader);
+
 			LUAX_DECL_METHOD(_New);
 			LUAX_DECL_METHOD(_Use);
 			LUAX_DECL_METHOD(_Unuse);