funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2026-04-02 02:05:55 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support animations for all attributes (with masks)

Browse Source
This commit is contained in:
emb
2015-11-17 22:11:10 -06:00
parent 2621fb7c5f
commit 48e27d8d8c
1 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
RetroFE/Source/Lua/LuaImage.cpp
View File

@@ -305,6 +305,18 @@ int LuaImage::animate(lua_State *l)
return 0; return 0;
} }
template <class T>
static void BuildTableComponentInfo(lua_State *l, std::string name, unsigned char mask, ComponentData &newInfo, T &newParam) {
lua_pushstring (l, name.c_str());
lua_gettable(l, -2);
if(!lua_isnil(l, -1))
{
newInfo.setMask(mask);
newParam = (T)luaL_checknumber(l, -1);
}
lua_pop(l, 1);
}
int LuaImage::addAnimation(lua_State *l) int LuaImage::addAnimation(lua_State *l)
{ {
Image *i = (Image *)lua_tointeger(l, 1); Image *i = (Image *)lua_tointeger(l, 1);
@@ -319,35 +331,16 @@ int LuaImage::addAnimation(lua_State *l)
ComponentData newInfo; ComponentData newInfo;
newInfo.clearMask(COMPONENT_DATA_ALL_MASK); newInfo.clearMask(COMPONENT_DATA_ALL_MASK);
lua_pushstring (l, "x"); BuildTableComponentInfo<int>(l, "x", COMPONENT_DATA_X_MASK, newInfo, newInfo.x);
lua_gettable(l, -2); BuildTableComponentInfo<int>(l, "y", COMPONENT_DATA_Y_MASK, newInfo, newInfo.y);
if(!lua_isnil(l, -1)) BuildTableComponentInfo<int>(l, "height", COMPONENT_DATA_Y_MASK, newInfo, newInfo.height);
{ BuildTableComponentInfo<int>(l, "width", COMPONENT_DATA_Y_MASK, newInfo, newInfo.width);
newInfo.setMask(COMPONENT_DATA_X_MASK); BuildTableComponentInfo<float>(l, "rotate", COMPONENT_DATA_ROTATE_MASK, newInfo, newInfo.rotate);
newInfo.x = (int)luaL_optinteger(l, -1, i->info.x); BuildTableComponentInfo<float>(l, "alpha", COMPONENT_DATA_ROTATE_MASK, newInfo, newInfo.alpha);
}
lua_pop(l, 1);
lua_pushstring (l, "y");
lua_gettable(l, -2);
if(!lua_isnil(l, -1))
{
newInfo.setMask(COMPONENT_DATA_Y_MASK);
newInfo.y = (int)luaL_optinteger(l, -1, i->info.y);
}
lua_pop(l, 1);
lua_pushstring (l, "alpha");
lua_gettable(l, -2);
if(!lua_isnil(l, -1))
{
newInfo.setMask(COMPONENT_DATA_ALPHA_MASK);
newInfo.alpha = (float)luaL_optnumber(l, -1, i->info.alpha);
}
lua_pop(l, 1);
newInfo.duration = duration; newInfo.duration = duration;
i->addAnimation(newInfo); i->addAnimation(newInfo);
return 0; return 0;
} }