From 8cd03a53878b9d67eb4b13fb546dbd989d8217e2 Mon Sep 17 00:00:00 2001 From: chai Date: Tue, 4 Dec 2018 10:13:03 +0800 Subject: *proxy->lua object --- src/lua/modules/graphics/je_lua_animator.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/lua/modules/graphics/je_lua_animator.cpp') diff --git a/src/lua/modules/graphics/je_lua_animator.cpp b/src/lua/modules/graphics/je_lua_animator.cpp index 843204d..43a1f50 100644 --- a/src/lua/modules/graphics/je_lua_animator.cpp +++ b/src/lua/modules/graphics/je_lua_animator.cpp @@ -1,4 +1,4 @@ -#include "common/je_lua_proxy.h" +#include "common/je_lua_object.h" #include "common/je_lua_common.h" #include "libjin/jin.h" @@ -24,13 +24,13 @@ namespace JinEngine LUA_IMPLEMENT inline SharedAnimator checkAnimator(lua_State* L) { - Proxy* proxy = (Proxy*)luax_checktype(L, 1, Jin_Lua_Animator); - return proxy->getShared(); + LuaObject* luaObj = (LuaObject*)luax_checktype(L, 1, Jin_Lua_Animator); + return luaObj->getShared(); } LUA_IMPLEMENT int l_gc(lua_State* L) { - Proxy* p = (Proxy*)luax_checktype(L, 1, Jin_Lua_Animation); + LuaObject* p = (LuaObject*)luax_checktype(L, 1, Jin_Lua_Animation); p->release(); return 0; } @@ -86,8 +86,8 @@ namespace JinEngine LUA_IMPLEMENT int l_setAnimation(lua_State* L) { SharedAnimator shrAnimator = checkAnimator(L); - Proxy* proxy = (Proxy*)luax_checktype(L, 1, Jin_Lua_Animation); - Shared& shrAnimation = proxy->getShared(); + LuaObject* luaObj = (LuaObject*)luax_checktype(L, 1, Jin_Lua_Animation); + Shared& shrAnimation = luaObj->getShared(); shrAnimator.setDependency((int)AnimatorDependency::DEP_ANIMATION, &shrAnimation); shrAnimator->setAnimation(shrAnimation.getObject()); return 0; -- cgit v1.1-26-g67d0