mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-04 05:50:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix 8 Connected Fill escapes grid with "Stop At Grid" checked (fix #3564)

Browse Source
This commit is contained in:
Gaspar Capello 2022-11-23 08:39:36 -03:00 committed by David Capello
parent 8247d53642
commit 8f515da9f0
2 changed files with 89 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/doc/algorithm/floodfill.cpp
View File

@ -445,7 +445,7 @@ void floodfill(const Image* image,
p = FLOOD_LINE(c);
}
if (p->lpos-1 >= 0 &&
if (p->lpos-1 >= bounds.x &&
check_flood_line(image, mask, p->y+1, p->lpos-1, p->rpos, bounds,
src_color, tolerance, data, proc)) {
done = false;
@ -459,7 +459,7 @@ void floodfill(const Image* image,
p = FLOOD_LINE(c);
}
if (p->rpos-1 >= 0 &&
if (p->rpos-1 >= bounds.x &&
check_flood_line(image, mask, p->y+1, p->lpos, p->rpos-1, bounds,
src_color, tolerance, data, proc)) {
done = false;
@ -486,7 +486,7 @@ void floodfill(const Image* image,
p = FLOOD_LINE(c);
}
if (p->lpos-1 >= 0 &&
if (p->lpos-1 >= bounds.x &&
check_flood_line(image, mask, p->y-1, p->lpos-1, p->rpos, bounds,
src_color, tolerance, data, proc)) {
done = false;
@ -500,7 +500,7 @@ void floodfill(const Image* image,
p = FLOOD_LINE(c);
}
if (p->rpos-1 >= 0 &&
if (p->rpos-1 >= bounds.x &&
check_flood_line(image, mask, p->y-1, p->lpos, p->rpos-1, bounds,
src_color, tolerance, data, proc)) {
done = false;

86
tests/scripts/tools.lua
View File

@ -1,4 +1,4 @@
-- Copyright (C) 2019-2020 Igara Studio S.A.
-- Copyright (C) 2019-2022 Igara Studio S.A.
--
-- This file is released under the terms of the MIT license.
-- Read LICENSE.txt for more information.
@ -682,3 +682,87 @@ do
1, 2, 1,
1, 1, 1 })
end
----------------------------------------------------------------------
-- Floodfill + 8-Connected + Stop at Grid tests
----------------------------------------------------------------------
do
-- https://github.com/aseprite/aseprite/issues/3564
-- 8-Connected Fill Escapes Grid With "Stop At Grid" Checked
-- Magic Wand Test - Stop At Grid + pixel connectivity '8-connected':
local spr2 = Sprite(9, 9, ColorMode.INDEXED)
local p2 = spr2.palettes[1]
p2:setColor(0, Color{ r=0, g=0, b=0 })
p2:setColor(1, Color{ r=255, g=255, b=255 })
p2:setColor(2, Color{ r=255, g=0, b=0 })
-- Changing grid size:
spr2.gridBounds = Rectangle(0, 0, 3, 3)
-- Painting a white background
app.useTool {
tool='paint_bucket',
color=1,
points={ Point(0, 0) }
}
-- Configure magic wand settings
app.command.ShowGrid()
app.preferences.tool("magic_wand").floodfill.pixel_connectivity = 1
app.preferences.tool("magic_wand").floodfill.stop_at_grid = 2
app.preferences.tool("magic_wand").floodfill.refer_to = 0
app.preferences.tool("magic_wand").contiguous = true
app.useTool {
tool='magic_wand',
points={ Point(4, 4) }
}
-- Painting the selected area
app.useTool {
tool='paint_bucket',
color=0,
points={ Point(4, 4) }
}
expect_img(app.activeImage, { 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 0, 0, 0, 1, 1, 1,
1, 1, 1, 0, 0, 0, 1, 1, 1,
1, 1, 1, 0, 0, 0, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1 })
app.undo()
app.undo()
-- Paint Bucket Test - Stop At Grid + pixel connectivity '8-connected':
app.preferences.tool("paint_bucket").floodfill.pixel_connectivity = 1
app.preferences.tool("paint_bucket").floodfill.stop_at_grid = 1
app.preferences.tool("paint_bucket").floodfill.refer_to = 0
app.preferences.tool("paint_bucket").contiguous = true
app.useTool {
tool='paint_bucket',
color=2,
points={ Point(4, 4) }
}
expect_img(app.activeImage, { 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 2, 2, 2, 1, 1, 1,
1, 1, 1, 2, 2, 2, 1, 1, 1,
1, 1, 1, 2, 2, 2, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1 })
app.command.ShowGrid()
app.preferences.tool("magic_wand").floodfill.pixel_connectivity = 0
app.preferences.tool("magic_wand").floodfill.stop_at_grid = 0
app.preferences.tool("magic_wand").floodfill.refer_to = 0
app.preferences.tool("paint_bucket").floodfill.pixel_connectivity = 0
app.preferences.tool("paint_bucket").floodfill.stop_at_grid = 0
app.preferences.tool("paint_bucket").floodfill.refer_to = 0
end