Enforce tile/metatile limits on load, fix tile selector performance

include/core/tile.h

@@ -29,6 +29,7 @@ public:
     static constexpr int pixelWidth() { return 8; }
     static constexpr int pixelHeight() { return 8; }
     static constexpr QSize pixelSize() { return QSize(Tile::pixelWidth(), Tile::pixelHeight()); }
+    static constexpr int sizeInBytes() { return sizeof(uint16_t); }
 };
 
 inline bool operator==(const Tile &a, const Tile &b) {

include/core/tileset.h

@@ -30,10 +30,8 @@ public:
     QString metatile_attrs_label;
     QString metatile_attrs_path;
     QString tilesImagePath;
-    QImage tilesImage;
     QStringList palettePaths;
 
-    QList<QImage> tiles;
     QHash<int, QString> metatileLabels;
     QList<QList<QRgb>> palettes;
     QList<QList<QRgb>> palettePreviews;
@@ -77,15 +75,24 @@ public:
     void setMetatiles(const QList<Metatile*> &metatiles);
     void addMetatile(Metatile* metatile);
 
-    QList<Metatile*> metatiles() const { return m_metatiles; }
+    const QList<Metatile*> &metatiles() const { return m_metatiles; }
     Metatile* metatileAt(unsigned int i) const { return m_metatiles.at(i); }
 
     void clearMetatiles();
     void resizeMetatiles(int newNumMetatiles);
     int numMetatiles() const { return m_metatiles.length(); }
+    int maxMetatiles() const;
+
+    int numTiles() const { return m_tiles.length(); }
+    int maxTiles() const;
+
+    QImage tileImage(uint16_t tileId) const { return m_tiles.value(Tile::getIndexInTileset(tileId)); }
 
 private:
     QList<Metatile*> m_metatiles;
+
+    QList<QImage> m_tiles;
+    QImage m_tilesImage;
     bool m_hasUnsavedTilesImage = false;
 };
 

include/project.h

@@ -255,10 +255,13 @@ public:
     static QMargins getMetatileViewDistance();
     static int getNumTilesPrimary() { return num_tiles_primary; }
     static int getNumTilesTotal() { return num_tiles_total; }
+    static int getNumTilesSecondary() { return getNumTilesTotal() - getNumTilesPrimary(); }
     static int getNumMetatilesPrimary() { return num_metatiles_primary; }
     static int getNumMetatilesTotal() { return Block::getMaxMetatileId() + 1; }
+    static int getNumMetatilesSecondary() { return getNumMetatilesTotal() - getNumMetatilesPrimary(); }
     static int getNumPalettesPrimary(){ return num_pals_primary; }
     static int getNumPalettesTotal() { return num_pals_total; }
+    static int getNumPalettesSecondary() { return getNumPalettesTotal() - getNumPalettesPrimary(); }
     static QString getEmptyMapsecName();
     static QString getMapGroupPrefix();
 

include/ui/tileseteditortileselector.h

@@ -43,6 +43,7 @@ protected:
     void hoverLeaveEvent(QGraphicsSceneHoverEvent*);
 
 private:
+    QPixmap basePixmap;
     bool externalSelection;
     int externalSelectionWidth;
     int externalSelectionHeight;
@@ -63,7 +64,7 @@ private:
     QList<QRgb> getCurPaletteTable();
     QList<Tile> buildSelectedTiles(int, int, QList<Tile>);
     QImage buildImage(int tileIdStart, int numTiles);
-
+    void updateBasePixmap();
     void drawUnused();
 
 signals: