From 95d27af75eb2aff8020e073eff8dfeb074b5bba6 Mon Sep 17 00:00:00 2001 From: chai Date: Fri, 15 Mar 2019 08:58:10 +0800 Subject: *luax --- Source/3rdParty/Luax/luax_class.hpp | 17 +++++------------ Source/3rdParty/Luax/luax_runtime.cpp | 6 ++++-- 2 files changed, 9 insertions(+), 14 deletions(-) (limited to 'Source/3rdParty') diff --git a/Source/3rdParty/Luax/luax_class.hpp b/Source/3rdParty/Luax/luax_class.hpp index 96124f0..0d3dc5b 100644 --- a/Source/3rdParty/Luax/luax_class.hpp +++ b/Source/3rdParty/Luax/luax_class.hpp @@ -17,9 +17,9 @@ namespace Luax /// LuaxGetFactoryName 获得工厂的类名，同时用来避免注册时错误注册为了singleton，通过编译时报错避免 /// #define LUAX_DECL_FACTORY(type) \ - static void RegisterLuaxClass(LuaxState&);\ - static void RegisterLuaxInterface(LuaxState&);\ - static void RegisterLuaxPostprocess(LuaxState&); \ + static void RegisterLuaxClass(Luax::LuaxState&);\ + static void RegisterLuaxInterface(Luax::LuaxState&);\ + static void RegisterLuaxPostprocess(Luax::LuaxState&); \ static const char* GetLuaxFactoryName() { return #type; };\ static const char* GetLuaxClassName() { return #type; };\ static bool IsLuaxClassSingleton() { return false; }; @@ -29,7 +29,7 @@ namespace Luax /// LuaxGetSingletonName 获得单例的类名 /// #define LUAX_DECL_SINGLETON(type) \ - static void RegisterLuaxClass(LuaxState&); \ + static void RegisterLuaxClass(Luax::LuaxState&); \ static const char* GetLuaxSingletonName() { return #type; }; \ static const char* GetLuaxClassName() { return #type; }; \ static bool IsLuaxClassSingleton() { return true; }; @@ -55,13 +55,6 @@ namespace Luax /// bool PushLuaUserdata(LuaxState& state); - //------------------------------------------------------------------------------------------------------------ - - /// - /// 对类的reftable的管理 - /// - void Ref(); - private: friend class LuaxState; @@ -120,7 +113,7 @@ namespace Luax LUAX_DECL_METHOD( l_GetClassName ); LUAX_DECL_METHOD( l_GetInterfaceTable ); - LUAX_DECL_METHOD(l_ToString); + LUAX_DECL_METHOD( l_ToString ); //------------------------------------------------------------------------------------------------------------ // 工厂类相关 diff --git a/Source/3rdParty/Luax/luax_runtime.cpp b/Source/3rdParty/Luax/luax_runtime.cpp index 3903d9c..47b20cb 100644 --- a/Source/3rdParty/Luax/luax_runtime.cpp +++ b/Source/3rdParty/Luax/luax_runtime.cpp @@ -25,10 +25,12 @@ namespace Luax { lua_State* L = lua_open(); assert(L); - // 加入 + + // 1. 加入 mContexts.insert(pair(L, Context(L))); - // 初始化context + // 2. 初始化context (*this)[L].Setup(); + return L; } -- cgit v1.1-26-g67d0