Clean up tile/metatile image changes

include/ui/imageproviders.h

@@ -37,7 +37,8 @@ QImage getMetatileSheetImage(Tileset *primaryTileset,
 
 QImage getTileImage(uint16_t, Tileset*, Tileset*);
 QImage getPalettedTileImage(uint16_t, Tileset*, Tileset*, int, bool useTruePalettes = false);
-QImage getGreyscaleTileImage(uint16_t tile, Tileset *primaryTileset, Tileset *secondaryTileset);
+QImage getColoredTileImage(uint16_t tileId, Tileset *primaryTileset, Tileset *secondaryTileset, const QList<QRgb> &palette);
+QImage getGreyscaleTileImage(uint16_t tileId, Tileset *primaryTileset, Tileset *secondaryTileset);
 
 void flattenTo4bppImage(QImage * image);
 

include/ui/metatileimageexporter.h

@@ -89,8 +89,6 @@ private:
     void syncMetatileWidth();
     void validateMetatileStart();
     void validateMetatileEnd();
-    uint16_t getExpectedMetatileStart();
-    uint16_t getExpectedMetatileEnd();
     void updateMetatileRange();
     void copyRenderSettings();
     void restoreRenderSettings();

include/ui/metatilelayersitem.h

@@ -26,7 +26,7 @@ private:
 signals:
     void tileChanged(int, int);
     void selectedTilesChanged(QPoint, int, int);
-    void hoveredTileChanged(uint16_t);
+    void hoveredTileChanged(const Tile &tile);
     void hoveredTileCleared();
 protected:
     void mousePressEvent(QGraphicsSceneMouseEvent*);

include/ui/metatileselector.h

@@ -31,7 +31,7 @@ struct MetatileSelection
 class MetatileSelector: public SelectablePixmapItem {
     Q_OBJECT
 public:
-    MetatileSelector(int numMetatilesWide, Layout *layout): SelectablePixmapItem(Metatile::pixelWidth(), Metatile::pixelHeight()) {
+    MetatileSelector(int numMetatilesWide, Layout *layout): SelectablePixmapItem(Metatile::pixelSize()) {
         this->externalSelection = false;
         this->prefabSelection = false;
         this->numMetatilesWide = numMetatilesWide;
@@ -41,16 +41,16 @@ public:
         setAcceptHoverEvents(true);
     }
 
-    QPoint getSelectionDimensions() override;
+    QPoint getSelectionDimensions() const override;
     void draw() override;
     void refresh();
 
     bool select(uint16_t metatile);
     void selectFromMap(uint16_t metatileId, uint16_t collision, uint16_t elevation);
-    MetatileSelection getMetatileSelection();
+    MetatileSelection getMetatileSelection() const { return this->selection; }
     void setPrefabSelection(MetatileSelection selection);
-    void setExternalSelection(int, int, QList<uint16_t>, QList<QPair<uint16_t, uint16_t>>);
-    QPoint getMetatileIdCoordsOnWidget(uint16_t);
+    void setExternalSelection(int, int, const QList<uint16_t>&, const QList<QPair<uint16_t, uint16_t>>&);
+    QPoint getMetatileIdCoordsOnWidget(uint16_t metatileId) const;
     void setLayout(Layout *layout);
     bool isInternalSelection() const { return (!this->externalSelection && !this->prefabSelection); }
 
@@ -79,8 +79,9 @@ private:
     void updateBasePixmap();
     void updateSelectedMetatiles();
     void updateExternalSelectedMetatiles();
-    uint16_t getMetatileId(int x, int y) const;
-    QPoint getMetatileIdCoords(uint16_t);
+    uint16_t posToMetatileId(int x, int y, bool *ok = nullptr) const;
+    uint16_t posToMetatileId(const QPoint &pos, bool *ok = nullptr) const;
+    QPoint metatileIdToPos(uint16_t metatileId, bool *ok = nullptr) const;
     bool positionIsValid(const QPoint &pos) const;
     bool selectionIsValid();
     void hoverChanged();

include/ui/selectablepixmapitem.h

@@ -19,7 +19,7 @@ public:
           selectionOffsetX(0),
           selectionOffsetY(0)
         {}
-    virtual QPoint getSelectionDimensions();
+    virtual QPoint getSelectionDimensions() const;
     virtual void draw() = 0;
 
 protected:
@@ -33,7 +33,8 @@ protected:
     int selectionOffsetY;
 
     QPoint getSelectionStart();
-    void select(int, int, int, int);
+    void select(int x, int y, int width = 0, int height = 0);
+    void select(const QPoint &pos, const QSize &size = QSize(0,0)) { select(pos.x(), pos.y(), size.width(), size.height()); }
     void updateSelection(int, int);
     QPoint getCellPos(QPointF);
     virtual void mousePressEvent(QGraphicsSceneMouseEvent*) override;

include/ui/tileseteditor.h

@@ -62,6 +62,7 @@ private slots:
     void onWindowActivated();
     void onHoveredMetatileChanged(uint16_t);
     void onHoveredMetatileCleared();
+    void onHoveredTileChanged(const Tile&);
     void onHoveredTileChanged(uint16_t);
     void onHoveredTileCleared();
     void onSelectedTilesChanged();

include/ui/tileseteditormetatileselector.h

@@ -18,9 +18,9 @@ public:
 
     bool select(uint16_t metatileId);
     void setTilesets(Tileset*, Tileset*);
-    uint16_t getSelectedMetatileId();
+    uint16_t getSelectedMetatileId() const { return this->selectedMetatileId; }
     void updateSelectedMetatile();
-    QPoint getMetatileIdCoordsOnWidget(uint16_t metatileId);
+    QPoint getMetatileIdCoordsOnWidget(uint16_t metatileId) const;
 
     QVector<uint16_t> usedMetatiles;
     bool selectorShowUnused = false;
@@ -44,11 +44,12 @@ private:
     int numMetatilesWide;
     int numMetatilesHigh;
     void updateBasePixmap();
-    uint16_t getMetatileId(int x, int y);
-    QPoint getMetatileIdCoords(uint16_t);
+    uint16_t posToMetatileId(int x, int y, bool *ok = nullptr) const;
+    uint16_t posToMetatileId(const QPoint &pos, bool *ok = nullptr) const;
+    QPoint metatileIdToPos(uint16_t metatileId, bool *ok = nullptr) const;
     bool shouldAcceptEvent(QGraphicsSceneMouseEvent*);
-    int numRows(int numMetatiles);
-    int numRows();
+    int numRows(int numMetatiles) const;
+    int numRows() const;
     void drawGrid();
     void drawDivider();
     void drawFilters();

include/ui/tileseteditortileselector.h

@@ -18,8 +18,8 @@ public:
         this->paletteChanged = false;
         setAcceptHoverEvents(true);
     }
-    QPoint getSelectionDimensions();
-    void draw();
+    QPoint getSelectionDimensions() const override;
+    void draw() override;
     void select(uint16_t metatileId);
     void highlight(uint16_t metatileId);
     void setTilesets(Tileset*, Tileset*);
@@ -36,11 +36,11 @@ public:
     bool showDivider = false;
 
 protected:
-    void mousePressEvent(QGraphicsSceneMouseEvent*);
-    void mouseMoveEvent(QGraphicsSceneMouseEvent*);
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent*);
-    void hoverMoveEvent(QGraphicsSceneHoverEvent*);
-    void hoverLeaveEvent(QGraphicsSceneHoverEvent*);
+    void mousePressEvent(QGraphicsSceneMouseEvent*) override;
+    void mouseMoveEvent(QGraphicsSceneMouseEvent*) override;
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent*) override;
+    void hoverMoveEvent(QGraphicsSceneHoverEvent*) override;
+    void hoverLeaveEvent(QGraphicsSceneHoverEvent*) override;
 
 private:
     QPixmap basePixmap;