From c6e0d017ea2dfffdab9680a2e73942c211806d76 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Fri, 4 Jan 2019 17:06:27 -0600
Subject: [PATCH] Add magic fill functionality

---
 include/ui/mappixmapitem.h |  1 +
 src/editor.cpp             | 16 +++++++++++--
 src/ui/mappixmapitem.cpp   | 47 +++++++++++++++++++++++++++++++++-----
 3 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/include/ui/mappixmapitem.h b/include/ui/mappixmapitem.h
index 812cb356..1f9aaf8a 100644
--- a/include/ui/mappixmapitem.h
+++ b/include/ui/mappixmapitem.h
@@ -26,6 +26,7 @@ public:
     QList<QPoint> selection;
     virtual void paint(QGraphicsSceneMouseEvent*);
     virtual void floodFill(QGraphicsSceneMouseEvent*);
+    virtual void magicFill(QGraphicsSceneMouseEvent*);
     void _floodFill(int x, int y);
     void _floodFillSmartPath(int initialX, int initialY);
     virtual void pick(QGraphicsSceneMouseEvent*);
diff --git a/src/editor.cpp b/src/editor.cpp
index f2f0d90c..deec11cc 100644
--- a/src/editor.cpp
+++ b/src/editor.cpp
@@ -431,7 +431,11 @@ void Editor::mouseEvent_map(QGraphicsSceneMouseEvent *event, MapPixmapItem *item
         if (event->buttons() & Qt::RightButton) {
             item->updateMetatileSelection(event);
         } else if (event->buttons() & Qt::MiddleButton) {
-            item->floodFill(event);
+            if (event->modifiers() & Qt::ControlModifier) {
+                item->magicFill(event);
+            } else {
+                item->floodFill(event);
+            }
         } else {
             item->paint(event);
         }
@@ -440,6 +444,8 @@ void Editor::mouseEvent_map(QGraphicsSceneMouseEvent *event, MapPixmapItem *item
     } else if (map_edit_mode == "fill") {
         if (event->buttons() & Qt::RightButton) {
             item->updateMetatileSelection(event);
+        } else if (event->modifiers() & Qt::ControlModifier) {
+            item->magicFill(event);
         } else {
             item->floodFill(event);
         }
@@ -459,7 +465,11 @@ void Editor::mouseEvent_collision(QGraphicsSceneMouseEvent *event, CollisionPixm
         if (event->buttons() & Qt::RightButton) {
             item->updateMovementPermissionSelection(event);
         } else if (event->buttons() & Qt::MiddleButton) {
-            item->floodFill(event);
+            if (event->modifiers() & Qt::ControlModifier) {
+                item->magicFill(event);
+            } else {
+                item->floodFill(event);
+            }
         } else {
             item->paint(event);
         }
@@ -468,6 +478,8 @@ void Editor::mouseEvent_collision(QGraphicsSceneMouseEvent *event, CollisionPixm
     } else if (map_edit_mode == "fill") {
         if (event->buttons() & Qt::RightButton) {
             item->pick(event);
+        } else if (event->modifiers() & Qt::ControlModifier) {
+            item->magicFill(event);
         } else {
             item->floodFill(event);
         }
diff --git a/src/ui/mappixmapitem.cpp b/src/ui/mappixmapitem.cpp
index 7a27c246..2b22762c 100644
--- a/src/ui/mappixmapitem.cpp
+++ b/src/ui/mappixmapitem.cpp
@@ -238,7 +238,7 @@ void MapPixmapItem::floodFill(QGraphicsSceneMouseEvent *event) {
             QList<uint16_t> *selectedMetatiles = this->metatileSelector->getSelectedMetatiles();
             QPoint selectionDimensions = this->metatileSelector->getSelectionDimensions();
             int tile = selectedMetatiles->first();
-            if (block && block->tile != tile) {
+            if (selectedMetatiles->count() > 1 || (block && block->tile != tile)) {
                 bool smartPathsEnabled = event->modifiers() & Qt::ShiftModifier;
                 if ((this->settings->smartPathsEnabled || smartPathsEnabled) && selectionDimensions.x() == 3 && selectionDimensions.y() == 3)
                     this->_floodFillSmartPath(x, y);
@@ -251,6 +251,43 @@ void MapPixmapItem::floodFill(QGraphicsSceneMouseEvent *event) {
     }
 }
 
+void MapPixmapItem::magicFill(QGraphicsSceneMouseEvent *event) {
+    if (map) {
+        if (event->type() == QEvent::GraphicsSceneMouseRelease) {
+            map->commit();
+        } else {
+            QPointF pos = event->pos();
+            int x = static_cast<int>(pos.x()) / 16;
+            int y = static_cast<int>(pos.y()) / 16;
+            Block *block = map->getBlock(x, y);
+            QList<uint16_t> *selectedMetatiles = this->metatileSelector->getSelectedMetatiles();
+            QPoint selectionDimensions = this->metatileSelector->getSelectionDimensions();
+            uint16_t tile = block->tile;
+            for (int curY = 0; curY < map->getWidth(); curY++) {
+                for (int curX = 0; curX < map->getWidth(); curX++) {
+                    Block *block = map->getBlock(curX, curY);
+                    if (!block) {
+                        continue;
+                    }
+
+                    int xDiff = curX - x;
+                    int yDiff = curY - y;
+                    int i = xDiff % selectionDimensions.x();
+                    int j = yDiff % selectionDimensions.y();
+                    if (i < 0) i = selectionDimensions.x() + i;
+                    if (j < 0) j = selectionDimensions.y() + j;
+                    if (block->tile == tile) {
+                        block->tile = selectedMetatiles->at(j * selectionDimensions.x() + i);
+                        map->_setBlock(curX, curY, *block);
+                    }
+                }
+            }
+        }
+
+        draw();
+    }
+}
+
 void MapPixmapItem::_floodFill(int initialX, int initialY) {
     QPoint selectionDimensions = this->metatileSelector->getSelectionDimensions();
     QList<uint16_t> *selectedMetatiles = this->metatileSelector->getSelectedMetatiles();
@@ -275,12 +312,10 @@ void MapPixmapItem::_floodFill(int initialX, int initialY) {
         if (j < 0) j = selectionDimensions.y() + j;
         uint16_t tile = selectedMetatiles->at(j * selectionDimensions.x() + i);
         uint16_t old_tile = block->tile;
-        if (old_tile == tile) {
-            continue;
+        if (selectedMetatiles->count() != 1 || old_tile != tile) {
+            block->tile = tile;
+            map->_setBlock(x, y, *block);
         }
-
-        block->tile = tile;
-        map->_setBlock(x, y, *block);
         if ((block = map->getBlock(x + 1, y)) && block->tile == old_tile) {
             todo.append(QPoint(x + 1, y));
         }