RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 12:07:45 +00:00
Code Issues Activity Actions

PaintBrush: Use a Queue<Point> for the flood fill.

Browse source
This commit is contained in:
Andreas Kling 2019-06-15 10:39:45 +02:00
parent bfaa74f076
commit a8b2b96f38
1 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Applications/PaintBrush/BucketTool.cpp
View file

@ -1,5 +1,6 @@
#include "BucketTool.h" #include "BucketTool.h"
#include "PaintableWidget.h" #include "PaintableWidget.h"
#include <AK/Queue.h>
#include <AK/SinglyLinkedList.h> #include <AK/SinglyLinkedList.h>
#include <LibGUI/GPainter.h> #include <LibGUI/GPainter.h>
#include <SharedGraphics/GraphicsBitmap.h> #include <SharedGraphics/GraphicsBitmap.h>
@ -15,16 +16,10 @@ BucketTool::~BucketTool()
static void flood_fill(GraphicsBitmap& bitmap, const Point& start_position, Color target_color, Color fill_color) static void flood_fill(GraphicsBitmap& bitmap, const Point& start_position, Color target_color, Color fill_color)
{ {
Vector<Point> queue; Queue<Point> queue;
queue.append(start_position); queue.enqueue(Point(start_position));
int queue_pos = 0; while (!queue.is_empty()) {
while (queue_pos != queue.size()) { auto position = queue.dequeue();
auto position = queue[queue_pos++];
if (queue_pos > 4096) {
queue.shift_left(4096);
queue_pos = 0;
}
if (!bitmap.rect().contains(position)) if (!bitmap.rect().contains(position))
continue; continue;
@ -33,16 +28,16 @@ static void flood_fill(GraphicsBitmap& bitmap, const Point& start_position, Colo
bitmap.set_pixel(position, fill_color); bitmap.set_pixel(position, fill_color);
if (position.x() != 0) if (position.x() != 0)
queue.append(position.translated(0, -1)); queue.enqueue(position.translated(0, -1));
if (position.x() != bitmap.width() - 1) if (position.x() != bitmap.width() - 1)
queue.append(position.translated(0, 1)); queue.enqueue(position.translated(0, 1));
if (position.y() != 0) if (position.y() != 0)
queue.append(position.translated(-1, 0)); queue.enqueue(position.translated(-1, 0));
if (position.y() != bitmap.height() - 1) if (position.y() != bitmap.height() - 1)
queue.append(position.translated(1, 0)); queue.enqueue(position.translated(1, 0));
} }
} }