10 files changed, 152 insertions, 132 deletions

diff --git a/Source/Asura.Engine/Graphics/Canvas.h b/Source/Asura.Engine/Graphics/Canvas.h
index fab9cba..ca745ab 100644
--- a/Source/Asura.Engine/Graphics/Canvas.h
+++ b/Source/Asura.Engine/Graphics/Canvas.h
@@ -10,15 +10,15 @@ namespace AsuraEngine
 		
 		class Canvas : public Texture
 		{
-        public:
+		public:
 
 
 
-        private:
+		private:
 
-            LUAX_DECL_FACTORY(SimCanvas); // AsuraEngine.SimCanvas
+			LUAX_DECL_FACTORY(SimCanvas); // AsuraEngine.SimCanvas
 			
-        };
+		};
 		
 	}
 }
diff --git a/Source/Asura.Engine/Graphics/Color.h b/Source/Asura.Engine/Graphics/Color.h
index f07919c..f62f9b8 100644
--- a/Source/Asura.Engine/Graphics/Color.h
+++ b/Source/Asura.Engine/Graphics/Color.h
@@ -5,44 +5,44 @@
 
 namespace AsuraEngine
 {
-    namespace Graphics
-    {
+	namespace Graphics
+	{
 
-        class Color;
+		class Color;
 
-        ///
-        /// 32bits��ɫ
-        ///
-        class Color32
-        {
-        public:
+		///
+		/// 32bits��ɫ
+		///
+		class Color32
+		{
+		public:
 
-            Color32(Color c);
-            Color32(byte r, byte g, byte b, byte a);
+			Color32(Color c);
+			Color32(byte r, byte g, byte b, byte a);
 
-            byte r, g, b, a;
+			byte r, g, b, a;
 
-        private:
+		private:
 
-            LUAX_DECL_FACTORY(Color32);
+			LUAX_DECL_FACTORY(Color32);
 
-        };
+		};
 
-        class Color
-        {
-        public: 
+		class Color
+		{
+		public: 
 
-            Color(Color32 c32);
+			Color(Color32 c32);
 
-            float r, g, b, a;
+			float r, g, b, a;
 
-        private: 
+		private: 
 
-            LUAX_DECL_FACTORY(Color);
+			LUAX_DECL_FACTORY(Color);
 
-        };
+		};
 
-    }
+	}
 }
 
 #endif
\ No newline at end of file
diff --git a/Source/Asura.Engine/Graphics/Image.h b/Source/Asura.Engine/Graphics/Image.h
index e84dd6c..553df21 100644
--- a/Source/Asura.Engine/Graphics/Image.h
+++ b/Source/Asura.Engine/Graphics/Image.h
@@ -12,52 +12,52 @@
 
 namespace AsuraEngine
 {
-    namespace Graphics
-    {
+	namespace Graphics
+	{
 
-        class ImageFactory;
+		class ImageFactory;
 
-        ///
-        /// Image��ͼƬ���ڴ�������󣬶�ȡ����Ϸ�󱣴�Ľ����һ��Image���ڴ桢�Դ���ֻ�ᱣ��һ�ݣ����������������Ҫ����
-        /// ��������image����ê��λ�ã����ź���ת�Ƕȣ�ʹ��sprite��������һ��ֻ���ࡣ
-        ///
-        class Image final : public Texture
-        {
-        public:
+		///
+		/// Image��ͼƬ���ڴ�������󣬶�ȡ����Ϸ�󱣴�Ľ����һ��Image���ڴ桢�Դ���ֻ�ᱣ��һ�ݣ����������������Ҫ����
+		/// ��������image����ê��λ�ã����ź���ת�Ƕȣ�ʹ��sprite��������һ��ֻ���ࡣ
+		///
+		class Image final : public Texture
+		{
+		public:
 
-            uint GetWidth();
-            uint GetHeight();
+			uint GetWidth();
+			uint GetHeight();
 
-            ///
-            /// ���ijһ��λ�õ�����
-            ///
-            Color GetPixel(uint x, uint y);
+			///
+			/// ���ijһ��λ�õ�����
+			///
+			Color GetPixel(uint x, uint y);
 
-        private:
+		private:
 
-            friend class ImageFactory;
+			friend class ImageFactory;
 
-            Image(Color* pixels, int width, int height);
-            ~Image();
+			Image(Color* pixels, int width, int height);
+			~Image();
 
-            ///
-            /// ��С��������Ϊ��λ��
-            ///
-            uint mWidth, mHeight;
-            Color* mPixels;
+			///
+			/// ��С��������Ϊ��λ��
+			///
+			uint mWidth, mHeight;
+			Color* mPixels;
 
 			///
 			/// ID
 			///
 			uint mID;
 
-            //----------------------------------------------------------------------------------------------------
+			//----------------------------------------------------------------------------------------------------
 
-            LUAX_DECL_FACTORY(SimImage); //AsuraEngine.SimImage
+			LUAX_DECL_FACTORY(SimImage); //AsuraEngine.SimImage
 
-        };
+		};
 
-    }
+	}
 }
 
 #endif
