*luax

14 files changed, 50 insertions, 18 deletions

diff --git a/Bin/win64/LuaxTest.exe b/Bin/win64/LuaxTest.exe
index 52354a7..a3a49dc 100644
--- a/Bin/win64/LuaxTest.exe
+++ b/Bin/win64/LuaxTest.exe
diff --git a/Build/Asura.Engine/Asura.Engine.vcxproj b/Build/Asura.Engine/Asura.Engine.vcxproj
index 5185710..9bbf431 100644
--- a/Build/Asura.Engine/Asura.Engine.vcxproj
+++ b/Build/Asura.Engine/Asura.Engine.vcxproj
@@ -145,6 +145,8 @@
     <ClInclude Include="..\..\Source\Asura.Engine\graphics\blend_mode.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\graphics\canvas.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\graphics\color.h" />
+    <ClInclude Include="..\..\Source\Asura.Engine\graphics\color_palette.h" />
+    <ClInclude Include="..\..\Source\Asura.Engine\graphics\gif.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\graphics\gl.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\graphics\image.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\graphics\image_data.h" />
@@ -210,6 +212,7 @@
     <ClCompile Include="..\..\Source\Asura.Engine\graphics\binding\window.binding.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\graphics\canvas.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\graphics\color.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Engine\graphics\gif.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\graphics\gl.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\graphics\image.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\graphics\image_data.cpp" />
diff --git a/Build/Asura.Engine/Asura.Engine.vcxproj.filters b/Build/Asura.Engine/Asura.Engine.vcxproj.filters
index 1050926..6a579ae 100644
--- a/Build/Asura.Engine/Asura.Engine.vcxproj.filters
+++ b/Build/Asura.Engine/Asura.Engine.vcxproj.filters
@@ -199,6 +199,12 @@
     <ClInclude Include="..\..\Source\Asura.Engine\graphics\mesh2d_data.h">
       <Filter>graphics</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Engine\graphics\color_palette.h">
+      <Filter>graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Engine\graphics\gif.h">
+      <Filter>graphics</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\Source\Asura.Engine\audio\sound.cpp">
@@ -341,6 +347,9 @@
     <ClCompile Include="..\..\Source\Asura.Engine\graphics\mesh2d_data.cpp">
       <Filter>graphics</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Engine\graphics\gif.cpp">
+      <Filter>graphics</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\Source\Asura.Engine\input\cursor.defs">
diff --git a/Source/3rdParty/Luax/luax_class.cpp b/Source/3rdParty/Luax/luax_class.cpp
index 155fd28..4c74926 100644
--- a/Source/3rdParty/Luax/luax_class.cpp
+++ b/Source/3rdParty/Luax/luax_class.cpp
@@ -5,6 +5,8 @@
 namespace Luax
 {
 
+#ifdef LUAX_ENABLE_PLAIN_CLASS
+
 	int LuaxPlainClass::registry(lua_State* L)
 	{
 		LUAX_STATE(L);
@@ -188,4 +190,6 @@ namespace Luax
 		return 1;
 	}
 
+#endif /*LUAX_ENABLE_PLAIN_CLASS*/
+
 }
\ No newline at end of file
diff --git a/Source/3rdParty/Luax/luax_class.hpp b/Source/3rdParty/Luax/luax_class.hpp
index 3cbaf9c..da78d0b 100644
--- a/Source/3rdParty/Luax/luax_class.hpp
+++ b/Source/3rdParty/Luax/luax_class.hpp
@@ -140,6 +140,7 @@ namespace Luax
 
 	//--------------------------------------------------------------------------------------------------------------
 
+#ifdef LUAX_ENABLE_PLAIN_CLASS
 	///
 	/// ��lua��
 	///
@@ -157,6 +158,7 @@ namespace Luax
 		LUAX_DECL_METHOD( l_New        );
 
 	};
+#endif
 
 }
 
diff --git a/Source/3rdParty/Luax/luax_class.inl b/Source/3rdParty/Luax/luax_class.inl
index 6f00a84..dc34c14 100644
--- a/Source/3rdParty/Luax/luax_class.inl
+++ b/Source/3rdParty/Luax/luax_class.inl
@@ -346,7 +346,6 @@ namespace Luax
 	}
 
 #ifdef LUAX_ENABLE_NATIVE_EXTEND
-
 	///
 	/// ���������࣬��lua���������ij�Ա����Ϊ����������ƣ����DZ�֤��userdata��ͳһ��Native class�������ṩCtor֧�֣���
 	/// nativeʵ�崴�������ʹ��Ctor���г�ʼ����������ӵ�кͻ���һ����New�����б�����native������һ�������͡�
@@ -448,8 +447,7 @@ namespace Luax
 
 		return 1;
 	}
-
-#endif
+#endif /*LUAX_ENABLE_NATIVE_EXTEND*/
 
 	template<typename T> 
 	int LuaxNativeClass<T>::l_GetClass(lua_State* L)
