*misc

1 files changed, 10 insertions, 4 deletions

diff --git a/Source/Asura.Engine/Graphics/Color.h b/Source/Asura.Engine/Graphics/Color.h
index d8f39a0..0d65cb1 100644
--- a/Source/Asura.Engine/Graphics/Color.h
+++ b/Source/Asura.Engine/Graphics/Color.h
@@ -2,8 +2,8 @@
 #define __ASURA_ENGINE_COLOR_H__
 
 #include "Scripting/Luax.hpp"
-#include "Object.h"
-#include "Type.h"
+#include "Scripting/Portable.h"
+#include "Config.h"
 
 namespace AsuraEngine
 {
@@ -15,12 +15,14 @@ namespace AsuraEngine
 		///
 		/// 32bits��ɫ
 		///
-		class Color32 : virtual public Object 
+		class Color32 ASURA_FINAL: public Scripting::Portable
 		{
 		public:
 
 			Color32();
 
+			~Color32();
+
 			Color32(const Color32& c);
 
 			Color32(const Color& c);
@@ -33,6 +35,7 @@ namespace AsuraEngine
 
 			LUAX_DECL_FACTORY(Color32);
 
+			LUAX_DECL_METHOD(l_ToColor);
 			LUAX_DECL_METHOD(l_GetRed);
 			LUAX_DECL_METHOD(l_GetGreen);
 			LUAX_DECL_METHOD(l_GetBlue);
@@ -48,7 +51,7 @@ namespace AsuraEngine
 		///
 		/// �淶����ɫ
 		///
-		class Color : virtual public Object
+		class Color ASURA_FINAL: public Scripting::Portable
 		{
 		public: 
 
@@ -66,6 +69,8 @@ namespace AsuraEngine
 
 			Color(const Color32& c);
 
+			~Color();
+
 			Color operator *(const Color& c);
 			
 			float r, g, b, a;
@@ -74,6 +79,7 @@ namespace AsuraEngine
 
 			LUAX_DECL_FACTORY(Color);
 
+			LUAX_DECL_METHOD(l_ToColor32);
 			LUAX_DECL_METHOD(l_SetColor);
 			LUAX_DECL_METHOD(l_GetColor);
 			LUAX_DECL_METHOD(l_Multiply); // ��ɫ�˷