*misc

1 files changed, 19 insertions, 10 deletions

diff --git a/Source/Asura.Engine/Graphics/Image.h b/Source/Asura.Engine/Graphics/Image.h
index 7897f74..6d12303 100644
--- a/Source/Asura.Engine/Graphics/Image.h
+++ b/Source/Asura.Engine/Graphics/Image.h
@@ -1,12 +1,12 @@
 #ifndef __ASURA_ENGINE_IMAGE_H__
 #define __ASURA_ENGINE_IMAGE_H__
 
+#include "Math/Vector2.hpp"
 #include "FileSystem/Reloadable.h"
 #include "StringMap.hpp"
 #include "Manager.hpp"
 #include "Texture.h"
 #include "Color.h"
-#include "Factory.h"
 #include "ImageData.h"
 
 namespace AsuraEngine
@@ -20,46 +20,55 @@ namespace AsuraEngine
 		/// Image��ͼƬ���ڴ�������󣬶�ȡ����Ϸ�󱣴�Ľ����һ��Image���ڴ桢�Դ���ֻ�ᱣ��һ�ݣ����������������Ҫ����
 		/// ��������image����ê��λ�ã����ź���ת�Ƕȣ�ʹ��sprite����һ��ֻ���ࡣ��Ҫ�ǿ��ǵ�editor��engineʹ�ò�ͬ�ķ�װ��
 		///
-		class Image final : public Drawable, public Scripting::Portable, public Filesystem::Reloadable
+		class Image ASURA_FINAL
+			: public Drawable
+			, public Scripting::Portable
+			, public Filesystem::Reloadable
 		{
 		public:
 
 			Image();
+
 			~Image();
 
 			///
 			/// ������buffer����image������Ϣ�����mPixels��Ϊ�գ���������ݡ��������¹���image��ʹ��glTexImage2D�����ύimage
 			/// ���������ݡ�
 			///
-			bool Load(const ImageData* data);
+			bool Load(ImageData* data);
 
 			uint GetWidth();
 			uint GetHeight();
+			Math::Vector2u GetSize();
 
 			///
 			/// ���ijһ��λ�õ�����
 			///
 			Color32 GetPixel(uint x, uint y);
 
-			virtual void Render(const RenderTarget* rt, const RenderState& state) override;
+			void Render(const RenderTarget* rt, const RenderState& state) override;
+
+			void Render(const RenderTarget* rt, const Math::Rectf& quad, const RenderState& state) override;
+
+		private:
+
+			ImageData* mImageData;
 
-			virtual void Render(const RenderTarget* rt, const Math::Rectf& quad, const RenderState& state) override;
+			Math::Vector2u mSize;
+
+		public:
 
 			//----------------------------------------------------------------------------------------------------------
 
 			LUAX_DECL_FACTORY(SimImage);
 
 			LUAX_DECL_METHOD(l_Load);
-			LUAX_DECL_METHOD(l_GetPixel);
 			LUAX_DECL_METHOD(l_GetWidth);
 			LUAX_DECL_METHOD(l_GetHeight);
+			LUAX_DECL_METHOD(l_GetSize);
 
 			//----------------------------------------------------------------------------------------------------------
 
-		private:
-
-			const ImageData* mImageData;
-
 		};
 
 	}