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_graphics.cpp | 90 ++++++++++++++-------------- 1 file changed, 45 insertions(+), 45 deletions(-) (limited to 'src/lua/modules/graphics/je_lua_graphics.cpp') diff --git a/src/lua/modules/graphics/je_lua_graphics.cpp b/src/lua/modules/graphics/je_lua_graphics.cpp index d2f663d..907d90e 100644 --- a/src/lua/modules/graphics/je_lua_graphics.cpp +++ b/src/lua/modules/graphics/je_lua_graphics.cpp @@ -2,7 +2,7 @@ #include #include "libjin/jin.h" -#include "common/je_lua_proxy.h" +#include "common/je_lua_object.h" #include "common/je_lua_common.h" #include "je_lua_canvas.h" @@ -207,7 +207,7 @@ namespace JinEngine return 1; } } - Proxy* proxy = luax_newinstance(L, Jin_Lua_Bitmap, new Shared(L, bitmap, Jin_Lua_Bitmap)); + LuaObject* luaObj = luax_newinstance(L, Jin_Lua_Bitmap, new Shared(L, bitmap, Jin_Lua_Bitmap)); return 1; } @@ -217,7 +217,7 @@ namespace JinEngine Texture* texture = nullptr; if (luax_istype(L, 1, Jin_Lua_Bitmap)) { - Proxy* p = (Proxy*)luax_checktype(L, 1, Jin_Lua_Bitmap); + LuaObject* p = (LuaObject*)luax_checktype(L, 1, Jin_Lua_Bitmap); Shared& refBitmap = p->getShared(); Bitmap* bitmap = refBitmap.getObject(); texture = Texture::createTexture(bitmap); @@ -227,7 +227,7 @@ namespace JinEngine const char* path = luax_checkstring(L, 1); texture = Texture::createTexture(path); } - Proxy* proxy = luax_newinstance(L, Jin_Lua_Texture, new Shared(L, texture, Jin_Lua_Texture)); + LuaObject* luaObj = luax_newinstance(L, Jin_Lua_Texture, new Shared(L, texture, Jin_Lua_Texture)); return 1; } @@ -241,7 +241,7 @@ namespace JinEngine luax_pushnil(L); return 1; } - Proxy* proxy = luax_newinstance(L, Jin_Lua_Shader, new Shared(L, jsl, Jin_Lua_Shader)); + LuaObject* luaObj = luax_newinstance(L, Jin_Lua_Shader, new Shared(L, jsl, Jin_Lua_Shader)); return 1; } @@ -264,7 +264,7 @@ namespace JinEngine luax_pushnil(L); return 1; } - Proxy* proxy = luax_newinstance(L, Jin_Lua_Shader, new Shared(L, jsl, Jin_Lua_Shader)); + LuaObject* luaObj = luax_newinstance(L, Jin_Lua_Shader, new Shared(L, jsl, Jin_Lua_Shader)); return 1; } @@ -273,7 +273,7 @@ namespace JinEngine int w = luax_checknumber(L, 1); int h = luax_checknumber(L, 2); Canvas* cvs = Canvas::createCanvas(w, h); - Proxy* proxy = luax_newinstance(L, Jin_Lua_Canvas, new Shared(L, cvs, Jin_Lua_Canvas)); + LuaObject* luaObj = luax_newinstance(L, Jin_Lua_Canvas, new Shared(L, cvs, Jin_Lua_Canvas)); return 1; } @@ -320,8 +320,8 @@ namespace JinEngine float r = luax_optnumber(L, 6, 0); float ox = luax_optnumber(L, 7, 0); float oy = luax_optnumber(L, 8, 0); - Proxy* proxy = (Proxy*)luax_toudata(L, 1); - Shared& tex = proxy->getShared(); + LuaObject* luaObj = (LuaObject*)luax_toudata(L, 1); + Shared& tex = luaObj->getShared(); tex->render(x, y, sx, sy, r, ox, oy); } @@ -336,8 +336,8 @@ namespace JinEngine float r = luax_optnumber(L, 6, 0); float ox = luax_optnumber(L, 7, 0); float oy = luax_optnumber(L, 8, 0); - Proxy* proxy = (Proxy*)luax_toudata(L, 1); - Shared& p = proxy->getShared(); + LuaObject* luaObj = (LuaObject*)luax_toudata(L, 1); + Shared& p = luaObj->getShared(); p->render(x, y, sx, sy, r, ox, oy); } @@ -346,13 +346,13 @@ namespace JinEngine { if (!luax_istype(L, 1, Jin_Lua_Text)) return; - Proxy* p = (Proxy*)luax_toudata(L, 1); + LuaObject* p = (LuaObject*)luax_toudata(L, 1); Text* text = p->getObject(); int x = luax_optnumber(L, 3, 0); int y = luax_optnumber(L, 4, 0); int spacing = luax_optnumber(L, 6, 0); Font* font = nullptr; - Proxy* p2 = (Proxy*)luax_toudata(L, 2); + LuaObject* p2 = (LuaObject*)luax_toudata(L, 2); if (luax_istype(L, 2, Jin_Lua_TextureFont)) { TextureFont* tf = p2->getObject(); @@ -378,7 +378,7 @@ namespace JinEngine return; int x = luax_optnumber(L, 2, 0); int y = luax_optnumber(L, 3, 0); - Proxy* p = (Proxy*)luax_toudata(L, 1); + LuaObject* p = (LuaObject*)luax_toudata(L, 1); Page* page = p->getObject(); Font* font = page->font; font->render(page, x, y); @@ -388,7 +388,7 @@ namespace JinEngine { if (!luax_istype(L, 1, Jin_Lua_Sprite)) return; - Proxy* pxySprite = (Proxy*)luax_toudata(L, 1); + LuaObject* pxySprite = (LuaObject*)luax_toudata(L, 1); Sprite* sprite = pxySprite->getObject(); float x = luax_checknumber(L, 2); float y = luax_checknumber(L, 3); @@ -442,14 +442,14 @@ namespace JinEngine if (luax_istype(L, 1, Jin_Lua_Texture)) { - Proxy* proxy = (Proxy*)luax_toudata(L, 1); - Shared& tex = proxy->getShared(); + LuaObject* luaObj = (LuaObject*)luax_toudata(L, 1); + Shared& tex = luaObj->getShared(); tex->render(q, x, y, sx, sy, r, ox, oy); } else if (luax_istype(L, 1, Jin_Lua_Canvas)) { - Proxy* proxy = (Proxy*)luax_toudata(L, 1); - Shared& p = proxy->getShared(); + LuaObject* luaObj = (LuaObject*)luax_toudata(L, 1); + Shared& p = luaObj->getShared(); p->render(q, x, y, sx, sy, r, ox, oy); } else @@ -512,8 +512,8 @@ namespace JinEngine Canvas::unbind(); return 0; } - Proxy* proxy = (Proxy*)luax_checktype(L, 1, Jin_Lua_Canvas); - Shared& shared = proxy->getShared(); + LuaObject* luaObj = (LuaObject*)luax_checktype(L, 1, Jin_Lua_Canvas); + Shared& shared = luaObj->getShared(); Canvas::bind(shared.getObject()); return 0; } @@ -533,8 +533,8 @@ namespace JinEngine } if (luax_istype(L, 1, Jin_Lua_Shader)) { - Proxy* proxy = (Proxy*)luax_checktype(L, 1, Jin_Lua_Shader); - Shared& jsl = proxy->getShared(); + LuaObject* luaObj = (LuaObject*)luax_checktype(L, 1, Jin_Lua_Shader); + Shared& jsl = luaObj->getShared(); jsl->use(); } else @@ -684,7 +684,7 @@ namespace JinEngine fs->read(path, b); fd = TTFData::createTTFData(&b, b.size()); } - Proxy* proxy = luax_newinstance(L, Jin_Lua_TTFData, new Shared(L, fd, Jin_Lua_TTFData)); + LuaObject* luaObj = luax_newinstance(L, Jin_Lua_TTFData, new Shared(L, fd, Jin_Lua_TTFData)); return 1; } @@ -707,7 +707,7 @@ namespace JinEngine unsigned length; const char* data = luax_checklstring(L, 1, &length); Text* text = new Text(encode, data, length); - Proxy* proxy = luax_newinstance(L, Jin_Lua_Text, new Shared(L, text, Jin_Lua_Text)); + LuaObject* luaObj = luax_newinstance(L, Jin_Lua_Text, new Shared(L, text, Jin_Lua_Text)); return 1; } @@ -718,11 +718,11 @@ namespace JinEngine LUA_IMPLEMENT int l_newSprite(lua_State* L) { int n = luax_gettop(L); - Proxy* pxyGraphic = nullptr; + LuaObject* pxyGraphic = nullptr; if (luax_istype(L, 1, Jin_Lua_Texture)) - pxyGraphic = (Proxy*)luax_checktype(L, 1, Jin_Lua_Texture); + pxyGraphic = (LuaObject*)luax_checktype(L, 1, Jin_Lua_Texture); else if (luax_istype(L, 1, Jin_Lua_Canvas)) - pxyGraphic = (Proxy*)luax_checktype(L, 1, Jin_Lua_Canvas); + pxyGraphic = (LuaObject*)luax_checktype(L, 1, Jin_Lua_Canvas); Graphic* graphic = pxyGraphic->getObject(); if (pxyGraphic != nullptr) { @@ -735,7 +735,7 @@ namespace JinEngine quad.h = luax_rawgetnumberthenpop(L, 2, 4); int o = luax_checkinteger(L, 3); Origin origin = static_cast(o); - Proxy* p = luax_newinstance(L, Jin_Lua_Sprite, new Shared(L, new Sprite(graphic, quad, origin), Jin_Lua_Sprite)); + LuaObject* p = luax_newinstance(L, Jin_Lua_Sprite, new Shared(L, new Sprite(graphic, quad, origin), Jin_Lua_Sprite)); } else if (n == 4) { @@ -746,19 +746,19 @@ namespace JinEngine quad.h = luax_rawgetnumberthenpop(L, 2, 4); int ox = luax_checkinteger(L, 3); int oy = luax_checkinteger(L, 4); - Proxy* p = luax_newinstance(L, Jin_Lua_Sprite, new Shared(L, new Sprite(graphic, quad, ox, oy), Jin_Lua_Sprite)); + LuaObject* p = luax_newinstance(L, Jin_Lua_Sprite, new Shared(L, new Sprite(graphic, quad, ox, oy), Jin_Lua_Sprite)); } else if (n == 2) { int o = luax_checkinteger(L, 2); Origin origin = static_cast(o); - Proxy* p = luax_newinstance(L, Jin_Lua_Sprite, new Shared(L, new Sprite(graphic, origin), Jin_Lua_Sprite)); + LuaObject* p = luax_newinstance(L, Jin_Lua_Sprite, new Shared(L, new Sprite(graphic, origin), Jin_Lua_Sprite)); } else if (n == 3) { int ox = luax_checkinteger(L, 2); int oy = luax_checkinteger(L, 3); - Proxy* p = luax_newinstance(L, Jin_Lua_Sprite, new Shared(L, new Sprite(graphic, ox, oy), Jin_Lua_Sprite)); + LuaObject* p = luax_newinstance(L, Jin_Lua_Sprite, new Shared(L, new Sprite(graphic, ox, oy), Jin_Lua_Sprite)); } else { @@ -772,18 +772,18 @@ namespace JinEngine LUA_IMPLEMENT int l_newSpriteSheet(lua_State* L) { - Proxy* pxyGraphic = nullptr; + LuaObject* pxyGraphic = nullptr; if (luax_istype(L, 1, Jin_Lua_Texture)) - pxyGraphic = (Proxy*)luax_checktype(L, 1, Jin_Lua_Texture); + pxyGraphic = (LuaObject*)luax_checktype(L, 1, Jin_Lua_Texture); else if(luax_istype(L, 1, Jin_Lua_Canvas)) - pxyGraphic = (Proxy*)luax_checktype(L, 1, Jin_Lua_Canvas); + pxyGraphic = (LuaObject*)luax_checktype(L, 1, Jin_Lua_Canvas); if (pxyGraphic != nullptr) { Graphic* graphic = pxyGraphic->getObject(); Shared* shrSSheet = new Shared(L, new SpriteSheet(graphic), Jin_Lua_SpriteSheet); Shared& shrGraphic = pxyGraphic->getShared(); shrSSheet->setDependency((int)SpriteSheetDependency::DEP_GRAPHIC, &shrGraphic); - Proxy* pxySSheet = luax_newinstance(L, Jin_Lua_SpriteSheet, shrSSheet); + LuaObject* pxySSheet = luax_newinstance(L, Jin_Lua_SpriteSheet, shrSSheet); return 1; } else @@ -808,7 +808,7 @@ namespace JinEngine for (int i = 1; i <= n; ++i) { luax_rawgeti(L, 1, i); - Proxy* pxySprite = (Proxy*)luax_checktype(L, -1, Jin_Lua_Sprite); + LuaObject* pxySprite = (LuaObject*)luax_checktype(L, -1, Jin_Lua_Sprite); Shared& shrSprite = pxySprite->getShared(); (*shrAnimation)->addFrame(shrSprite.getObject()); int index = (*shrAnimation)->getFrameCount() - 1; @@ -817,7 +817,7 @@ namespace JinEngine (*shrAnimation)->setLoop(loop); (*shrAnimation)->setSpeed(speed); } - Proxy* pxyAnimation = luax_newinstance(L, Jin_Lua_Animation, shrAnimation); + LuaObject* pxyAnimation = luax_newinstance(L, Jin_Lua_Animation, shrAnimation); return 1; } @@ -828,24 +828,24 @@ namespace JinEngine Shared* shrAniamtor = new Shared(L, new Animator(), Jin_Lua_Animator); if (argc >= 1) { - Proxy* pxyAnimation = (Proxy*)luax_checktype(L, 1, Jin_Lua_Animation); + LuaObject* pxyAnimation = (LuaObject*)luax_checktype(L, 1, Jin_Lua_Animation); Shared& shrAnimtion = pxyAnimation->getShared(); (*shrAniamtor)->setAnimation(shrAnimtion.getObject()); (*shrAniamtor).setDependency((int)AnimatorDependency::DEP_ANIMATION, &shrAnimtion); } - Proxy* pxyAnimator = luax_newinstance(L, Jin_Lua_Animator, shrAniamtor); + LuaObject* pxyAnimator = luax_newinstance(L, Jin_Lua_Animator, shrAniamtor); return 1; } /* newTextureFont(bitmap, text, color | cellw, cellh) */ LUA_IMPLEMENT int l_newTextureFont(lua_State* L) { - Proxy* p = (Proxy*)luax_checktype(L, 1, Jin_Lua_Bitmap); + LuaObject* p = (LuaObject*)luax_checktype(L, 1, Jin_Lua_Bitmap); Bitmap* bitmap = p->getObject(); Text* text; if (luax_istype(L, 2, Jin_Lua_Text)) { - Proxy* pt = (Proxy*)luax_checktype(L, 2, Jin_Lua_Text); + LuaObject* pt = (LuaObject*)luax_checktype(L, 2, Jin_Lua_Text); text = pt->getObject(); } else if (luax_isstring(L, 2)) @@ -884,7 +884,7 @@ namespace JinEngine // Delete temporary text. delete text; } - Proxy* proxy = luax_newinstance(L, Jin_Lua_TextureFont, new Shared(L, textureFont, Jin_Lua_TextureFont)); + LuaObject* luaObj = luax_newinstance(L, Jin_Lua_TextureFont, new Shared(L, textureFont, Jin_Lua_TextureFont)); return 1; } @@ -904,13 +904,13 @@ namespace JinEngine { if (luax_istype(L, 1, Jin_Lua_TTF)) { - Proxy* p = (Proxy*)luax_checktype(L, 1, Jin_Lua_TTF); + LuaObject* p = (LuaObject*)luax_checktype(L, 1, Jin_Lua_TTF); TTF* ttf = p->getObject(); context.curFont = ttf; } else if (luax_istype(L, 1, Jin_Lua_TextureFont)) { - Proxy* p = (Proxy*)luax_checktype(L, 1, Jin_Lua_TextureFont); + LuaObject* p = (LuaObject*)luax_checktype(L, 1, Jin_Lua_TextureFont); TextureFont* tf = p->getObject(); context.curFont = tf; } -- cgit v1.1-26-g67d0