mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-30 15:32:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

lua: add support to use ipairs() with some collections (sprites/tags/slices/layers/frames/cels)

Browse Source
This commit is contained in:
David Capello 2018-09-12 18:36:41 -03:00
parent 02388e2d6a
commit ce9f064438
6 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/script/cels_class.cpp
View File

@ -50,9 +50,10 @@ int Cels_index(lua_State* L)
{ {
auto obj = get_obj<CelsObj>(L, 1); auto obj = get_obj<CelsObj>(L, 1);
const int i = lua_tointeger(L, 2); const int i = lua_tointeger(L, 2);
if (i < 1 || i > obj->cels.size()) if (i >= 1 && i <= obj->cels.size())
return luaL_error(L, "index out of bounds %d", i);
push_ptr<Cel>(L, obj->cels[i-1]); push_ptr<Cel>(L, obj->cels[i-1]);
else
lua_pushnil(L);
return 1; return 1;
} }

5
src/app/script/frames_class.cpp
View File

@ -45,9 +45,10 @@ int Frames_index(lua_State* L)
{ {
auto obj = get_obj<FramesObj>(L, 1); auto obj = get_obj<FramesObj>(L, 1);
const int i = lua_tonumber(L, 2); const int i = lua_tonumber(L, 2);
if (i < 1 || i > obj->sprite->totalFrames()) if (i >= 1 && i <= obj->sprite->totalFrames())
return luaL_error(L, "index out of bounds %d", i);
push_sprite_frame(L, obj->sprite, i-1); push_sprite_frame(L, obj->sprite, i-1);
else
lua_pushnil(L);
return 1; return 1;
} }

5
src/app/script/layers_class.cpp
View File

@ -48,9 +48,10 @@ int Layers_index(lua_State* L)
{ {
auto obj = get_obj<LayersObj>(L, 1); auto obj = get_obj<LayersObj>(L, 1);
const int i = lua_tonumber(L, 2); const int i = lua_tonumber(L, 2);
if (i < 1 || i > int(obj->layers.size())) if (i >= 1 && i <= int(obj->layers.size()))
return luaL_error(L, "index out of bounds %d", i);
push_ptr<Layer>(L, obj->layers[i-1]); push_ptr<Layer>(L, obj->layers[i-1]);
else
lua_pushnil(L);
return 1; return 1;
} }

5
src/app/script/slices_class.cpp
View File

@ -44,9 +44,10 @@ int Slices_index(lua_State* L)
auto obj = get_obj<SlicesObj>(L, 1); auto obj = get_obj<SlicesObj>(L, 1);
auto& slices = obj->sprite->slices(); auto& slices = obj->sprite->slices();
const int i = lua_tonumber(L, 2); const int i = lua_tonumber(L, 2);
if (i < 1 || i > int(slices.size())) if (i >= 1 && i <= int(slices.size()))
return luaL_error(L, "index out of bounds %d", i);
push_ptr<Slice>(L, *(slices.begin()+i-1)); push_ptr<Slice>(L, *(slices.begin()+i-1));
else
lua_pushnil(L);
return 1; return 1;
} }

5
src/app/script/sprites_class.cpp
View File

@ -52,9 +52,10 @@ int Sprites_index(lua_State* L)
{ {
auto obj = get_obj<SpritesObj>(L, 1); auto obj = get_obj<SpritesObj>(L, 1);
const int i = lua_tonumber(L, 2); const int i = lua_tonumber(L, 2);
if (i < 1 || i > int(obj->docs.size())) if (i >= 1 && i <= int(obj->docs.size()))
return luaL_error(L, "index out of bounds %d", i);
push_ptr<Sprite>(L, obj->docs[i-1]->sprite()); push_ptr<Sprite>(L, obj->docs[i-1]->sprite());
else
lua_pushnil(L);
return 1; return 1;
} }

5
src/app/script/tags_class.cpp
View File

@ -46,9 +46,10 @@ int Tags_index(lua_State* L)
auto obj = get_obj<TagsObj>(L, 1); auto obj = get_obj<TagsObj>(L, 1);
auto& tags = obj->sprite->frameTags(); auto& tags = obj->sprite->frameTags();
const int i = lua_tonumber(L, 2); const int i = lua_tonumber(L, 2);
if (i < 1 || i > int(tags.size())) if (i >= 1 && i <= int(tags.size()))
return luaL_error(L, "index out of bounds %d", i);
push_ptr<FrameTag>(L, *(tags.begin()+i-1)); push_ptr<FrameTag>(L, *(tags.begin()+i-1));
else
lua_pushnil(L);
return 1; return 1;
} }