From 7270cd95294d53180641b05784258df1e29f90d2 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Sun, 15 Nov 2020 11:56:49 +0800
Subject: *lua BindToLua

---
 Runtime/Scripting/LuaBindState.inc | 48 +++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

(limited to 'Runtime/Scripting/LuaBindState.inc')

diff --git a/Runtime/Scripting/LuaBindState.inc b/Runtime/Scripting/LuaBindState.inc
index b2692cb..27151ff 100644
--- a/Runtime/Scripting/LuaBindState.inc
+++ b/Runtime/Scripting/LuaBindState.inc
@@ -5,21 +5,21 @@ namespace LuaBind
 	/// 注册工厂，注册class table，以type name为键设置在名称空间上。在注册阶段不会设置元表，等到New方法调用的时候才会。
 	/// 
 	template<class TYPE>
-	void LuaBindState::RegisterFactory()
+	void State::RegisterFactory()
 	{
-		cc8* type = TYPE::GetLuaBindFactoryName();
+		cc8* type = TYPE::GetFactoryName();
 
 		lua_State* L = mState;
-		LuaBindState& state = *this;
+		State& state = *this;
 
 		int top = lua_gettop(L); // namespace table
 		assert(lua_istable(L, top));
 
 		// class table
 		lua_newtable(L);
-		TYPE::RegisterLuaBindClassShared(state);
-		TYPE::RegisterLuaBindFactoryClass(state);
-		TYPE::RegisterLuaBindClass(state);
+		TYPE::RegisterClassShared(state);
+		TYPE::RegisterFactoryClass(state);
+		TYPE::RegisterClass(state);
 
 		// 检测TYPE里面是否没有注册必须的方法
 #define _assertmethod(I, NAME) \
@@ -42,7 +42,7 @@ namespace LuaBind
 		lua_pushvalue(state, -1); // class table
 		lua_setfield(state, -2, "__index");
 
-		TYPE::SetLuaBindClassTableRef(state, -1);
+		TYPE::SetClassTableRef(state, -1);
 
 		SetField(top, type);
 
@@ -50,28 +50,28 @@ namespace LuaBind
 		lua_settop(L, top);
 
 		// 后处理
-		TYPE::RegisterLuaBindPostprocess(state);
+		TYPE::RegisterPostprocess(state);
 	}
 
 	///
 	/// Singleton
 	///
 	template<typename TYPE>
-	void LuaBindState::RegisterSingleton()
+	void State::RegisterSingleton()
 	{
 		lua_State* L = mState;
-		LuaBindState& state = *this;
+		State& state = *this;
 
 		int top = lua_gettop(L); // namespace table
 		assert(lua_istable(L, top));
 
 		// class table.
 		lua_newtable(L);
-		TYPE::RegisterLuaBindClassShared(state);
-		TYPE::RegisterLuaBindSingletonClass(state);
-		TYPE::RegisterLuaBindClass(state);
+		TYPE::RegisterClassShared(state);
+		TYPE::RegisterSingletonClass(state);
+		TYPE::RegisterClass(state);
 
-		TYPE::SetLuaBindClassTableRef(state, -1);
+		TYPE::SetClassTableRef(state, -1);
 
 		lua_pushvalue(state, -1);
 		lua_setfield(state, -2, "__index");
@@ -83,18 +83,18 @@ namespace LuaBind
 		lua_setfield(state, -2, "Extend");
 #endif
 
-		cc8* type = TYPE::GetLuaBindSingletonName();
+		cc8* type = TYPE::GetSingletonName();
 		SetField(top, type);
 
 		// reset top
 		lua_settop(L, top);
 
 		// 后处理
-		TYPE::RegisterLuaBindPostprocess(state);
+		TYPE::RegisterPostprocess(state);
 	}
 
 	template<typename TYPE>
-	void LuaBindState::SetField(int idx, cc8* key, TYPE value)
+	void State::SetField(int idx, cc8* key, TYPE value)
 	{
 		if (IsTableOrUserdata(idx))
 		{
@@ -105,7 +105,7 @@ namespace LuaBind
 	}
 
 	template<typename TYPE> 
-	void LuaBindState::SetFieldByIndex(int idx, int key, TYPE value)
+	void State::SetFieldByIndex(int idx, int key, TYPE value)
 	{
 		if (IsTableOrUserdata(idx))
 		{
@@ -116,7 +116,7 @@ namespace LuaBind
 	}
 
 	template<typename TYPE>
-	TYPE LuaBindState::GetField(int idx, cc8* key, TYPE value)
+	TYPE State::GetField(int idx, cc8* key, TYPE value)
 	{
 		GetField(idx, key);
 		TYPE result = GetValue < TYPE >(-1, value);
@@ -126,7 +126,7 @@ namespace LuaBind
 	}
 
 	template<typename TYPE>
-	TYPE LuaBindState::GetField(int idx, int key, TYPE value)
+	TYPE State::GetField(int idx, int key, TYPE value)
 	{
 		GetField(idx, key);
 		TYPE result = GetValue < TYPE >(-1, value);
@@ -136,7 +136,7 @@ namespace LuaBind
 	}
 
 	template<typename TYPE>
-	TYPE* LuaBindState::GetUserdata(int idx)
+	TYPE* State::GetUserdata(int idx)
 	{
 		void* p = nullptr;
 
@@ -149,7 +149,7 @@ namespace LuaBind
 	}
 
 	template<typename TYPE> 
-	TYPE* LuaBindState::CheckUserdata(int idx)
+	TYPE* State::CheckUserdata(int idx)
 	{
 		if (IsType(idx, LUA_TUSERDATA))
 		{
@@ -159,7 +159,7 @@ namespace LuaBind
 				{
 					if (lua_getmetatable(mState, -1)) // class table 
 					{
-						TYPE::PushLuaBindClassTable(*this); // target class table
+						TYPE::PushClassTable(*this); // target class table
 						if (lua_rawequal(mState, -1, -2))
 						{
 							Pop(4); // ref\member\class\target class
@@ -173,7 +173,7 @@ namespace LuaBind
 				Pop(1); // ref table
 			}
 		}
-		luaL_typerror(mState, idx, TYPE::GetLuaBindClassName());
+		luaL_typerror(mState, idx, TYPE::GetClassName());
 		return nullptr;
 	}
 
-- 
cgit v1.1-26-g67d0