1 files changed, 26 insertions, 16 deletions

diff --git a/Source/Asura.Engine/Graphics/Image.h b/Source/Asura.Engine/Graphics/Image.h
index bdd7c1c..391d1c4 100644
--- a/Source/Asura.Engine/Graphics/Image.h
+++ b/Source/Asura.Engine/Graphics/Image.h
@@ -7,6 +7,7 @@
 #include "Texture.h"
 #include "Color.h"
 #include "Factory.h"
+#include "SimClass.h"
 
 namespace AsuraEngine
 {
@@ -19,10 +20,19 @@ namespace AsuraEngine
 		/// Image��ͼƬ���ڴ�������󣬶�ȡ����Ϸ�󱣴�Ľ����һ��Image���ڴ桢�Դ���ֻ�ᱣ��һ�ݣ����������������Ҫ����
 		/// ��������image����ê��λ�ã����ź���ת�Ƕȣ�ʹ��sprite����һ��ֻ���ࡣ��Ҫ�ǿ��ǵ�editor��engineʹ�ò�ͬ�ķ�װ��
 		///
-		class Image final : public Texture
+		class Image final : public Texture, public SimClass
 		{
 		public:
 
+			Image();
+			~Image();
+
+			///
+			/// ������buffer����image�����mPixels��Ϊ�գ���������ݡ��������¹���image��ʹ��glTexImage2D�����ύimage������
+			/// ���ݡ�
+			///
+			bool Load(const void* data, size_t size);
+
 			uint GetWidth();
 			uint GetHeight();
 
@@ -31,29 +41,29 @@ namespace AsuraEngine
 			///
 			Color GetPixel(uint x, uint y);
 
-		private:
+			void Render(int x, int y, int sx, int sy, int ox, int oy, int r) override;
 
-			friend class ImageFactory;
+			void Render(const Math::Rect& quad, int x, int y, int sx, int sy, int ox, int oy, int r) override;
 
-			Image(Color* pixels, int width, int height);
-			~Image();
+			//----------------------------------------------------------------------------------------------------------
+
+			LUAX_DECL_FACTORY(SimImage);
+
+			LUAX_DECL_METHOD(l_Load);
+			LUAX_DECL_METHOD(l_GetPixel);
+			LUAX_DECL_METHOD(l_GetWidth);
+			LUAX_DECL_METHOD(l_GetHeight);
+
+			//----------------------------------------------------------------------------------------------------------
+
+		private:
 
 			///
 			/// ��С��������Ϊ��λ��
 			///
 			uint mWidth, mHeight;
-			Color* mPixels;
-
-			///
-			/// ID
-			///
-			uint mID;
-
-			//----------------------------------------------------------------------------------------------------
 
-			// ͼƬ��Sim�࣬����ķ�װ��AsuraEngine.Image���棬����һ����ԱAsuraEngine.SimImage����AsuraEngine.Image�����
-			// ������һ�����档
-			LUAX_DECL_FACTORY(SimImage);
+			Color* mPixels;
 
 		};