1 files changed, 92 insertions, 32 deletions

diff --git a/Source/3rdParty/Luax/luax_class.h b/Source/3rdParty/Luax/luax_class.h
index 1721ec4..d241030 100644
--- a/Source/3rdParty/Luax/luax_class.h
+++ b/Source/3rdParty/Luax/luax_class.h
@@ -3,50 +3,110 @@
 
 #include <vector>
 
+#include "lua.hpp"
+#include "luax_config.h"
+#include "luax_state.h"
+
 namespace Luax
 {
 
-#define LUAX_DECL_METHOD(MTD) static int MTD(lua_State*)
-#define LUAX_DECL_FACTORY(CLS) static int RegisterLuaClass(lua_State*);
-#define LUAX_DECL_SINGLETON(CLS)
+#define LUAX_DECL_METHOD(mtd) static int mtd(lua_State*)
+
+	///
+	/// RegisterLuaxClass ע����ķ����ͳ�Ա������ö�١������ȵ�class table
+	/// LuaxRegisterInterface ע��ӿڷ�����interface table
+	/// LuaxGetFactoryName ��ù�����������ͬʱ��������ע��ʱ����ע��Ϊ��singleton��ͨ������ʱ��������
+	///
+#define LUAX_DECL_FACTORY(type) \
+	static void RegisterLuaxClass(LuaxState&);\
+	static void RegisterLuaxInterface(LuaxState&);\
+	static const char* GetLuaxFactoryName() { return #type; };\
+	static const char* GetLuaxClassName() { return #type; };\
+	static bool IsLuaxClassSingleton() { return false; };
+
+
+	///
+	/// RegisterLuaxClass ע����ķ����ͳ�Ա������ö�١������ȵ�class table
+	/// LuaxGetSingletonName ��õ���������
+	///
+#define LUAX_DECL_SINGLETON(type) \
+	static void RegisterLuaxClass(LuaxState&);  \
+	static const char* GetLuaxSingletonName() { return #type; }; \
+	static const char* GetLuaxClassName() { return #type; }; \
+	static bool IsLuaxClassSingleton() { return true; };
+
+
+	///
+	/// ��Ҫ��¶��lua��class��Ҫ�̳д��ࡣͨ��lua������ʵ��Ҫȷ�����ü�������ȷ�ԣ��ڶ���߳�����Ҫȷ���������ͷš�
+	///
+	class LuaxClass
+	{
+	public:
+
+		void Retain();
+		void Release();
+
+		//------------------------------------------------------------------------------------------------------------
+		// ��������
+
+		template<class T>
+		static void RegisterLuaxClass(LuaxState& state);
+
+		template<class T> 
+		LUAX_DECL_METHOD(l_GetClassName);
+
+		//------------------------------------------------------------------------------------------------------------
+		// ���������
+
+		template<class T>
+		static void RegisterLuaxFactoryClass(LuaxState& state);
+
+		template<class T>
+		static void RegisterLuaxInterface(LuaxState& state);
+
+		LUAX_DECL_METHOD(l_GC);
+
+		//------------------------------------------------------------------------------------------------------------
+		// ���������
+
+		template<class T>
+		static void RegisterLuaxSingletonClass(LuaxState& state);
+
+	protected:
+
+		LuaxClass();
+		~LuaxClass();
 
-#define LUAX_REGISTER_CLASS(CLS) CLS::RegisterLuaType()
-	/*
-    ///
-    /// ��Ҫ��¶��lua��class��Ҫ�̳д��ࡣ
-    ///
-    class LuaxClass
-    {
-    public:
+		///
+		/// ��userdata push��ջ�������û�г�ʼ��mUserdata����ʼ�����ú�Ԫ�����ѳ�ʼ���õ�userdata����ջ����
+		///
+		bool PushLuaUserdata(LuaxState& state);
 
-        static void RegisterLuaType();
+	private:
 
-        static void RegisterLuaFuncs();
+		///
+		/// ����ȡ��ַ������������Ҫ��ַ��ֻ��ͨ���ڶ��ϴ���ʵ���õ�����ջ�Ϻ;�̬���ı�������ȡ��ַ����֤���ü�����׼ȷ����
+		/// ����Ҫ�����ã�ʹ�����ô��ݶ����Ǵ��ݵ�ַ��
+		///
+		void* operator &();
 
-    private:
-        
-    };
+		void BindToLua(LuaxState& state);
 
-    ///
-    /// ��Ҫ��Ϊ��������userdata����̳д��ࡣ��Ϊ�������࣬ͨ��LUAX_DECL_FACTORY(CLS)��ָ��������
-    ///
-    class LuaxFactory : public LuaxClass 
-    {
-    
+		int mRefCount;
 
-    };
+		void* mUserdata;
+		
+	};
 
-    ///
-    /// ע���lua�ĵ�����̳д��ࡣ
-    ///
-    class LuaxSingleton : public LuaxClass
-    {
-    public: 
+	///
+	/// �ڳ�Ա�����ﴴ��LuaxState���Բ������м�顣
+	///
+#define LUAX_SETUP(L, params) \
+		LuaxState state(L);\
+		if(!state.CheckParams(1, params)) return 0;
 
-    private:
+#include "luax_class.inl"
 
-    };
-		*/
 }
 
 #endif
\ No newline at end of file