diff options
Diffstat (limited to 'Source/Asura.Engine/Graphics/Color.h')
-rw-r--r-- | Source/Asura.Engine/Graphics/Color.h | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/Source/Asura.Engine/Graphics/Color.h b/Source/Asura.Engine/Graphics/Color.h index daf6a09..6383602 100644 --- a/Source/Asura.Engine/Graphics/Color.h +++ b/Source/Asura.Engine/Graphics/Color.h @@ -2,7 +2,7 @@ #define __ASURA_ENGINE_COLOR_H__ #include "Scripting/Luax.hpp" - +#include "Object.h" #include "Type.h" namespace AsuraEngine @@ -15,7 +15,7 @@ namespace AsuraEngine /// /// 32bitsɫ /// - class Color32 + class Color32 : virtual public Object { public: @@ -29,7 +29,7 @@ namespace AsuraEngine byte r, g, b, a; - private: + //---------------------------------------------------------------------------------------------------------- LUAX_DECL_FACTORY(Color32); @@ -37,18 +37,18 @@ namespace AsuraEngine LUAX_DECL_METHOD(l_GetGreen); LUAX_DECL_METHOD(l_GetBlue); LUAX_DECL_METHOD(l_GetAlpha); - - // meta methods LUAX_DECL_METHOD(l_Multiply); LUAX_DECL_METHOD(l_Index); //r,g,b,a LUAX_DECL_METHOD(l_NewIndex); //r,g,b,a + //---------------------------------------------------------------------------------------------------------- + }; /// /// 淶ɫ /// - class Color + class Color : virtual public Object { public: @@ -64,9 +64,7 @@ namespace AsuraEngine float r, g, b, a; - private: - - //////////////////////////////////////////////////////////////////////////////////////////////////////////// + //---------------------------------------------------------------------------------------------------------- LUAX_DECL_FACTORY(Color); @@ -74,12 +72,11 @@ namespace AsuraEngine LUAX_DECL_METHOD(l_GetGreen); // color.g LUAX_DECL_METHOD(l_GetBlue); // color.b LUAX_DECL_METHOD(l_GetAlpha); // color.a - - // meta methods LUAX_DECL_METHOD(l_Multiply); // ɫ˷ - //LUAX_DECL_METHOD(l_Index); // r,g,b,a LUAX_DECL_METHOD(l_NewIndex); // r,g,b,a + //---------------------------------------------------------------------------------------------------------- + }; } |