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

Fix backward compatibility with Image:drawImage(image, x, y) was broken (fix #3788)

Browse Source
This commit is contained in:
Gaspar Capello 2023-04-04 09:54:38 -03:00 committed by David Capello
parent e577852eb4
commit 2b3372df0e
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/app/script/image_class.cpp
View File

@ -251,14 +251,23 @@ int Image_drawImage(lua_State* L)
auto sprite = get_obj<ImageObj>(L, 2);
gfx::Point pos = convert_args_into_point(L, 3);
// Arguments index fix to support the following cases:
// - Image:drawImage(image, x, y, opacity, blendMode)
// - Image:drawImage(image, Point(x, y), opacity, blendMode)
// - Image:drawImage(image, {x, y}, opacity, blendMode)
// - Image:drawImage(image, {x=x1, y=y1}, opacity, blendMode)
int argsFix = 0;
if (lua_isinteger(L, 3))
argsFix = 1;
int opacity = 255;
if (lua_isinteger(L, 4))
opacity = std::clamp(int(lua_tointeger(L, 4)), 0, 255);
if (lua_isinteger(L, 4 + argsFix))
opacity = std::clamp(int(lua_tointeger(L, 4 + argsFix)), 0, 255);
doc::BlendMode blendMode = doc::BlendMode::NORMAL;
if (lua_isinteger(L, 5)) {
if (lua_isinteger(L, 5 + argsFix)) {
blendMode = base::convert_to<doc::BlendMode>(
app::script::BlendMode(lua_tointeger(L, 5)));
app::script::BlendMode(lua_tointeger(L, 5 + argsFix)));
}
Image* dst = obj->image(L);