From a6f2d5fff89b7322009c46a9272668ca4c32ce64 Mon Sep 17 00:00:00 2001 From: chai Date: Thu, 15 Nov 2018 08:32:38 +0800 Subject: =?UTF-8?q?*=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lua/modules/graphics/je_lua_spritesheet.cpp | 14 ++++++++------ 1 file changed, 8 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 7994237..ef1bd85 100644 --- a/src/lua/modules/graphics/je_lua_spritesheet.cpp +++ b/src/lua/modules/graphics/je_lua_spritesheet.cpp @@ -1,5 +1,5 @@ #include "lua/modules/luax.h" -#include "lua/modules/types.h" + #include "lua/common/je_lua_common.h" #include "libjin/jin.h" #include "je_lua_sprite.h" @@ -13,16 +13,18 @@ namespace JinEngine namespace Lua { + const char* Jin_Lua_SpriteSheet = "SpriteSheet"; + LUA_IMPLEMENT int l_gc(lua_State* L) { - Proxy* pxySSheet = (Proxy*)luax_checktype(L, 1, JIN_GRAPHICS_SPRITESHEET); + Proxy* pxySSheet = (Proxy*)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_GRAPHICS_SPRITESHEET); + Proxy* pxySSheet = (Proxy*)luax_checktype(L, 1, Jin_Lua_SpriteSheet); Shared& shrSSheet = pxySSheet->getShared(); SpriteSheet* sheet = pxySSheet->getObject(); Quad quad; @@ -31,8 +33,8 @@ namespace JinEngine quad.w = luax_checkinteger(L, 4); quad.h = luax_checkinteger(L, 5); Sprite* spr = sheet->createSprite(quad); - Proxy* pxySprite = luax_newinstance(L, JIN_GRAPHICS_SPRITE); - Shared* shrSprite = new Shared(spr, JIN_GRAPHICS_SPRITE); + Proxy* pxySprite = luax_newinstance(L, Jin_Lua_Sprite); + Shared* shrSprite = new Shared(spr, Jin_Lua_Sprite); shrSprite->setDependency((int)SpriteDependency::DEP_SPRITESHEET, &shrSSheet); pxySprite->bind(shrSprite); return 1; @@ -45,7 +47,7 @@ namespace JinEngine { "newSprite", l_newSprite }, { 0, 0 } }; - luax_newtype(L, JIN_GRAPHICS_SPRITESHEET, methods); + luax_newtype(L, Jin_Lua_SpriteSheet, methods); return 0; } -- cgit v1.1-26-g67d0