\ No newline at end of file
diff --git a/Source/Asura.Engine/Graphics/Mesh2D.h b/Source/Asura.Engine/Graphics/Mesh2D.h
index cff66c4..0d5113a 100644
--- a/Source/Asura.Engine/Graphics/Mesh2D.h
+++ b/Source/Asura.Engine/Graphics/Mesh2D.h
@@ -3,18 +3,18 @@
 
 namespace AsuraEngine
 {
-    namespace Graphics
-    {
+	namespace Graphics
+	{
 
-        ///
-        /// 2D mesh��������һЩ���㶯����
-        ///
-        class Mesh2D
-        {
+		///
+		/// 2D mesh��������һЩ���㶯����
+		///
+		class Mesh2D
+		{
 
-        };
+		};
 
-    }
+	}
 }
 
 #endif
\ No newline at end of file
diff --git a/Source/Asura.Engine/Graphics/OpenGL.cpp b/Source/Asura.Engine/Graphics/OpenGL.cpp
index ec23f52..dac2ea4 100644
--- a/Source/Asura.Engine/Graphics/OpenGL.cpp
+++ b/Source/Asura.Engine/Graphics/OpenGL.cpp
@@ -2,10 +2,10 @@
 
 namespace AsuraEngine
 {
-    namespace Graphics
-    {
+	namespace Graphics
+	{
 
 
 
-    }
+	}
 }
\ No newline at end of file
diff --git a/Source/Asura.Engine/Graphics/OpenGL.h b/Source/Asura.Engine/Graphics/OpenGL.h
index 34d662b..315c09b 100644
--- a/Source/Asura.Engine/Graphics/OpenGL.h
+++ b/Source/Asura.Engine/Graphics/OpenGL.h
@@ -3,15 +3,15 @@
 
 namespace AsuraEngine
 {
-    namespace Graphics
-    {
+	namespace Graphics
+	{
 
-        class OpenGL
-        {
+		class OpenGL
+		{
 
-        };
+		};
 
-    }
+	}
 }
 
 #endif
