move map pixmap item and metatile rendering from Map to Layout

include/core/editcommands.h

@@ -7,8 +7,8 @@
 #include <QUndoCommand>
 #include <QList>
 
-class MapPixmapItem;
 class Map;
+class Layout;
 class Blockdata;
 class Event;
 class DraggablePixmapItem;
@@ -43,7 +43,7 @@ enum CommandId {
 /// onto the map using the pencil tool.
 class PaintMetatile : public QUndoCommand {
 public:
-    PaintMetatile(Map *map,
+    PaintMetatile(Layout *layout,
         const Blockdata &oldMetatiles, const Blockdata &newMetatiles,
         unsigned actionId, QUndoCommand *parent = nullptr);
 
@@ -54,7 +54,7 @@ public:
     int id() const override { return CommandId::ID_PaintMetatile; }
 
 private:
-    Map *map;
+    Layout *layout;
 
     Blockdata newMetatiles;
     Blockdata oldMetatiles;
@@ -68,10 +68,10 @@ private:
 /// on the metatile collision and elevation.
 class PaintCollision : public PaintMetatile {
 public:
-    PaintCollision(Map *map,
+    PaintCollision(Layout *layout,
         const Blockdata &oldCollision, const Blockdata &newCollision,
         unsigned actionId, QUndoCommand *parent = nullptr)
-    : PaintMetatile(map, oldCollision, newCollision, actionId, parent) {
+    : PaintMetatile(layout, oldCollision, newCollision, actionId, parent) {
         setText("Paint Collision");
     }
 
@@ -83,7 +83,7 @@ public:
 /// Implements a command to commit paint actions on the map border.
 class PaintBorder : public QUndoCommand {
 public:
-    PaintBorder(Map *map,
+    PaintBorder(Layout *layout,
         const Blockdata &oldBorder, const Blockdata &newBorder,
         unsigned actionId, QUndoCommand *parent = nullptr);
 
@@ -94,7 +94,7 @@ public:
     int id() const override { return CommandId::ID_PaintBorder; }
 
 private:
-    Map *map;
+    Layout *layout;
 
     Blockdata newBorder;
     Blockdata oldBorder;
@@ -108,10 +108,10 @@ private:
 /// with the bucket tool onto the map.
 class BucketFillMetatile : public PaintMetatile {
 public:
-    BucketFillMetatile(Map *map,
+    BucketFillMetatile(Layout *layout,
         const Blockdata &oldMetatiles, const Blockdata &newMetatiles,
         unsigned actionId, QUndoCommand *parent = nullptr)
-      : PaintMetatile(map, oldMetatiles, newMetatiles, actionId, parent) {
+      : PaintMetatile(layout, oldMetatiles, newMetatiles, actionId, parent) {
         setText("Bucket Fill Metatiles");
     }
 
@@ -124,10 +124,10 @@ public:
 /// on the metatile collision and elevation.
 class BucketFillCollision : public PaintCollision {
 public:
-    BucketFillCollision(Map *map,
+    BucketFillCollision(Layout *layout,
         const Blockdata &oldCollision, const Blockdata &newCollision,
         QUndoCommand *parent = nullptr)
-      : PaintCollision(map, oldCollision, newCollision, -1, parent) {
+      : PaintCollision(layout, oldCollision, newCollision, -1, parent) {
         setText("Flood Fill Collision");
     }
 
@@ -141,10 +141,10 @@ public:
 /// with the bucket or paint tool onto the map.
 class MagicFillMetatile : public PaintMetatile {
 public:
-    MagicFillMetatile(Map *map,
+    MagicFillMetatile(Layout *layout,
         const Blockdata &oldMetatiles, const Blockdata &newMetatiles,
         unsigned actionId, QUndoCommand *parent = nullptr)
-      : PaintMetatile(map, oldMetatiles, newMetatiles, actionId, parent) {
+      : PaintMetatile(layout, oldMetatiles, newMetatiles, actionId, parent) {
         setText("Magic Fill Metatiles");
     }
 
@@ -156,10 +156,10 @@ public:
 /// Implements a command to commit magic fill collision actions.
 class MagicFillCollision : public PaintCollision {
 public:
-    MagicFillCollision(Map *map,
+    MagicFillCollision(Layout *layout,
         const Blockdata &oldCollision, const Blockdata &newCollision,
         QUndoCommand *parent = nullptr)
-    : PaintCollision(map, oldCollision, newCollision, -1, parent) {
+    : PaintCollision(layout, oldCollision, newCollision, -1, parent) {
         setText("Magic Fill Collision");
     }
 
@@ -172,7 +172,7 @@ public:
 /// Implements a command to commit metatile shift actions.
 class ShiftMetatiles : public QUndoCommand {
 public:
-    ShiftMetatiles(Map *map,
+    ShiftMetatiles(Layout *layout,
         const Blockdata &oldMetatiles, const Blockdata &newMetatiles,
         unsigned actionId, QUndoCommand *parent = nullptr);
 
@@ -183,7 +183,7 @@ public:
     int id() const override { return CommandId::ID_ShiftMetatiles; }
 
 private:
-    Map *map;
+    Layout *layout= nullptr;
 
     Blockdata newMetatiles;
     Blockdata oldMetatiles;
@@ -196,7 +196,7 @@ private:
 /// Implements a command to commit a map or border resize action.
 class ResizeMap : public QUndoCommand {
 public:
-    ResizeMap(Map *map, QSize oldMapDimensions, QSize newMapDimensions,
+    ResizeMap(Layout *layout, QSize oldMapDimensions, QSize newMapDimensions,
         const Blockdata &oldMetatiles, const Blockdata &newMetatiles,
         QSize oldBorderDimensions, QSize newBorderDimensions,
         const Blockdata &oldBorder, const Blockdata &newBorder,
@@ -209,7 +209,7 @@ public:
     int id() const override { return CommandId::ID_ResizeMap; }
 
 private:
-    Map *map;
+    Layout *layout = nullptr;
 
     int oldMapWidth;
     int oldMapHeight;
@@ -342,6 +342,7 @@ public:
 
 
 
+// !TODO
 /// Implements a command to commit map edits from the scripting API.
 /// The scripting api can edit map/border blocks and dimensions.
 class ScriptEditMap : public QUndoCommand {

include/core/map.h

@@ -25,7 +25,7 @@
 // porymap will reflect changes to it, but the value is hard-coded in the projects at the moment
 #define BORDER_DISTANCE 7
 
-class MapPixmapItem;
+class LayoutPixmapItem;
 class CollisionPixmapItem;
 class BorderMetatilesPixmapItem;
 
@@ -58,7 +58,7 @@ public:
 
     QMap<QString, QJsonValue> customHeaders;
 
-    MapLayout *layout;
+    Layout *layout = nullptr;
 
     bool isPersistedToFile = true;
     bool hasUnsavedDataChanges = false;
@@ -76,6 +76,7 @@ public:
 
     QList<MapConnection*> connections;
 
+    // !TODO
     QList<int> metatileLayerOrder;
     QList<float> metatileLayerOpacity;
 
@@ -92,17 +93,19 @@ public:
     void modify();
     void clean();
 
-    QPixmap render(bool ignoreCache = false, MapLayout *fromLayout = nullptr, QRect bounds = QRect(0, 0, -1, -1));
+    QPixmap render(bool ignoreCache = false, Layout *fromLayout = nullptr, QRect bounds = QRect(0, 0, -1, -1));
     QPixmap renderCollision(bool ignoreCache);
-    QPixmap renderConnection(MapConnection, MapLayout *);
+    QPixmap renderConnection(MapConnection, Layout *);
     QPixmap renderBorder(bool ignoreCache = false);
 
     bool mapBlockChanged(int i, const Blockdata &cache);
     bool borderBlockChanged(int i, const Blockdata &cache);
 
+    // !TODO: remove
     void cacheBlockdata();
     void cacheCollision();
 
+    /// !TODO: remove this
     bool getBlock(int x, int y, Block *out);
     void setBlock(int x, int y, Block block, bool enableScriptCallback = false);
     void setBlockdata(Blockdata blockdata, bool enableScriptCallback = false);
@@ -133,8 +136,11 @@ public:
 
     void openScript(QString label);
 
-    MapPixmapItem *mapItem = nullptr;
-    void setMapItem(MapPixmapItem *item) { mapItem = item; }
+private:
+    LayoutPixmapItem *mapItem = nullptr;
+
+public:
+    void setMapItem(LayoutPixmapItem *item) { mapItem = item; }
 
     CollisionPixmapItem *collisionItem = nullptr;
     void setCollisionItem(CollisionPixmapItem *item) { collisionItem = item; }

include/core/maplayout.h

@@ -7,12 +7,17 @@
 #include <QImage>
 #include <QPixmap>
 #include <QString>
+#include <QUndoStack>
 
 class Map;
+class LayoutPixmapItem;
+class CollisionPixmapItem;
+class BorderMetatilesPixmapItem;
 
-class MapLayout {
+class Layout : public QObject {
+    Q_OBJECT
 public:
-    MapLayout() {}
+    Layout() {}
 
     static QString layoutConstantFromName(QString mapName);
 
@@ -39,8 +44,12 @@ public:
 
     Blockdata blockdata;
 
+    QImage image;
+    QPixmap pixmap;
     QImage border_image;
     QPixmap border_pixmap;
+    QImage collision_image;
+    QPixmap collision_pixmap;
 
     Blockdata border;
     Blockdata cached_blockdata;
@@ -53,10 +62,67 @@ public:
         QSize borderDimensions;
     } lastCommitBlocks; // to track map changes
 
+    QList<int> metatileLayerOrder;
+    QList<float> metatileLayerOpacity;
+
+    LayoutPixmapItem *layoutItem = nullptr;
+    CollisionPixmapItem *collisionItem = nullptr;
+    BorderMetatilesPixmapItem *borderItem = nullptr;
+
+    QUndoStack editHistory;
+
+public:
     int getWidth();
     int getHeight();
     int getBorderWidth();
     int getBorderHeight();
+
+    bool isWithinBounds(int x, int y) {
+        return (x >= 0 && x < this->getWidth() && y >= 0 && y < this->getHeight());
+    }
+
+    bool getBlock(int x, int y, Block *out);
+    void setBlock(int x, int y, Block block, bool enableScriptCallback = false);
+    void setBlockdata(Blockdata blockdata, bool enableScriptCallback = false);
+
+    void setDimensions(int newWidth, int newHeight, bool setNewBlockdata = true, bool enableScriptCallback = false);
+    void setBorderDimensions(int newWidth, int newHeight, bool setNewBlockdata = true, bool enableScriptCallback = false);
+
+    void cacheBlockdata();
+    void cacheCollision();
+    void clearBorderCache();
+    void cacheBorder();
+
+    bool layoutBlockChanged(int i, const Blockdata &cache);
+
+    uint16_t getBorderMetatileId(int x, int y);
+    void setBorderMetatileId(int x, int y, uint16_t metatileId, bool enableScriptCallback = false);
+    void setBorderBlockData(Blockdata blockdata, bool enableScriptCallback = false);
+
+    void floodFillCollisionElevation(int x, int y, uint16_t collision, uint16_t elevation);
+    void _floodFillCollisionElevation(int x, int y, uint16_t collision, uint16_t elevation);
+    void magicFillCollisionElevation(int x, int y, uint16_t collision, uint16_t elevation);
+
+    QPixmap render(bool ignoreCache = false, Layout *fromLayout = nullptr, QRect bounds = QRect(0, 0, -1, -1));
+    QPixmap renderCollision(bool ignoreCache);
+    // QPixmap renderConnection(MapConnection, Layout *);
+    QPixmap renderBorder(bool ignoreCache = false);
+
+    void setLayoutItem(LayoutPixmapItem *item) { layoutItem = item; }
+    void setCollisionItem(CollisionPixmapItem *item) { collisionItem = item; }
+    void setBorderItem(BorderMetatilesPixmapItem *item) { borderItem = item; }
+
+private:
+    void setNewDimensionsBlockdata(int newWidth, int newHeight);
+    void setNewBorderDimensionsBlockdata(int newWidth, int newHeight);
+
+signals:
+    void layoutChanged(Layout *layout);
+    void modified();
+    void layoutDimensionsChanged(const QSize &size);
+    void needsRedrawing();
 };
 
+using MapLayout = Layout;
+
 #endif // MAPLAYOUT_H

include/core/mapparser.h

@@ -10,7 +10,7 @@ class MapParser
 {
 public:
     MapParser();
-    MapLayout *parse(QString filepath, bool *error, Project *project);
+    Layout *parse(QString filepath, bool *error, Project *project);
 };
 
 #endif // MAPPARSER_H