*luax

1 files changed, 64 insertions, 31 deletions

diff --git a/Source/3rdParty/Luax/luax_class.h b/Source/3rdParty/Luax/luax_class.h
index d241030..bde9990 100644
--- a/Source/3rdParty/Luax/luax_class.h
+++ b/Source/3rdParty/Luax/luax_class.h
@@ -6,6 +6,7 @@
 #include "lua.hpp"
 #include "luax_config.h"
 #include "luax_state.h"
+#include "luax_runtime.h"
 
 namespace Luax
 {
@@ -46,55 +47,80 @@ namespace Luax
 		void Retain();
 		void Release();
 
-		//------------------------------------------------------------------------------------------------------------
-		// ��������
+	protected:
 
-		template<class T>
-		static void RegisterLuaxClass(LuaxState& state);
+		LuaxClass();
+		virtual ~LuaxClass();
 
-		template<class T> 
-		LUAX_DECL_METHOD(l_GetClassName);
+		///
+		/// ��userdata push��ջ�������û�г�ʼ��mUserdata����ʼ�����ú�Ԫ�����ѳ�ʼ���õ�userdata����ջ����
+		///
+		bool PushLuaUserdata(LuaxState& state);
 
 		//------------------------------------------------------------------------------------------------------------
-		// ���������
 
-		template<class T>
-		static void RegisterLuaxFactoryClass(LuaxState& state);
+		///
+		/// �����reftable����
+		///
+		void Ref();
 
-		template<class T>
-		static void RegisterLuaxInterface(LuaxState& state);
+	private:
 
-		LUAX_DECL_METHOD(l_GC);
+		friend class LuaxState;
 
-		//------------------------------------------------------------------------------------------------------------
-		// ���������
+		template<class T> static void RegisterLuaxClass(LuaxState& state);
+		template<class T> static void RegisterLuaxFactoryClass(LuaxState& state);
+		template<class T> static void RegisterLuaxInterface(LuaxState& state);
+		template<class T> static void RegisterLuaxSingletonClass(LuaxState& state);
 
-		template<class T>
-		static void RegisterLuaxSingletonClass(LuaxState& state);
+		///
+		/// ����ȡ��ַ������������Ҫ��ַ��ֻ��ͨ���ڶ��ϴ���ʵ���õ�����ջ�Ϻ;�̬���ı�������ȡ��ַ����֤���ü�����׼ȷ����
+		/// ����Ҫ�����ã�ʹ�����ô��ݶ����Ǵ��ݵ�ַ��
+		///
+		void* operator &();
 
-	protected:
+		///
+		/// �󶨵�state����������ǹ���
+		///
+		void BindFactoryToLua(LuaxState& state);
 
-		LuaxClass();
-		~LuaxClass();
+		///
+		/// �󶨵�state����������ǵ���
+		/// 
+		void BindSingletonToLua(LuaxState& state);
+
+		//------------------------------------------------------------------------------------------------------------
+
+		LuaxStrongRef mInterfaceTable; // interface table 
+		LuaxStrongRef mClassTable;     // class table
 
 		///
-		/// ��userdata push��ջ�������û�г�ʼ��mUserdata����ʼ�����ú�Ԫ�����ѳ�ʼ���õ�userdata����ջ����
+		/// ���ü��������������̼߳乲��
 		///
-		bool PushLuaUserdata(LuaxState& state);
-
-	private:
+		int mRC;
 
 		///
-		/// ����ȡ��ַ������������Ҫ��ַ��ֻ��ͨ���ڶ��ϴ���ʵ���õ�����ջ�Ϻ;�̬���ı�������ȡ��ַ����֤���ü�����׼ȷ����
-		/// ����Ҫ�����ã�ʹ�����ô��ݶ����Ǵ��ݵ�ַ��
+		/// ȷ����������ֻ��ͨ��Release���õ�safer������ֻҪ�̳���LuaxClass���࣬���ʹ��deleteֱ���������ͻᱨ��
 		///
-		void* operator &();
+		bool mSafer; 
 
-		void BindToLua(LuaxState& state);
+	public:
 
-		int mRefCount;
+		//------------------------------------------------------------------------------------------------------------
+		// ��������
+
+		template<class T> LUAX_DECL_METHOD(l_GetClassName);
+		template<class T> LUAX_DECL_METHOD(l_GetClassName2);
+
+		LUAX_DECL_METHOD(l_ToString); // __tostring
+
+		//------------------------------------------------------------------------------------------------------------
+		// ���������
 
-		void* mUserdata;
+		LUAX_DECL_METHOD(l_GC); // __gc
+
+		//------------------------------------------------------------------------------------------------------------
+		// ���������
 		
 	};
 
@@ -102,8 +128,15 @@ namespace Luax
 	/// �ڳ�Ա�����ﴴ��LuaxState���Բ������м�顣
 	///
 #define LUAX_SETUP(L, params) \
-		LuaxState state(L);\
-		if(!state.CheckParams(1, params)) return 0;
+	LuaxRuntime& runtime = LuaxRuntime::Get(); \
+	LuaxState& state = runtime[L].state;       \
+	if(!state.CheckParams(1, params)) return 0
+
+#define LUAX_STATE(L) \
+	LuaxState& state = LuaxRuntime::Get().GetLuaxState(L)
+
+#define LUAX_RUNTIME() \
+	LuaxRuntime& runtime = LuaxRuntime::Get()
 
 #include "luax_class.inl"