diff options
author | chai <chaifix@163.com> | 2018-11-23 13:20:48 +0800 |
---|---|---|
committer | chai <chaifix@163.com> | 2018-11-23 13:20:48 +0800 |
commit | 436568ee6320ee7507c01cd6978c078aec2335bd (patch) | |
tree | fb5e89c4ab63113013aa8f10d2940c7651d87672 /src | |
parent | 8d4e45c9a85175d0fc37d7d5c49ff90abb01fe4f (diff) |
*修改文件结构
Diffstat (limited to 'src')
-rw-r--r-- | src/3rdparty/luax/luax.h (renamed from src/lua/libraries/luax/luax.h) | 0 | ||||
-rw-r--r-- | src/lua/common/je_lua.h | 2 | ||||
-rw-r--r-- | src/lua/common/je_lua_proxy.h | 8 | ||||
-rw-r--r-- | src/lua/common/je_lua_shared.cpp | 1 | ||||
-rw-r--r-- | src/lua/modules/graphics/je_lua_animation.cpp | 3 |
5 files changed, 9 insertions, 5 deletions
diff --git a/src/lua/libraries/luax/luax.h b/src/3rdparty/luax/luax.h index 0055176..0055176 100644 --- a/src/lua/libraries/luax/luax.h +++ b/src/3rdparty/luax/luax.h diff --git a/src/lua/common/je_lua.h b/src/lua/common/je_lua.h index 56a5090..05cf917 100644 --- a/src/lua/common/je_lua.h +++ b/src/lua/common/je_lua.h @@ -4,7 +4,7 @@ #include <vector> #include "LuaJIT/lua.hpp" -#include "libraries/luax/luax.h" +#include "luax/luax.h" #include "je_lua_shared.hpp" #include "je_lua_proxy.h" diff --git a/src/lua/common/je_lua_proxy.h b/src/lua/common/je_lua_proxy.h index aa03fa0..6b79b9d 100644 --- a/src/lua/common/je_lua_proxy.h +++ b/src/lua/common/je_lua_proxy.h @@ -20,6 +20,8 @@ namespace JinEngine void release(); + const char* getObjectType(); + template<class T> Shared<T>& getShared() { @@ -36,9 +38,9 @@ namespace JinEngine return shared.getObject(); } - const char* getObjectType(); - - // Bind shared object. + /// + /// + /// SharedBase* shared; }; diff --git a/src/lua/common/je_lua_shared.cpp b/src/lua/common/je_lua_shared.cpp index a3478dd..241aec2 100644 --- a/src/lua/common/je_lua_shared.cpp +++ b/src/lua/common/je_lua_shared.cpp @@ -15,6 +15,7 @@ namespace JinEngine { if (--mCount <= 0) { + // Remove game object reference. luax_removeobject(mL, this); delete this; } diff --git a/src/lua/modules/graphics/je_lua_animation.cpp b/src/lua/modules/graphics/je_lua_animation.cpp index cd048e3..d2c806a 100644 --- a/src/lua/modules/graphics/je_lua_animation.cpp +++ b/src/lua/modules/graphics/je_lua_animation.cpp @@ -1,6 +1,7 @@ +#include "libjin/jin.h" + #include "common/je_lua_proxy.h" #include "common/je_lua_common.h" -#include "libjin/jin.h" #include "je_lua_sprite.h" #include "je_lua_canvas.h" |