diff --git a/Source/3rdParty/Luax/luax_config.h b/Source/3rdParty/Luax/luax_config.h
index a161d95..0f69843 100644
--- a/Source/3rdParty/Luax/luax_config.h
+++ b/Source/3rdParty/Luax/luax_config.h
@@ -14,21 +14,21 @@ extern "C" {
 namespace Luax
 {
 
-	typedef unsigned int			uint;
-	typedef unsigned long			uintptr;
-	typedef long					sintptr;
+	typedef unsigned int       uint;
+	typedef unsigned long      uintptr;
+	typedef long               sintptr;
 
-	typedef const char				cc8;
+	typedef const char         cc8;
 
-	typedef unsigned char			u8;
-	typedef unsigned short			u16;
-	typedef unsigned int			u32;
-	typedef unsigned long long		u64;
+	typedef unsigned char      u8;
+	typedef unsigned short     u16;
+	typedef unsigned int       u32;
+	typedef unsigned long long u64;
 
-	typedef signed char				s8;
-	typedef signed short			s16;
-	typedef signed int				s32;
-	typedef signed long long		s64;
+	typedef signed char        s8;
+	typedef signed short       s16;
+	typedef signed int         s32;
+	typedef signed long long   s64;
 
 #ifdef _WIN32
 	#define LUAX_FINAL final
@@ -52,6 +52,9 @@ namespace Luax
 
 //#define LUAX_ENABLE_NATIVE_EXTEND 0
 
+#define LUAX_ENABLE_PLAIN_CLASS 1
+#define LUAX_ENABLE_PLAIN_ENABLE 1
+
 }
 
 #endif
\ No newline at end of file
diff --git a/Source/3rdParty/Luax/luax_enum.cpp b/Source/3rdParty/Luax/luax_enum.cpp
index af832d1..c5b4a53 100644
--- a/Source/3rdParty/Luax/luax_enum.cpp
+++ b/Source/3rdParty/Luax/luax_enum.cpp
@@ -35,7 +35,7 @@ namespace Luax
 	}
 
 	//--------------------------------------------------------------------------------------------------------------
-
+#ifdef LUAX_ENABLE_PLAIN_ENABLE
 	int LuaxPlainEnum::registry(lua_State* L)
 	{
 		// params:
@@ -63,5 +63,5 @@ namespace Luax
 
 		return 1;
 	}
-
+#endif
 }
\ No newline at end of file
diff --git a/Source/3rdParty/Luax/luax_enum.h b/Source/3rdParty/Luax/luax_enum.h
index 19b2b83..f709885 100644
--- a/Source/3rdParty/Luax/luax_enum.h
+++ b/Source/3rdParty/Luax/luax_enum.h
@@ -20,7 +20,7 @@ namespace Luax
 	extern int l_rmt__newindex(lua_State* L);
 
 	//--------------------------------------------------------------------------------------------------------------
-
+#ifdef LUAX_ENABLE_PLAIN_ENABLE
 	///
 	/// ��lua��ö�٣����������޸ĵ�table
 	///
@@ -31,6 +31,7 @@ namespace Luax
 		static int registry(lua_State* L);
 
 	};
+#endif
 
 }
 
diff --git a/Source/3rdParty/Luax/luax_state.cpp b/Source/3rdParty/Luax/luax_state.cpp
index b27825e..9812c8d 100644
--- a/Source/3rdParty/Luax/luax_state.cpp
+++ b/Source/3rdParty/Luax/luax_state.cpp
@@ -707,18 +707,22 @@ namespace Luax
 		luaL_register(mState, libname, l);
 	}
 
+#ifdef LUAX_ENABLE_PLAIN_CLASS
 	void LuaxState::RegisterPlainClassRegistry(cc8* name)
 	{
 		assert(lua_istable(mState, -1));
 		lua_pushcfunction(mState, LuaxPlainClass::registry);
 		lua_setfield(mState, -2, name);
 	}
+#endif
 
+#ifdef LUAX_ENABLE_PLAIN_ENABLE
 	void LuaxState::RegisterPlainEnumRegistry(cc8* name)
 	{
 		assert(lua_istable(mState, -1));
 		lua_pushcfunction(mState, LuaxPlainEnum::registry);
 		lua_setfield(mState, -2, name);
 	}
+#endif
 
 }
\ No newline at end of file
diff --git a/Source/3rdParty/Luax/luax_state.h b/Source/3rdParty/Luax/luax_state.h
index 71e2c5c..8c5b8d6 100644
--- a/Source/3rdParty/Luax/luax_state.h
+++ b/Source/3rdParty/Luax/luax_state.h
@@ -168,15 +168,19 @@ namespace Luax
 		///
 		void RegisterLib(cc8* libname, const luaL_Reg* l);
 
+#ifdef LUAX_ENABLE_PLAIN_CLASS
 		///
 		/// ע�ᴿlua���ע�ắ��������������lua�ࡣ
 		///
 		void RegisterPlainClassRegistry(cc8* name);
+#endif
 
+#ifdef LUAX_ENABLE_PLAIN_ENABLE
 		///
 		/// ע�ᴿlua��ö�٣��Է�ֹ�޸�ö��ֵ��
 		///
 		void RegisterPlainEnumRegistry(cc8* name);
+#endif
 
 		//------------------------------------------------------------------------------------------------------------
 
diff --git a/Source/Asura.Engine/graphics/color_palette.h b/Source/Asura.Engine/graphics/color_palette.h
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Source/Asura.Engine/graphics/color_palette.h
diff --git a/Source/Asura.Engine/graphics/gif.cpp b/Source/Asura.Engine/graphics/gif.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Source/Asura.Engine/graphics/gif.cpp
diff --git a/Source/Asura.Engine/graphics/gif.h b/Source/Asura.Engine/graphics/gif.h
new file mode 100644
index 0000000..36a3259
--- /dev/null
+++ b/Source/Asura.Engine/graphics/gif.h
@@ -0,0 +1,4 @@
+#ifndef __ASURA_GIF_H__
+#define __ASURA_GIF_H__
+
+#endif
\ No newline at end of file