diff options
Diffstat (limited to 'src/lua/modules/graphics/je_lua_spritesheet.cpp')
| -rw-r--r-- | src/lua/modules/graphics/je_lua_spritesheet.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/lua/modules/graphics/je_lua_spritesheet.cpp b/src/lua/modules/graphics/je_lua_spritesheet.cpp index 23b655e..0cfdb93 100644 --- a/src/lua/modules/graphics/je_lua_spritesheet.cpp +++ b/src/lua/modules/graphics/je_lua_spritesheet.cpp @@ -27,7 +27,6 @@ namespace JinEngine LUA_IMPLEMENT int l_newSprite(lua_State* L) { LuaObject* luaSSheet = (LuaObject*)luax_checktype(L, 1, Jin_Lua_SpriteSheet); - Shared<SpriteSheet>& shrSSheet = luaSSheet->getShared<SpriteSheet>(); SpriteSheet* sheet = luaSSheet->getObject<SpriteSheet>(); Quad quad; quad.x = luax_rawgetnumberthenpop(L, 2, 1); @@ -48,9 +47,9 @@ namespace JinEngine origin = static_cast<Origin>(o); spr = sheet->createSprite(quad, origin); } - Shared<Sprite>* shrSprite = new Shared<Sprite>(spr, Jin_Lua_Sprite); + Shared* shrSprite = new Shared(spr, Jin_Lua_Sprite); LuaObject* luaSprite = luax_newinstance(L, Jin_Lua_Sprite, shrSprite); - luaSprite->setDependency((int)SpriteDependency::DEP_SPRITESHEET, &shrSSheet); + luaSprite->setDependency((int)SpriteDependency::DEP_SPRITESHEET, luaSSheet->getShared()); return 1; } @@ -58,7 +57,6 @@ namespace JinEngine LUA_IMPLEMENT int l_newSprites(lua_State* L) { LuaObject* luaSS = (LuaObject*)luax_checktype(L, 1, Jin_Lua_SpriteSheet); - Shared<SpriteSheet>& shrSS = luaSS->getShared<SpriteSheet>(); SpriteSheet* ss = luaSS->getObject<SpriteSheet>(); int count = luax_checkinteger(L, 2); int r = luax_checkinteger(L, 3); @@ -93,11 +91,11 @@ namespace JinEngine return 1; } luax_newtable(L); - SharedBase* shrGraphic = luaSS->getDependency((int)SpriteSheetDependency::DEP_GRAPHIC); + Shared* shrGraphic = luaSS->getDependency((int)SpriteSheetDependency::DEP_GRAPHIC); for (int i = 0; i < sprs.size(); ++i) { Sprite* spr = sprs[i]; - Shared<Sprite>* shrSpr = new Shared<Sprite>(spr, Jin_Lua_Sprite); + Shared* shrSpr = new Shared(spr, Jin_Lua_Sprite); LuaObject* luaSpr = (LuaObject*)luax_newinstance(L, Jin_Lua_Sprite, shrSpr); luaSpr->setDependency((int)SpriteDependency::DEP_GRAPHIC, shrGraphic); luax_rawseti(L, -2, i + 1); |