Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Optimize floodfilling for expansion #1707

Merged
merged 12 commits into from
Apr 29, 2022
Merged

Optimize floodfilling for expansion #1707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
843f650
Optimize floodfill algorithm
MrStevns Apr 2, 2022
4d0e6a7
Speedup pixel search
MrStevns Apr 3, 2022
49d1f06
Use filledPixel array for expandFill
scribblemaniac Apr 4, 2022
5c04f27
Fix bugs where expand algorithm didn't fill properly
MrStevns Apr 8, 2022
3bace61
Optimize floodfill search for contours
MrStevns Apr 8, 2022
a93b0ce
Simplify expand algorithm
MrStevns Apr 8, 2022
ab4b5c4
Use bit shift for compareColor ^2 operations
scribblemaniac Apr 2, 2022
8c0fabf
Optimize flood fill of when expanding the target image
scribblemaniac Apr 13, 2022
c89ebb4
Merge pull request #19 from scribblemaniac/bucket-tool-optimizations2
MrStevns Apr 13, 2022
f4b352c
Fix tests
MrStevns Apr 13, 2022
bdbea96
Fix memory error if targetImage->mBounds > maxBounds
scribblemaniac Apr 13, 2022
f34ecec
Merge branch 'master' into bucket-tool-optimizations2
MrStevns Apr 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 12 additions & 14 deletions core_lib/src/graphics/bitmap/bitmapbucket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,43 +149,40 @@ void BitmapBucket::paint(const QPointF updatedPoint, std::function<void(BucketSt
fillColor = tempColor.rgba();
}

BitmapImage replaceImage = BitmapImage(targetImage->bounds(), Qt::transparent);
BitmapImage* replaceImage = nullptr;

int expandValue = mProperties.bucketFillExpandEnabled ? mProperties.bucketFillExpand : 0;
bool didFloodFill = BitmapImage::floodFill(&replaceImage,
&referenceImage,
cameraRect,
point,
fillColor,
tolerance);
tolerance,
expandValue);

if (!didFloodFill) {
delete replaceImage;
return;
}
Q_ASSERT(replaceImage != nullptr);

state(BucketState::WillFillTarget, targetLayerIndex, currentFrameIndex);

if (mProperties.bucketFillExpandEnabled)
{
BitmapImage::expandFill(&replaceImage,
fillColor,
mProperties.bucketFillExpand);
}

if (mProperties.fillMode == 0)
{
targetImage->paste(&replaceImage);
targetImage->paste(replaceImage);
}
else if (mProperties.fillMode == 2)
{
targetImage->paste(&replaceImage, QPainter::CompositionMode_DestinationOver);
targetImage->paste(replaceImage, QPainter::CompositionMode_DestinationOver);
}
else
{
// fill mode replace
targetImage->paste(&replaceImage, QPainter::CompositionMode_DestinationOut);
targetImage->paste(replaceImage, QPainter::CompositionMode_DestinationOut);
// Reduce the opacity of the fill to match the new color
BitmapImage properColor(replaceImage.bounds(), QColor::fromRgba(origColor));
properColor.paste(&replaceImage, QPainter::CompositionMode_DestinationIn);
BitmapImage properColor(replaceImage->bounds(), QColor::fromRgba(origColor));
properColor.paste(replaceImage, QPainter::CompositionMode_DestinationIn);
// Write reduced-opacity fill image on top of target image
targetImage->paste(&properColor);
}
Expand All @@ -194,6 +191,7 @@ void BitmapBucket::paint(const QPointF updatedPoint, std::function<void(BucketSt
mFirstPaint = false;

targetImage->modification();
delete replaceImage;

state(BucketState::DidFillTarget, targetLayerIndex, currentFrameIndex);
}
Expand Down
Loading