\ No newline at end of file
diff --git a/Source/Asura.Engine/Graphics/Shader.h b/Source/Asura.Engine/Graphics/Shader.h
index e15c6e0..e22fc66 100644
--- a/Source/Asura.Engine/Graphics/Shader.h
+++ b/Source/Asura.Engine/Graphics/Shader.h
@@ -11,56 +11,56 @@
 
 namespace AsuraEngine
 {
-    namespace Graphics
-    {
+	namespace Graphics
+	{
 
-        class Material;
+		class Material;
 
-        ///
-        /// һ��shader��һ���ڲ��ʼ乲���ij���Shader����������uniforms�Ͷ������ݣ�ֻ����uniforms location��
-        ///
-        class Shader
-        {
-        public:
+		///
+		/// һ��shader��һ���ڲ��ʼ乲���ij���Shader����������uniforms�Ͷ������ݣ�ֻ����uniforms location��
+		///
+		class Shader
+		{
+		public:
 
-            Shader();
-            ~Shader();
+			Shader();
+			~Shader();
 
-        private:
+		private:
 
-            friend class Material;
+			friend class Material;
 
-            ///
-            /// ����������shader��uniforms������IDӳ�䡣
-            ///
-            static StringMap<int> sUniformsID;
+			///
+			/// ����������shader��uniforms������IDӳ�䡣
+			///
+			static StringMap<int> sUniformsID;
 
-            ///
-            /// ���uniform������ID��
-            ///
-            static int GetUniformID(const String& name);
+			///
+			/// ���uniform������ID��
+			///
+			static int GetUniformID(const String& name);
 
-            ///
-            /// ����������
-            ///     vec2    Asura_Time             xֵΪ���뵱ǰ������ʼ��ʱ�䣬yֵΪ��һ֡��ʱ����
-            ///     vec2    Asura_RenderTargetSize RT�Ĵ�С��������Ϊ��λ
-            ///     Texture Asura_MainTexture      ������
-            ///
-            void SetBuiltInUniforms();
+			///
+			/// ����������
+			///	 vec2	Asura_Time			 xֵΪ���뵱ǰ������ʼ��ʱ�䣬yֵΪ��һ֡��ʱ����
+			///	 vec2	Asura_RenderTargetSize RT�Ĵ�С��������Ϊ��λ
+			///	 Texture Asura_MainTexture	  ������
+			///
+			void SetBuiltInUniforms();
 
-            ///
-            /// ӳ��uniforms ID��location��
-            ///
-            Map<int, int> mLocations;
+			///
+			/// ӳ��uniforms ID��location��
+			///
+			Map<int, int> mLocations;
 
-        };
+		};
 
-        class ShaderManager final : public Manager
-        {
+		class ShaderManager final : public Manager
+		{
 
-        };
+		};
 
-    }
+	}
 }
 
 #endif
\ No newline at end of file
diff --git a/Source/Asura.Engine/Graphics/SpriteBatch.h b/Source/Asura.Engine/Graphics/SpriteBatch.h
index e69de29..17d5e75 100644
--- a/Source/Asura.Engine/Graphics/SpriteBatch.h
+++ b/Source/Asura.Engine/Graphics/SpriteBatch.h
@@ -0,0 +1,20 @@
+#ifndef __ASURA_ENGINE_SPRITE_BATCH_H__
+#define __ASURA_ENGINE_SPRITE_BATCH_H__
+
+namespace AsuraEngine
+{
+	namespace Graphics
+	{
+
+		///
+		/// Sprite batch����������Ⱦ����ͼƬ�ĵط�����������ϵͳ��
+		///
+		class SpriteBatch
+		{
+
+		};
+
+	}
+}
+
+#endif
\ No newline at end of file
diff --git a/Source/Asura.Engine/Graphics/Texture.h b/Source/Asura.Engine/Graphics/Texture.h
index b50467a..db5c72e 100644
--- a/Source/Asura.Engine/Graphics/Texture.h
+++ b/Source/Asura.Engine/Graphics/Texture.h
@@ -6,18 +6,18 @@
 
 namespace AsuraEngine
 {
-    namespace Graphics
-    {
+	namespace Graphics
+	{
 
-        ///
-        /// 2D�����������ࣩ����2d mesh��render target�б�ʹ��
-        ///
-        class Texture : public Object
-        {
+		///
+		/// 2D�����������ࣩ����2d mesh��render target�б�ʹ��
+		///
+		class Texture : public Object
+		{
 
-        };
+		};
 
-    }
+	}
 }
 
 #endif
\ No newline at end of file
diff --git a/Source/Asura.Engine/Graphics/Window.h b/Source/Asura.Engine/Graphics/Window.h
index 0f6ca92..3a09266 100644
--- a/Source/Asura.Engine/Graphics/Window.h
+++ b/Source/Asura.Engine/Graphics/Window.h
@@ -3,23 +3,23 @@
 
 namespace AsuraEngine
 {
-    namespace Graphics
-    {
+	namespace Graphics
+	{
 
-        ///
-        /// ���ڣ�֧�ֶര�ڡ��ڱ༭������Ҫ�������֧�֣�runnerֻ��Ҫһ�����ڡ�
-        ///
-        class Window
-        {
-        public:
+		///
+		/// ���ڣ�֧�ֶര�ڡ��ڱ༭������Ҫ�������֧�֣�runnerֻ��Ҫһ�����ڡ�
+		///
+		class Window
+		{
+		public:
 
 
-        private:
+		private:
 
 
-        };
+		};
 
-    }
+	}
 }
 
 #endif
\ No newline at end of file