*misc

1 files changed, 9 insertions, 15 deletions

diff --git a/Source/Asura.Engine/Graphics/Image.h b/Source/Asura.Engine/Graphics/Image.h
index 391d1c4..da881aa 100644
--- a/Source/Asura.Engine/Graphics/Image.h
+++ b/Source/Asura.Engine/Graphics/Image.h
@@ -1,13 +1,12 @@
 #ifndef __ASURA_ENGINE_IMAGE_H__
 #define __ASURA_ENGINE_IMAGE_H__
 
-#include "Math/Vector2.h"
 #include "StringMap.hpp"
 #include "Manager.hpp"
 #include "Texture.h"
 #include "Color.h"
 #include "Factory.h"
-#include "SimClass.h"
+#include "ImageData.h"
 
 namespace AsuraEngine
 {
@@ -20,7 +19,7 @@ namespace AsuraEngine
 		/// Image��ͼƬ���ڴ�������󣬶�ȡ����Ϸ�󱣴�Ľ����һ��Image���ڴ桢�Դ���ֻ�ᱣ��һ�ݣ����������������Ҫ����
 		/// ��������image����ê��λ�ã����ź���ת�Ƕȣ�ʹ��sprite����һ��ֻ���ࡣ��Ҫ�ǿ��ǵ�editor��engineʹ�ò�ͬ�ķ�װ��
 		///
-		class Image final : public Texture, public SimClass
+		class Image final : public Drawable, public Scripting::Portable
 		{
 		public:
 
@@ -28,10 +27,10 @@ namespace AsuraEngine
 			~Image();
 
 			///
-			/// ������buffer����image�����mPixels��Ϊ�գ���������ݡ��������¹���image��ʹ��glTexImage2D�����ύimage������
-			/// ���ݡ�
+			/// ������buffer����image������Ϣ�����mPixels��Ϊ�գ���������ݡ��������¹���image��ʹ��glTexImage2D�����ύimage
+			/// ���������ݡ�
 			///
-			bool Load(const void* data, size_t size);
+			bool Load(const ImageData* data);
 
 			uint GetWidth();
 			uint GetHeight();
@@ -39,11 +38,11 @@ namespace AsuraEngine
 			///
 			/// ���ijһ��λ�õ�����
 			///
-			Color GetPixel(uint x, uint y);
+			Color32 GetPixel(uint x, uint y);
 
-			void Render(int x, int y, int sx, int sy, int ox, int oy, int r) override;
+			virtual void Render(const RenderTarget* rt, const RenderState& state) override;
 
-			void Render(const Math::Rect& quad, int x, int y, int sx, int sy, int ox, int oy, int r) override;
+			virtual void Render(const RenderTarget* rt, const Math::Rectf& quad, const RenderState& state) override;
 
 			//----------------------------------------------------------------------------------------------------------
 
@@ -58,12 +57,7 @@ namespace AsuraEngine
 
 		private:
 
-			///
-			/// ��С��������Ϊ��λ��
-			///
-			uint mWidth, mHeight;
-
-			Color* mPixels;
+			const ImageData* mImageData;
 
 		};