diff options
Diffstat (limited to 'src/lua/common')
| -rw-r--r-- | src/lua/common/je_lua_object.cpp | 2 | ||||
| -rw-r--r-- | src/lua/common/je_lua_object.h | 2 | ||||
| -rw-r--r-- | src/lua/common/je_lua_runtime.cpp | 2 | ||||
| -rw-r--r-- | src/lua/common/je_lua_shared.hpp | 10 |
4 files changed, 9 insertions, 7 deletions
diff --git a/src/lua/common/je_lua_object.cpp b/src/lua/common/je_lua_object.cpp index d98099e..de3270a 100644 --- a/src/lua/common/je_lua_object.cpp +++ b/src/lua/common/je_lua_object.cpp @@ -38,7 +38,7 @@ namespace JinEngine return object->getType(); } - SharedBase* LuaObject::getSharedBase() + SharedBase* LuaObject::getShared() { return object; } diff --git a/src/lua/common/je_lua_object.h b/src/lua/common/je_lua_object.h index 15fa6e4..296ee03 100644 --- a/src/lua/common/je_lua_object.h +++ b/src/lua/common/je_lua_object.h @@ -23,7 +23,7 @@ namespace JinEngine const char* getObjectType(); - SharedBase* getSharedBase(); + SharedBase* getShared(); template<class T> Shared<T>& getShared() diff --git a/src/lua/common/je_lua_runtime.cpp b/src/lua/common/je_lua_runtime.cpp index 73f671c..055073d 100644 --- a/src/lua/common/je_lua_runtime.cpp +++ b/src/lua/common/je_lua_runtime.cpp @@ -54,7 +54,7 @@ namespace JinEngine luax_copyinstance(to, luaObj); luax_pop(to, 1); // Pop reference object. } - SharedBase * shr = src->getSharedBase(); + SharedBase * shr = src->getShared(); LuaObject* obj = luax_newinstance(to, src->getObjectType(), shr); (*obj->dependencies) = (*src->dependencies); // Add to objects_table. diff --git a/src/lua/common/je_lua_shared.hpp b/src/lua/common/je_lua_shared.hpp index f89783d..86ee9be 100644 --- a/src/lua/common/je_lua_shared.hpp +++ b/src/lua/common/je_lua_shared.hpp @@ -29,10 +29,12 @@ namespace JinEngine SharedBase(const SharedBase&); - // ͬһ̵߳lua_StateУLuaObjectEngineObjectӦһһӦLuaObject(lua runtime)ü - // աEngine-sideüΪά̵ͬ߳lua_StateͬһEngineObjectÿLuaObjectһ - // Sharedʱһüͬһ߳УһEngineObjectֻһLuaObjectnew - // instanceУômCountͱEngineObjectĹ߳ + /// + /// ͬһ̵߳lua_StateУLuaObjectEngineObjectӦһһӦLuaObject(lua runtime)ü + /// ͻաEngine-sideüΪά̵ͬ߳lua_StateͬһEngineObjectÿLuaObjectһ + /// Sharedʱһüͬһ߳УһEngineObjectֻһLuaObjectnew + /// instanceУômCountͱEngineObjectĹ߳ + /// void retain(); void release(); |