Merge pull request #716 from GriffinRichards/read-map-offsets

Read MAP_OFFSET_W, MAP_OFFSET_H from project

include/config.h

@@ -15,11 +15,11 @@
 
 #include "events.h"
 
-static const QVersionNumber porymapVersion = QVersionNumber::fromString(PORYMAP_VERSION);
+extern const QVersionNumber porymapVersion;
 
-// In both versions the default new map border is a generic tree
-#define DEFAULT_BORDER_RSE (QList<uint16_t>{0x1D4, 0x1D5, 0x1DC, 0x1DD})
-#define DEFAULT_BORDER_FRLG (QList<uint16_t>{0x14, 0x15, 0x1C, 0x1D})
+// Distance in pixels from the edge of a GBA screen (240x160) to the center 16x16 pixels.
+#define GBA_H_DIST_TO_CENTER ((240-16)/2)
+#define GBA_V_DIST_TO_CENTER ((160-16)/2)
 
 #define CONFIG_BACKWARDS_COMPATABILITY
 
@@ -214,6 +214,8 @@ enum ProjectIdentifier {
     define_pals_total,
     define_tiles_per_metatile,
     define_map_size,
+    define_map_offset_width,
+    define_map_offset_height,
     define_mask_metatile,
     define_mask_collision,
     define_mask_elevation,
@@ -317,6 +319,7 @@ public:
         this->defaultMetatileId = 1;
         this->defaultElevation = 3;
         this->defaultCollision = 0;
+        this->defaultMapSize = QSize(20,20);
         this->defaultPrimaryTileset = "gTileset_General";
         this->prefabFilepath = QString();
         this->prefabImportPrompted = false;
@@ -328,8 +331,8 @@ public:
         this->eventIconPaths.clear();
         this->pokemonIconPaths.clear();
         this->collisionSheetPath = QString();
-        this->collisionSheetWidth = 2;
-        this->collisionSheetHeight = 16;
+        this->collisionSheetSize = QSize(2, 16);
+        this->playerViewDistance = QMargins(GBA_H_DIST_TO_CENTER, GBA_V_DIST_TO_CENTER, GBA_H_DIST_TO_CENTER, GBA_V_DIST_TO_CENTER);
         this->blockMetatileIdMask = 0x03FF;
         this->blockCollisionMask = 0x0C00;
         this->blockElevationMask = 0xF000;
@@ -382,6 +385,7 @@ public:
     uint16_t defaultMetatileId;
     uint16_t defaultElevation;
     uint16_t defaultCollision;
+    QSize defaultMapSize;
     QList<uint16_t> newMapBorderMetatileIds;
     QString defaultPrimaryTileset;
     QString defaultSecondaryTileset;
@@ -404,8 +408,8 @@ public:
     uint16_t unusedTileSplit;
     bool mapAllowFlagsEnabled;
     QString collisionSheetPath;
-    int collisionSheetWidth;
-    int collisionSheetHeight;
+    QSize collisionSheetSize;
+    QMargins playerViewDistance;
     QList<uint32_t> warpBehaviors;
     int maxEventsPerGroup;
 

include/core/map.h

@@ -22,10 +22,6 @@
 #define MAX_BORDER_WIDTH 255
 #define MAX_BORDER_HEIGHT 255
 
-// Number of metatiles to draw out from edge of map. Could allow modification of this in the future.
-// porymap will reflect changes to it, but the value is hard-coded in the projects at the moment
-#define BORDER_DISTANCE 7
-
 class LayoutPixmapItem;
 class CollisionPixmapItem;
 class BorderMetatilesPixmapItem;

include/core/maplayout.h

@@ -96,8 +96,8 @@ public:
     int getHeight() const { return height; }
     int getBorderWidth() const { return border_width; }
     int getBorderHeight() const { return border_height; }
-    int getBorderDrawWidth() const;
-    int getBorderDrawHeight() const;
+    QMargins getBorderMargins() const;
+    QRect getVisibleRect() const;
 
     bool isWithinBounds(int x, int y) const;
     bool isWithinBounds(const QRect &rect) const;

include/editor.h

@@ -119,6 +119,7 @@ public:
     void redrawEventPixmapItem(DraggablePixmapItem *item);
     qreal getEventOpacity(const Event *event) const;
 
+    void setPlayerViewRect(const QRectF &rect);
     void updateCursorRectPos(int x, int y);
     void setCursorRectVisible(bool visible);
 

include/project.h

@@ -226,30 +226,34 @@ public:
 
     static QString getExistingFilepath(QString filepath);
     void applyParsedLimits();
-
+    
     void setRegionMapEntries(const QHash<QString, MapSectionEntry> &entries);
     QHash<QString, MapSectionEntry> getRegionMapEntries() const;
 
     QSet<QString> getTopLevelMapFields() const;
 
+    int getMapDataSize(int width, int height) const;
+    int getMaxMapDataSize() const { return this->maxMapDataSize; }
+    int getMaxMapWidth() const;
+    int getMaxMapHeight() const;
+    bool mapDimensionsValid(int width, int height) const;
+    bool calculateDefaultMapSize();
+    QSize getDefaultMapSize() const { return this->defaultMapSize; }
+    QSize getMapSizeAddition() const { return this->mapSizeAddition; }
+
+    int getMaxEvents(Event::Group group) const;
+
     static QString getEmptyMapDefineName();
     static QString getDynamicMapDefineName();
     static QString getDynamicMapName();
     static QString getEmptySpeciesName();
-    static int getNumTilesPrimary();
-    static int getNumTilesTotal();
-    static int getNumMetatilesPrimary();
-    static int getNumMetatilesTotal();
-    static int getNumPalettesPrimary();
-    static int getNumPalettesTotal();
-    static int getMaxMapDataSize();
-    static int getDefaultMapDimension();
-    static int getMaxMapWidth();
-    static int getMaxMapHeight();
-    static int getMapDataSize(int width, int height);
-    static bool mapDimensionsValid(int width, int height);
-    bool calculateDefaultMapSize();
-    int getMaxEvents(Event::Group group);
+    static QMargins getMetatileViewDistance();
+    static int getNumTilesPrimary() { return num_tiles_primary; }
+    static int getNumTilesTotal() { return num_tiles_total; }
+    static int getNumMetatilesPrimary() { return num_metatiles_primary; }
+    static int getNumMetatilesTotal() { return Block::getMaxMetatileId() + 1; }
+    static int getNumPalettesPrimary(){ return num_pals_primary; }
+    static int getNumPalettesTotal() { return num_pals_total; }
     static QString getEmptyMapsecName();
     static QString getMapGroupPrefix();
 
@@ -315,15 +319,19 @@ private:
 
     QString findSpeciesIconPath(const QStringList &names) const;
 
-    int maxEventsPerGroup;
     int maxObjectEvents;
+    int maxMapDataSize;
+    QSize defaultMapSize;
+    QSize mapSizeAddition;
+
+    // TODO: These really shouldn't be static, they're specific to a single project.
+    //       We're making an assumption here that we only have one project open at a single time
+    //       (which is true, but then if that's the case we should have some global Project instance instead)
     static int num_tiles_primary;
     static int num_tiles_total;
     static int num_metatiles_primary;
     static int num_pals_primary;
     static int num_pals_total;
-    static int max_map_data_size;
-    static int default_map_dimension;
 
 signals:
     void fileChanged(const QString &filepath);

include/ui/movablerect.h

@@ -10,27 +10,28 @@
 class MovableRect : public QGraphicsRectItem
 {
 public:
-    MovableRect(bool *enabled, int width, int height, QRgb color);
+    MovableRect(bool *enabled, const QRectF &rect, const QRgb &color);
     QRectF boundingRect() const override {
         qreal penWidth = 4;
         return QRectF(-penWidth,
                       -penWidth,
-                      30 * 8 + penWidth * 2,
-                      20 * 8 + penWidth * 2);
+                      this->rect().width() + penWidth * 2,
+                      this->rect().height() + penWidth * 2);
     }
 
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) override {
         if (!(*enabled)) return;
         painter->setPen(this->color);
-        painter->drawRect(this->rect().x() - 2, this->rect().y() - 2, this->rect().width() + 3, this->rect().height() + 3);
-        painter->setPen(QColor(0, 0, 0));
-        painter->drawRect(this->rect().x() - 3, this->rect().y() - 3, this->rect().width() + 5, this->rect().height() + 5);
-        painter->drawRect(this->rect().x() - 1, this->rect().y() - 1, this->rect().width() + 1, this->rect().height() + 1);
+        painter->drawRect(this->rect() + QMargins(1,1,1,1)); // Fill
+        painter->setPen(Qt::black);
+        painter->drawRect(this->rect() + QMargins(2,2,2,2)); // Outer border
+        painter->drawRect(this->rect()); // Inner border
     }
     void updateLocation(int x, int y);
     bool *enabled;
 
 protected:
+    QRectF baseRect;
     QRgb color;
 };