|
|
@@ -1,18 +1,18 @@
|
|
|
-using PixiEditor.Models.Controllers;
|
|
|
+using PixiEditor.Models.Controllers;
|
|
|
using PixiEditor.Models.DataHolders;
|
|
|
using PixiEditor.Models.Layers;
|
|
|
using PixiEditor.Models.Position;
|
|
|
-using SkiaSharp;
|
|
|
+using SkiaSharp;
|
|
|
using System.Collections.Generic;
|
|
|
-using System.Diagnostics;
|
|
|
-
|
|
|
+using System.Diagnostics;
|
|
|
+
|
|
|
namespace PixiEditor.Models.Tools.Tools
|
|
|
{
|
|
|
public class FloodFill : BitmapOperationTool
|
|
|
- {
|
|
|
+ {
|
|
|
private BitmapManager BitmapManager { get; }
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
public FloodFill(BitmapManager bitmapManager)
|
|
|
{
|
|
|
ActionDisplay = "Press on an area to fill it.";
|
|
|
@@ -21,109 +21,108 @@ namespace PixiEditor.Models.Tools.Tools
|
|
|
|
|
|
public override string Tooltip => "Fills area with color. (G)";
|
|
|
|
|
|
- public override LayerChange[] Use(Layer layer, List<Coordinates> coordinates, SKColor color)
|
|
|
+ public override void Use(Layer layer, List<Coordinates> coordinates, SKColor color)
|
|
|
{
|
|
|
Stopwatch sw = new Stopwatch();
|
|
|
sw.Start();
|
|
|
- var res = Only(LinearFill(layer, coordinates[0], color), layer);
|
|
|
+ LinearFill(layer, coordinates[0], color);
|
|
|
sw.Stop();
|
|
|
Trace.WriteLine(sw.ElapsedMilliseconds);
|
|
|
- return res;
|
|
|
}
|
|
|
|
|
|
public BitmapPixelChanges LinearFill(Layer layer, Coordinates startingCoords, SKColor newColor)
|
|
|
{
|
|
|
List<Coordinates> changedCoords = new List<Coordinates>();
|
|
|
Queue<FloodFillRange> floodFillQueue = new Queue<FloodFillRange>();
|
|
|
- SKColor colorToReplace = layer.GetPixelWithOffset(startingCoords.X, startingCoords.Y);
|
|
|
- if ((colorToReplace.Alpha == 0 && newColor.Alpha == 0) ||
|
|
|
- colorToReplace == newColor)
|
|
|
- return BitmapPixelChanges.Empty;
|
|
|
-
|
|
|
+ SKColor colorToReplace = layer.GetPixelWithOffset(startingCoords.X, startingCoords.Y);
|
|
|
+ if ((colorToReplace.Alpha == 0 && newColor.Alpha == 0) ||
|
|
|
+ colorToReplace == newColor)
|
|
|
+ return BitmapPixelChanges.Empty;
|
|
|
+
|
|
|
int width = BitmapManager.ActiveDocument.Width;
|
|
|
- int height = BitmapManager.ActiveDocument.Height;
|
|
|
- if (startingCoords.X < 0 || startingCoords.Y < 0 || startingCoords.X >= width || startingCoords.Y >= height)
|
|
|
- return BitmapPixelChanges.Empty;
|
|
|
- var visited = new bool[width * height];
|
|
|
-
|
|
|
- PerformLinearFill(layer, changedCoords, floodFillQueue, startingCoords, width, colorToReplace, visited);
|
|
|
- PerformFloodFIll(layer, changedCoords, floodFillQueue, colorToReplace, width, height, visited);
|
|
|
-
|
|
|
+ int height = BitmapManager.ActiveDocument.Height;
|
|
|
+ if (startingCoords.X < 0 || startingCoords.Y < 0 || startingCoords.X >= width || startingCoords.Y >= height)
|
|
|
+ return BitmapPixelChanges.Empty;
|
|
|
+ var visited = new bool[width * height];
|
|
|
+
|
|
|
+ PerformLinearFill(layer, changedCoords, floodFillQueue, startingCoords, width, colorToReplace, visited);
|
|
|
+ PerformFloodFIll(layer, changedCoords, floodFillQueue, colorToReplace, width, height, visited);
|
|
|
+
|
|
|
return BitmapPixelChanges.FromSingleColoredArray(changedCoords, newColor);
|
|
|
}
|
|
|
|
|
|
- private void PerformLinearFill(
|
|
|
- Layer layer,
|
|
|
- List<Coordinates> changedCoords, Queue<FloodFillRange> floodFillQueue,
|
|
|
- public override LayderChange[] Use(Layer layer, List<Coordinates> coordinates, SKColor color)
|
|
|
- {
|
|
|
- // Find the Left Edge of the Color Area
|
|
|
- int fillXLeft = coords.X;
|
|
|
- while (true)
|
|
|
- {
|
|
|
- // Fill with the color
|
|
|
- changedCoords.Add(new Coordinates(fillXLeft, coords.Y));
|
|
|
-
|
|
|
- // Indicate that this pixel has already been checked and filled
|
|
|
- int pixelIndex = (coords.Y * width) + fillXLeft;
|
|
|
- visited[pixelIndex] = true;
|
|
|
-
|
|
|
- // Move one pixel to the left
|
|
|
- fillXLeft--;
|
|
|
- // Exit the loop if we're at edge of the bitmap or the color area
|
|
|
- if (fillXLeft < 0 || visited[pixelIndex - 1] || layer.GetPixelWithOffset(fillXLeft, coords.Y) != colorToReplace)
|
|
|
- break;
|
|
|
- }
|
|
|
- int lastFilledPixelLeft = fillXLeft + 1;
|
|
|
-
|
|
|
-
|
|
|
- // Find the Right Edge of the Color Area
|
|
|
- int fillXRight = coords.X;
|
|
|
- while (true)
|
|
|
- {
|
|
|
- changedCoords.Add(new Coordinates(fillXRight, coords.Y));
|
|
|
-
|
|
|
- int pixelIndex = (coords.Y * width) + fillXRight;
|
|
|
- visited[pixelIndex] = true;
|
|
|
-
|
|
|
- fillXRight++;
|
|
|
- if (fillXRight >= width || visited[pixelIndex + 1] || layer.GetPixelWithOffset(fillXRight, coords.Y) != colorToReplace)
|
|
|
- break;
|
|
|
+ private void PerformLinearFill(
|
|
|
+ Layer layer,
|
|
|
+ List<Coordinates> changedCoords, Queue<FloodFillRange> floodFillQueue,
|
|
|
+ Coordinates coords, int width, SKColor colorToReplace, bool[] visited)
|
|
|
+ {
|
|
|
+ // Find the Left Edge of the Color Area
|
|
|
+ int fillXLeft = coords.X;
|
|
|
+ while (true)
|
|
|
+ {
|
|
|
+ // Fill with the color
|
|
|
+ changedCoords.Add(new Coordinates(fillXLeft, coords.Y));
|
|
|
+
|
|
|
+ // Indicate that this pixel has already been checked and filled
|
|
|
+ int pixelIndex = (coords.Y * width) + fillXLeft;
|
|
|
+ visited[pixelIndex] = true;
|
|
|
+
|
|
|
+ // Move one pixel to the left
|
|
|
+ fillXLeft--;
|
|
|
+ // Exit the loop if we're at edge of the bitmap or the color area
|
|
|
+ if (fillXLeft < 0 || visited[pixelIndex - 1] || layer.GetPixelWithOffset(fillXLeft, coords.Y) != colorToReplace)
|
|
|
+ break;
|
|
|
}
|
|
|
- int lastFilledPixelRight = fillXRight - 1;
|
|
|
+ int lastFilledPixelLeft = fillXLeft + 1;
|
|
|
|
|
|
|
|
|
- FloodFillRange range = new FloodFillRange(lastFilledPixelLeft, lastFilledPixelRight, coords.Y);
|
|
|
- floodFillQueue.Enqueue(range);
|
|
|
+ // Find the Right Edge of the Color Area
|
|
|
+ int fillXRight = coords.X;
|
|
|
+ while (true)
|
|
|
+ {
|
|
|
+ changedCoords.Add(new Coordinates(fillXRight, coords.Y));
|
|
|
+
|
|
|
+ int pixelIndex = (coords.Y * width) + fillXRight;
|
|
|
+ visited[pixelIndex] = true;
|
|
|
+
|
|
|
+ fillXRight++;
|
|
|
+ if (fillXRight >= width || visited[pixelIndex + 1] || layer.GetPixelWithOffset(fillXRight, coords.Y) != colorToReplace)
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ int lastFilledPixelRight = fillXRight - 1;
|
|
|
+
|
|
|
+
|
|
|
+ FloodFillRange range = new FloodFillRange(lastFilledPixelLeft, lastFilledPixelRight, coords.Y);
|
|
|
+ floodFillQueue.Enqueue(range);
|
|
|
}
|
|
|
|
|
|
- private void PerformFloodFIll(
|
|
|
- Layer layer,
|
|
|
- List<Coordinates> changedCords, Queue<FloodFillRange> floodFillQueue,
|
|
|
- SKColor colorToReplace, int width, int height, bool[] pixelsVisited)
|
|
|
- {
|
|
|
- while (floodFillQueue.Count > 0)
|
|
|
- {
|
|
|
- FloodFillRange range = floodFillQueue.Dequeue();
|
|
|
-
|
|
|
- //START THE LOOP UPWARDS AND DOWNWARDS
|
|
|
- int upY = range.Y - 1; //so we can pass the y coord by ref
|
|
|
- int downY = range.Y + 1;
|
|
|
- int downPixelxIndex = (width * (range.Y + 1)) + range.StartX;
|
|
|
- int upPixelIndex = (width * (range.Y - 1)) + range.StartX;
|
|
|
- for (int i = range.StartX; i <= range.EndX; i++)
|
|
|
- {
|
|
|
- //START LOOP UPWARDS
|
|
|
- //if we're not above the top of the bitmap and the pixel above this one is within the color tolerance
|
|
|
- if (range.Y > 0 && (!pixelsVisited[upPixelIndex]) && layer.GetPixelWithOffset(i, upY) == colorToReplace)
|
|
|
- PerformLinearFill(layer, changedCords, floodFillQueue, new Coordinates(i, upY), width, colorToReplace, pixelsVisited);
|
|
|
- //START LOOP DOWNWARDS
|
|
|
- if (range.Y < (height - 1) && (!pixelsVisited[downPixelxIndex]) && layer.GetPixel(i, downY) == colorToReplace)
|
|
|
- PerformLinearFill(layer, changedCords, floodFillQueue, new Coordinates(i, downY), width, colorToReplace, pixelsVisited);
|
|
|
- downPixelxIndex++;
|
|
|
- upPixelIndex++;
|
|
|
- }
|
|
|
- }
|
|
|
+ private void PerformFloodFIll(
|
|
|
+ Layer layer,
|
|
|
+ List<Coordinates> changedCords, Queue<FloodFillRange> floodFillQueue,
|
|
|
+ SKColor colorToReplace, int width, int height, bool[] pixelsVisited)
|
|
|
+ {
|
|
|
+ while (floodFillQueue.Count > 0)
|
|
|
+ {
|
|
|
+ FloodFillRange range = floodFillQueue.Dequeue();
|
|
|
+
|
|
|
+ //START THE LOOP UPWARDS AND DOWNWARDS
|
|
|
+ int upY = range.Y - 1; //so we can pass the y coord by ref
|
|
|
+ int downY = range.Y + 1;
|
|
|
+ int downPixelxIndex = (width * (range.Y + 1)) + range.StartX;
|
|
|
+ int upPixelIndex = (width * (range.Y - 1)) + range.StartX;
|
|
|
+ for (int i = range.StartX; i <= range.EndX; i++)
|
|
|
+ {
|
|
|
+ //START LOOP UPWARDS
|
|
|
+ //if we're not above the top of the bitmap and the pixel above this one is within the color tolerance
|
|
|
+ if (range.Y > 0 && (!pixelsVisited[upPixelIndex]) && layer.GetPixelWithOffset(i, upY) == colorToReplace)
|
|
|
+ PerformLinearFill(layer, changedCords, floodFillQueue, new Coordinates(i, upY), width, colorToReplace, pixelsVisited);
|
|
|
+ //START LOOP DOWNWARDS
|
|
|
+ if (range.Y < (height - 1) && (!pixelsVisited[downPixelxIndex]) && layer.GetPixel(i, downY) == colorToReplace)
|
|
|
+ PerformLinearFill(layer, changedCords, floodFillQueue, new Coordinates(i, downY), width, colorToReplace, pixelsVisited);
|
|
|
+ downPixelxIndex++;
|
|
|
+ upPixelIndex++;
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
flabbet