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_spritesheet.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/lua/modules/graphics/je_lua_spritesheet.cpp') diff --git a/src/lua/modules/graphics/je_lua_spritesheet.cpp b/src/lua/modules/graphics/je_lua_spritesheet.cpp index 3c92cbc..a2f3c04 100644 --- a/src/lua/modules/graphics/je_lua_spritesheet.cpp +++ b/src/lua/modules/graphics/je_lua_spritesheet.cpp @@ -1,6 +1,6 @@ #include -#include "common/je_lua_proxy.h" +#include "common/je_lua_object.h" #include "common/je_lua_common.h" #include "libjin/jin.h" #include "je_lua_sprite.h" @@ -19,14 +19,14 @@ namespace JinEngine LUA_IMPLEMENT int l_gc(lua_State* L) { - Proxy* pxySSheet = (Proxy*)luax_checktype(L, 1, Jin_Lua_SpriteSheet); + LuaObject* pxySSheet = (LuaObject*)luax_checktype(L, 1, Jin_Lua_SpriteSheet); pxySSheet->release(); return 0; } LUA_IMPLEMENT int l_newSprite(lua_State* L) { - Proxy* pxySSheet = (Proxy*)luax_checktype(L, 1, Jin_Lua_SpriteSheet); + LuaObject* pxySSheet = (LuaObject*)luax_checktype(L, 1, Jin_Lua_SpriteSheet); Shared& shrSSheet = pxySSheet->getShared(); SpriteSheet* sheet = pxySSheet->getObject(); Quad quad; @@ -50,14 +50,14 @@ namespace JinEngine } Shared* shrSprite = new Shared(L, spr, Jin_Lua_Sprite); shrSprite->setDependency((int)SpriteDependency::DEP_SPRITESHEET, &shrSSheet); - Proxy* pxySprite = luax_newinstance(L, Jin_Lua_Sprite, shrSprite); + LuaObject* pxySprite = luax_newinstance(L, Jin_Lua_Sprite, shrSprite); return 1; } // {} = newSprites LUA_IMPLEMENT int l_newSprites(lua_State* L) { - Proxy* pxySS = (Proxy*)luax_checktype(L, 1, Jin_Lua_SpriteSheet); + LuaObject* pxySS = (LuaObject*)luax_checktype(L, 1, Jin_Lua_SpriteSheet); Shared& shrSS = pxySS->getShared(); SpriteSheet* ss = pxySS->getObject(); int count = luax_checkinteger(L, 2); @@ -99,7 +99,7 @@ namespace JinEngine Sprite* spr = sprs[i]; Shared* shrSpr = new Shared(L, spr, Jin_Lua_Sprite); shrSpr->setDependency((int)SpriteDependency::DEP_GRAPHIC, shrGraphic); - Proxy* pxys = (Proxy*)luax_newinstance(L, Jin_Lua_Sprite, shrSpr); + LuaObject* pxys = (LuaObject*)luax_newinstance(L, Jin_Lua_Sprite, shrSpr); luax_rawseti(L, -2, i + 1); } return 1; -- cgit v1.1-26-g67d0