Merge branch 'master' of github.com:huderlem/porymap

editor.h

@@ -1,440 +0,0 @@
-#ifndef EDITOR_H
-#define EDITOR_H
-
-#include <QGraphicsScene>
-#include <QGraphicsItemGroup>
-#include <QGraphicsSceneMouseEvent>
-#include <QGraphicsItemAnimation>
-#include <QComboBox>
-#include <QCheckBox>
-#include <QCursor>
-
-#include "project.h"
-#include "ui_mainwindow.h"
-
-class DraggablePixmapItem;
-class MapPixmapItem;
-class CollisionPixmapItem;
-class ConnectionPixmapItem;
-class MetatilesPixmapItem;
-class BorderMetatilesPixmapItem;
-class CurrentSelectedMetatilesPixmapItem;
-class MovementPermissionsPixmapItem;
-
-#define SWAP(a, b) do { if (a != b) { a ^= b; b ^= a; a ^= b; } } while (0)
-
-class Editor : public QObject
-{
-    Q_OBJECT
-public:
-    Editor(Ui::MainWindow* ui);
-public:
-    Ui::MainWindow* ui;
-    QObject *parent = nullptr;
-    Project *project = nullptr;
-    Map *map = nullptr;
-    void saveProject();
-    void save();
-    void undo();
-    void redo();
-    void setMap(QString map_name);
-    void updateCurrentMetatilesSelection();
-    void displayMap();
-    void displayMetatiles();
-    void displayBorderMetatiles();
-    void displayCurrentMetatilesSelection();
-    void redrawCurrentMetatilesSelection();
-    void displayCollisionMetatiles();
-    void displayElevationMetatiles();
-    void displayMapEvents();
-    void displayMapConnections();
-    void displayMapBorder();
-    void displayMapGrid();
-
-    void setEditingMap();
-    void setEditingCollision();
-    void setEditingObjects();
-    void setEditingConnections();
-    void setCurrentConnectionDirection(QString curDirection);
-    void updateCurrentConnectionDirection(QString curDirection);
-    void setConnectionsVisibility(bool visible);
-    void updateConnectionOffset(int offset);
-    void setConnectionMap(QString mapName);
-    void addNewConnection();
-    void removeCurrentConnection();
-    void updateDiveMap(QString mapName);
-    void updateEmergeMap(QString mapName);
-    void setSelectedConnectionFromMap(QString mapName);
-    void updatePrimaryTileset(QString tilesetLabel);
-    void updateSecondaryTileset(QString tilesetLabel);
-    void toggleBorderVisibility(bool visible);
-
-    DraggablePixmapItem *addMapEvent(Event *event);
-    void selectMapEvent(DraggablePixmapItem *object);
-    void selectMapEvent(DraggablePixmapItem *object, bool toggle);
-    DraggablePixmapItem *addNewEvent(QString event_type);
-    Event* createNewEvent(QString event_type);
-    void deleteEvent(Event *);
-    void updateSelectedEvents();
-    void redrawObject(DraggablePixmapItem *item);
-    QList<DraggablePixmapItem *> *getObjects();
-
-    QGraphicsScene *scene = nullptr;
-    QGraphicsPixmapItem *current_view = nullptr;
-    MapPixmapItem *map_item = nullptr;
-    ConnectionPixmapItem* selected_connection_item = nullptr;
-    QList<QGraphicsPixmapItem*> connection_items;
-    QList<ConnectionPixmapItem*> connection_edit_items;
-    CollisionPixmapItem *collision_item = nullptr;
-    QGraphicsItemGroup *events_group = nullptr;
-    QList<QGraphicsPixmapItem*> borderItems;
-    QList<QGraphicsLineItem*> gridLines;
-
-    QGraphicsScene *scene_metatiles = nullptr;
-    QGraphicsScene *scene_current_metatile_selection = nullptr;
-    QGraphicsScene *scene_selected_border_metatiles = nullptr;
-    QGraphicsScene *scene_collision_metatiles = nullptr;
-    QGraphicsScene *scene_elevation_metatiles = nullptr;
-    MetatilesPixmapItem *metatiles_item = nullptr;
-
-    BorderMetatilesPixmapItem *selected_border_metatiles_item = nullptr;
-    CurrentSelectedMetatilesPixmapItem *scene_current_metatile_selection_item = nullptr;
-    MovementPermissionsPixmapItem *collision_metatiles_item = nullptr;
-
-    QList<DraggablePixmapItem*> *events = nullptr;
-    QList<DraggablePixmapItem*> *selected_events = nullptr;
-
-    bool lastSelectedMetatilesFromMap = false;
-    int copiedMetatileSelectionWidth = 0;
-    int copiedMetatileSelectionHeight = 0;
-    QList<uint16_t> *copiedMetatileSelection = new QList<uint16_t>;
-
-    int scale_exp = 0;
-    double scale_base = sqrt(2); // adjust scale factor with this
-
-    QString map_edit_mode;
-    QString prev_edit_mode;
-    QCursor cursor;
-
-    void objectsView_onMousePress(QMouseEvent *event);
-    void objectsView_onMouseMove(QMouseEvent *event);
-    void objectsView_onMouseRelease(QMouseEvent *event);
-
-private:
-    void setConnectionItemsVisible(bool);
-    void setBorderItemsVisible(bool, qreal = 1);
-    void setConnectionEditControlValues(Connection*);
-    void setConnectionEditControlsEnabled(bool);
-    void createConnectionItem(Connection* connection, bool hide);
-    void populateConnectionMapPickers();
-    void setDiveEmergeControls();
-    void updateDiveEmergeMap(QString mapName, QString direction);
-    void onConnectionOffsetChanged(int newOffset);
-    void removeMirroredConnection(Connection*);
-    void updateMirroredConnectionOffset(Connection*);
-    void updateMirroredConnectionDirection(Connection*, QString);
-    void updateMirroredConnectionMap(Connection*, QString);
-    void updateMirroredConnection(Connection*, QString, QString, bool isDelete = false);
-    Event* createNewObjectEvent();
-    Event* createNewWarpEvent();
-    Event* createNewHealLocationEvent();
-    Event* createNewCoordScriptEvent();
-    Event* createNewCoordWeatherEvent();
-    Event* createNewSignEvent();
-    Event* createNewHiddenItemEvent();
-    Event* createNewSecretBaseEvent();
-
-private slots:
-    void mouseEvent_map(QGraphicsSceneMouseEvent *event, MapPixmapItem *item);
-    void mouseEvent_collision(QGraphicsSceneMouseEvent *event, CollisionPixmapItem *item);
-    void onConnectionMoved(Connection*);
-    void onConnectionItemSelected(ConnectionPixmapItem* connectionItem);
-    void onConnectionItemDoubleClicked(ConnectionPixmapItem* connectionItem);
-    void onConnectionDirectionChanged(QString newDirection);
-    void onBorderMetatilesChanged();
-
-signals:
-    void objectsChanged();
-    void selectedObjectsChanged();
-    void loadMapRequested(QString, QString);
-    void tilesetChanged(QString);
-    void warpEventDoubleClicked(QString mapName, QString warpNum);
-    void currentMetatilesSelectionChanged();
-};
-
-
-
-class DraggablePixmapItem : public QObject, public QGraphicsPixmapItem {
-    Q_OBJECT
-public:
-    DraggablePixmapItem(QPixmap pixmap): QGraphicsPixmapItem(pixmap) {
-    }
-    Editor *editor = nullptr;
-    Event *event = nullptr;
-    QGraphicsItemAnimation *pos_anim = nullptr;
-    DraggablePixmapItem(Event *event_, Editor *editor_) : QGraphicsPixmapItem(event_->pixmap) {
-        event = event_;
-        editor = editor_;
-        updatePosition();
-    }
-    bool active;
-    int last_x;
-    int last_y;
-    void updatePosition() {
-        int x = event->getPixelX();
-        int y = event->getPixelY();
-        setX(x);
-        setY(y);
-        setZValue(event->y());
-    }
-    void move(int x, int y);
-    void emitPositionChanged() {
-        emit xChanged(event->x());
-        emit yChanged(event->y());
-        emit elevationChanged(event->elevation());
-    }
-    void updatePixmap() {
-        QList<Event*> objects;
-        objects.append(event);
-        event->pixmap = QPixmap();
-        editor->project->loadEventPixmaps(objects);
-        this->updatePosition();
-        editor->redrawObject(this);
-        emit spriteChanged(event->pixmap);
-    }
-    void bind(QComboBox *combo, QString key) {
-        connect(combo, static_cast<void (QComboBox::*)(const QString &)>(&QComboBox::currentTextChanged),
-                this, [this, key](QString value){
-            this->event->put(key, value);
-        });
-        connect(this, &DraggablePixmapItem::onPropertyChanged,
-                this, [combo, key](QString key2, QString value){
-            if (key2 == key) {
-                combo->addItem(value);
-                combo->setCurrentText(value);
-            }
-        });
-    }
-
-signals:
-    void positionChanged(Event *event);
-    void xChanged(int);
-    void yChanged(int);
-    void elevationChanged(int);
-    void spriteChanged(QPixmap pixmap);
-    void onPropertyChanged(QString key, QString value);
-
-public slots:
-    void set_x(const QString &text) {
-        event->put("x", text);
-        updatePosition();
-    }
-    void set_y(const QString &text) {
-        event->put("y", text);
-        updatePosition();
-    }
-    void set_elevation(const QString &text) {
-        event->put("elevation", text);
-        updatePosition();
-    }
-    void set_sprite(const QString &text) {
-        event->put("sprite", text);
-        updatePixmap();
-    }
-    void set_script(const QString &text) {
-        event->put("script_label", text);
-    }
-
-protected:
-    void mousePressEvent(QGraphicsSceneMouseEvent*);
-    void mouseMoveEvent(QGraphicsSceneMouseEvent*);
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent*);
-    void mouseDoubleClickEvent(QGraphicsSceneMouseEvent*);
-};
-
-class EventGroup : public QGraphicsItemGroup {
-};
-
-class MapPixmapItem : public QObject, public QGraphicsPixmapItem {
-    Q_OBJECT
-public:
-    MapPixmapItem(QPixmap pixmap): QGraphicsPixmapItem(pixmap) {
-    }
-    Map *map = nullptr;
-    Editor *editor = nullptr;
-    MapPixmapItem(Map *map_, Editor *editor_) {
-        map = map_;
-        editor = editor_;
-        setAcceptHoverEvents(true);
-    }
-    bool active;
-    bool right_click;
-    QPoint selection_origin;
-    QList<QPoint> selection;
-    virtual void paint(QGraphicsSceneMouseEvent*);
-    virtual void floodFill(QGraphicsSceneMouseEvent*);
-    void _floodFill(int x, int y);
-    void _floodFillSmartPath(int initialX, int initialY);
-    virtual void pick(QGraphicsSceneMouseEvent*);
-    virtual void select(QGraphicsSceneMouseEvent*);
-    virtual void shift(QGraphicsSceneMouseEvent*);
-    virtual void draw(bool ignoreCache = false);
-    void updateMetatileSelection(QGraphicsSceneMouseEvent *event);
-
-private:
-    void updateCurHoveredTile(QPointF pos);
-    void paintNormal(int x, int y);
-    void paintSmartPath(int x, int y);
-    static QList<int> smartPathTable;
-
-signals:
-    void mouseEvent(QGraphicsSceneMouseEvent *, MapPixmapItem *);
-
-protected:
-    void hoverMoveEvent(QGraphicsSceneHoverEvent*);
-    void hoverLeaveEvent(QGraphicsSceneHoverEvent*);
-    void mousePressEvent(QGraphicsSceneMouseEvent*);
-    void mouseMoveEvent(QGraphicsSceneMouseEvent*);
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent*);
-};
-
-class CollisionPixmapItem : public MapPixmapItem {
-    Q_OBJECT
-public:
-    CollisionPixmapItem(QPixmap pixmap): MapPixmapItem(pixmap) {
-    }
-    CollisionPixmapItem(Map *map_, Editor *editor_): MapPixmapItem(map_, editor_) {
-    }
-    void updateMovementPermissionSelection(QGraphicsSceneMouseEvent *event);
-    virtual void paint(QGraphicsSceneMouseEvent*);
-    virtual void floodFill(QGraphicsSceneMouseEvent*);
-    virtual void pick(QGraphicsSceneMouseEvent*);
-    virtual void draw(bool ignoreCache = false);
-
-signals:
-    void mouseEvent(QGraphicsSceneMouseEvent *, CollisionPixmapItem *);
-
-protected:
-    void mousePressEvent(QGraphicsSceneMouseEvent*);
-    void mouseMoveEvent(QGraphicsSceneMouseEvent*);
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent*);
-};
-
-class ConnectionPixmapItem : public QObject, public QGraphicsPixmapItem {
-    Q_OBJECT
-public:
-    ConnectionPixmapItem(QPixmap pixmap, Connection* connection, int x, int y, int baseMapWidth, int baseMapHeight): QGraphicsPixmapItem(pixmap) {
-        this->basePixmap = pixmap;
-        this->connection = connection;
-        setFlag(ItemIsMovable);
-        setFlag(ItemSendsGeometryChanges);
-        this->initialX = x;
-        this->initialY = y;
-        this->initialOffset = connection->offset.toInt();
-        this->baseMapWidth = baseMapWidth;
-        this->baseMapHeight = baseMapHeight;
-    }
-    void render(qreal opacity = 1) {
-        QPixmap newPixmap = basePixmap.copy(0, 0, basePixmap.width(), basePixmap.height());
-        if (opacity < 1) {
-            QPainter painter(&newPixmap);
-            int alpha = static_cast<int>(255 * (1 - opacity));
-            painter.fillRect(0, 0, newPixmap.width(), newPixmap.height(), QColor(0, 0, 0, alpha));
-            painter.end();
-        }
-        this->setPixmap(newPixmap);
-    }
-    int getMinOffset();
-    int getMaxOffset();
-    QPixmap basePixmap;
-    Connection* connection;
-    int initialX;
-    int initialY;
-    int initialOffset;
-    int baseMapWidth;
-    int baseMapHeight;
-protected:
-    QVariant itemChange(GraphicsItemChange change, const QVariant &value);
-    void mousePressEvent(QGraphicsSceneMouseEvent*);
-    void mouseDoubleClickEvent(QGraphicsSceneMouseEvent*);
-signals:
-    void connectionItemSelected(ConnectionPixmapItem* connectionItem);
-    void connectionItemDoubleClicked(ConnectionPixmapItem* connectionItem);
-    void connectionMoved(Connection*);
-};
-
-class MetatilesPixmapItem : public QObject, public QGraphicsPixmapItem {
-    Q_OBJECT
-public:
-    MetatilesPixmapItem(Map *map_) {
-        map = map_;
-        setAcceptHoverEvents(true);
-        connect(map, SIGNAL(paintTileChanged()), this, SLOT(paintTileChanged()));
-    }
-    Map* map = nullptr;
-    virtual void draw();
-private:
-    void updateSelection(QPointF pos);
-protected:
-    virtual void updateCurHoveredMetatile(QPointF pos);
-private slots:
-    void paintTileChanged();
-protected:
-    void hoverMoveEvent(QGraphicsSceneHoverEvent*);
-    void hoverLeaveEvent(QGraphicsSceneHoverEvent*);
-    void mousePressEvent(QGraphicsSceneMouseEvent*);
-    void mouseMoveEvent(QGraphicsSceneMouseEvent*);
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent*);
-};
-
-class BorderMetatilesPixmapItem : public QObject, public QGraphicsPixmapItem {
-    Q_OBJECT
-public:
-    BorderMetatilesPixmapItem(Map *map_) {
-        map = map_;
-        setAcceptHoverEvents(true);
-    }
-    Map* map = nullptr;
-    virtual void draw();
-signals:
-    void borderMetatilesChanged();
-protected:
-    void mousePressEvent(QGraphicsSceneMouseEvent*);
-};
-
-class CurrentSelectedMetatilesPixmapItem : public QObject, public QGraphicsPixmapItem {
-    Q_OBJECT
-public:
-    CurrentSelectedMetatilesPixmapItem(Map *map_) {
-        map = map_;
-    }
-    Map* map = nullptr;
-    virtual void draw();
-};
-
-class MovementPermissionsPixmapItem : public MetatilesPixmapItem {
-    Q_OBJECT
-public:
-    MovementPermissionsPixmapItem(Map *map_): MetatilesPixmapItem(map_) {
-        connect(map, SIGNAL(paintCollisionChanged(Map*)), this, SLOT(paintCollisionChanged(Map *)));
-    }
-    virtual void pick(uint16_t collision, uint16_t elevation) {
-        map->paint_collision = collision;
-        map->paint_elevation = elevation;
-        draw();
-    }
-    virtual void draw() {
-        setPixmap(map->renderCollisionMetatiles());
-    }
-protected:
-    void mousePressEvent(QGraphicsSceneMouseEvent*);
-    void mouseMoveEvent(QGraphicsSceneMouseEvent*);
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent*);
-    virtual void updateCurHoveredMetatile(QPointF pos);
-private slots:
-    void paintCollisionChanged(Map *) {
-        draw();
-    }
-};
-
-#endif // EDITOR_H

include/mainwindow.h

@@ -127,9 +127,10 @@ private:
     Ui::MainWindow *ui;
     QStandardItemModel *mapListModel;
     QList<QStandardItem*> *mapGroupsModel;
+    QMap<QString, QModelIndex> mapListIndexes;
     Editor *editor = nullptr;
     QIcon* mapIcon;
-    void setMap(QString);
+    void setMap(QString, bool scrollTreeView = false);
     void redrawMapScene();
     void loadDataStructures();
     void populateMapList();

map.h

@@ -1,234 +0,0 @@
-#ifndef MAP_H
-#define MAP_H
-
-#include "tileset.h"
-#include "blockdata.h"
-#include "event.h"
-
-#include <QPixmap>
-#include <QObject>
-#include <QDebug>
-#include <QGraphicsPixmapItem>
-#include <math.h>
-
-class HistoryItem {
-public:
-    Blockdata *metatiles;
-    int layoutWidth;
-    int layoutHeight;
-    HistoryItem(Blockdata *metatiles_, int layoutWidth_, int layoutHeight_) {
-        this->metatiles = metatiles_;
-        this->layoutWidth = layoutWidth_;
-        this->layoutHeight = layoutHeight_;
-    }
-    ~HistoryItem() {
-        if (metatiles) delete metatiles;
-    }
-};
-
-template <typename T>
-class History {
-public:
-    History() {
-
-    }
-    T back() {
-        if (head > 0) {
-            return history.at(--head);
-        }
-        return NULL;
-    }
-    T next() {
-        if (head + 1 < history.length()) {
-            return history.at(++head);
-        }
-        return NULL;
-    }
-    void push(T commit) {
-        while (head + 1 < history.length()) {
-            HistoryItem *item = history.last();
-            history.removeLast();
-            delete item;
-        }
-        if (saved > head) {
-            saved = -1;
-        }
-        history.append(commit);
-        head++;
-    }
-    T current() {
-        if (head < 0 || history.length() == 0) {
-            return NULL;
-        }
-        return history.at(head);
-    }
-    void save() {
-        saved = head;
-    }
-    bool isSaved() {
-        return saved == head;
-    }
-
-private:
-    QList<T> history;
-    int head = -1;
-    int saved = -1;
-};
-
-class Connection {
-public:
-    Connection() {
-    }
-public:
-    QString direction;
-    QString offset;
-    QString map_name;
-};
-
-class MapLayout {
-public:
-    MapLayout() {}
-    int index;
-    QString name;
-    QString label;
-    QString width;
-    QString height;
-    QString border_label;
-    QString border_path;
-    QString blockdata_label;
-    QString blockdata_path;
-    QString tileset_primary_label;
-    QString tileset_secondary_label;
-    Tileset *tileset_primary = nullptr;
-    Tileset *tileset_secondary = nullptr;
-    Blockdata* blockdata = nullptr;
-    QImage border_image;
-    QPixmap border_pixmap;
-    Blockdata *border = nullptr;
-    Blockdata *cached_blockdata = nullptr;
-    Blockdata *cached_collision = nullptr;
-    Blockdata *cached_border = nullptr;
-    bool has_unsaved_changes = false;
-public:
-    static QString getNameFromLabel(QString label) {
-        // ASSUMPTION: strip off "_Layout" from layout label. Directories in 'data/layouts/' must be well-formed.
-        return label.replace(label.lastIndexOf("_Layout"), label.length(), "");
-    }
-};
-
-class Map : public QObject
-{
-    Q_OBJECT
-public:
-    explicit Map(QObject *parent = nullptr);
-
-public:
-    QString name;
-    QString constantName;
-    QString group_num;
-    QString layout_label;
-    QString events_label;
-    QString scripts_label;
-    QString connections_label;
-    QString song;
-    QString layout_id;
-    QString location;
-    QString requiresFlash;
-    QString isFlyable; // TODO: implement this
-    QString weather;
-    QString type;
-    QString unknown;
-    QString show_location;
-    QString battle_scene;
-    MapLayout *layout;
-
-    bool isPersistedToFile = true;
-
-public:
-    void setName(QString mapName);
-    static QString mapConstantFromName(QString mapName);
-    static QString objectEventsLabelFromName(QString mapName);
-    static QString warpEventsLabelFromName(QString mapName);
-    static QString coordEventsLabelFromName(QString mapName);
-    static QString bgEventsLabelFromName(QString mapName);
-    int getWidth();
-    int getHeight();
-    uint16_t getSelectedBlockIndex(int);
-    int getDisplayedBlockIndex(int);
-    QPixmap render(bool ignoreCache);
-    QPixmap renderMetatiles();
-
-    QPixmap renderCollision(bool ignoreCache);
-    QImage collision_image;
-    QPixmap collision_pixmap;
-    QImage getCollisionMetatileImage(Block);
-    QImage getCollisionMetatileImage(int, int);
-    QPixmap renderCollisionMetatiles();
-
-    void drawSelection(int i, int w, int selectionWidth, int selectionHeight, QPainter *painter, int gridWidth);
-
-    bool blockChanged(int, Blockdata*);
-    void cacheBlockdata();
-    void cacheCollision();
-    QImage image;
-    QPixmap pixmap;
-    QList<QImage> metatile_images;
-    bool smart_paths_enabled = false;
-    int paint_metatile_initial_x;
-    int paint_metatile_initial_y;
-    int paint_tile_index;
-    int paint_tile_width = 1;
-    int paint_tile_height = 1;
-    int paint_tile_initial_x;
-    int paint_tile_initial_y;
-    int selected_metatiles_width;
-    int selected_metatiles_height;
-    QList<uint16_t> *selected_metatiles = nullptr;
-    uint16_t paint_collision;
-    uint16_t paint_elevation;
-
-    Block *getBlock(int x, int y);
-    void setBlock(int x, int y, Block block);
-    void _setBlock(int x, int y, Block block);
-
-    void floodFillCollisionElevation(int x, int y, uint16_t collision, uint16_t elevation);
-    void _floodFillCollisionElevation(int x, int y, uint16_t collision, uint16_t elevation);
-
-    History<HistoryItem*> history;
-    void undo();
-    void redo();
-    void commit();
-
-    QList<Event*> getAllEvents();
-    void removeEvent(Event *event);
-    void addEvent(Event *event);
-    QMap<QString, QList<Event*>> events;
-
-    QList<Connection*> connections;
-    QPixmap renderConnection(Connection);
-    void setNewDimensionsBlockdata(int newWidth, int newHeight);
-    void setDimensions(int newWidth, int newHeight, bool setNewBlockData = true);
-
-    QPixmap renderBorder();
-    void cacheBorder();
-
-    bool hasUnsavedChanges();
-    void hoveredTileChanged(int x, int y, int block);
-    void clearHoveredTile();
-    void hoveredMetatileChanged(int block);
-    void clearHoveredMetatile();
-    void hoveredMovementPermissionTileChanged(int collision, int elevation);
-    void clearHoveredMovementPermissionTile();
-    void setSelectedMetatilesFromTilePicker();
-
-signals:
-    void paintTileChanged();
-    void paintCollisionChanged(Map *map);
-    void mapChanged(Map *map);
-    void mapNeedsRedrawing();
-    void statusBarMessage(QString);
-
-public slots:
-};
-
-#endif // MAP_H

porymap.pro

@@ -14,45 +14,80 @@ RC_ICONS = resources/icons/porymap-icon-1.ico
 ICON = resources/icons/porymap-icon-1.ico
 
 
-SOURCES += main.cpp\
-        mainwindow.cpp \
-    project.cpp \
-    map.cpp \
-    blockdata.cpp \
-    block.cpp \
-    tileset.cpp \
-    tile.cpp \
-    event.cpp \
-    editor.cpp \
-    objectpropertiesframe.cpp \
-    graphicsview.cpp \
-    parseutil.cpp \
-    neweventtoolbutton.cpp \
-    noscrollcombobox.cpp \
-    noscrollspinbox.cpp \
-    heallocation.cpp \
-    mapsceneeventfilter.cpp
+SOURCES += src/core/block.cpp \
+    src/core/blockdata.cpp \
+    src/core/event.cpp \
+    src/core/heallocation.cpp \
+    src/core/historyitem.cpp \
+    src/core/map.cpp \
+    src/core/maplayout.cpp \
+    src/core/metatile.cpp \
+    src/core/parseutil.cpp \
+    src/core/tile.cpp \
+    src/core/tileset.cpp \
+    src/ui/bordermetatilespixmapitem.cpp \
+    src/ui/collisionpixmapitem.cpp \
+    src/ui/connectionpixmapitem.cpp \
+    src/ui/currentselectedmetatilespixmapitem.cpp \
+    src/ui/eventpropertiesframe.cpp \
+    src/ui/graphicsview.cpp \
+    src/ui/imageproviders.cpp \
+    src/ui/mappixmapitem.cpp \
+    src/ui/mapsceneeventfilter.cpp \
+    src/ui/metatileselector.cpp \
+    src/ui/movementpermissionsselector.cpp \
+    src/ui/neweventtoolbutton.cpp \
+    src/ui/noscrollcombobox.cpp \
+    src/ui/noscrollspinbox.cpp \
+    src/ui/selectablepixmapitem.cpp \
+    src/ui/tileseteditor.cpp \
+    src/editor.cpp \
+    src/main.cpp \
+    src/mainwindow.cpp \
+    src/project.cpp \
+    src/settings.cpp
 
-HEADERS  += mainwindow.h \
-    project.h \
-    map.h \
-    blockdata.h \
-    block.h \
-    tileset.h \
-    tile.h \
-    event.h \
-    editor.h \
-    objectpropertiesframe.h \
-    graphicsview.h \
-    parseutil.h \
-    neweventtoolbutton.h \
-    noscrollcombobox.h \
-    noscrollspinbox.h \
-    heallocation.h \
-    mapsceneeventfilter.h
+HEADERS  += include/core/block.h \
+    include/core/blockdata.h \
+    include/core/event.h \
+    include/core/heallocation.h \
+    include/core/history.h \
+    include/core/historyitem.h \
+    include/core/map.h \
+    include/core/mapconnection.h \
+    include/core/maplayout.h \
+    include/core/metatile.h \
+    include/core/parseutil.h \
+    include/core/tile.h \
+    include/core/tileset.h \
+    include/ui/bordermetatilespixmapitem.h \
+    include/ui/collisionpixmapitem.h \
+    include/ui/connectionpixmapitem.h \
+    include/ui/currentselectedmetatilespixmapitem.h \
+    include/ui/eventpropertiesframe.h \
+    include/ui/graphicsview.h \
+    include/ui/imageproviders.h \
+    include/ui/mappixmapitem.h \
+    include/ui/mapsceneeventfilter.h \
+    include/ui/metatileselector.h \
+    include/ui/movementpermissionsselector.h \
+    include/ui/neweventtoolbutton.h \
+    include/ui/noscrollcombobox.h \
+    include/ui/noscrollspinbox.h \
+    include/ui/selectablepixmapitem.h \
+    include/ui/tileseteditor.h \
+    include/editor.h \
+    include/mainwindow.h \
+    include/project.h \
+    include/settings.h
 
-FORMS    += mainwindow.ui \
-    objectpropertiesframe.ui
+FORMS    += forms/mainwindow.ui \
+    forms/eventpropertiesframe.ui \
+    forms/tileseteditor.ui
 
 RESOURCES += \
     resources/images.qrc
+
+INCLUDEPATH += include
+INCLUDEPATH += include/core
+INCLUDEPATH += include/ui

src/editor.cpp

@@ -349,7 +349,7 @@ void Editor::onHoveredMapMetatileChanged(int x, int y) {
                               .arg(x)
                               .arg(y)
                               .arg(QString("%1").arg(tile, 3, 16, QChar('0')).toUpper())
-                              .arg(QString::number(pow(scale_base, scale_exp))));
+                              .arg(QString::number(pow(scale_base, scale_exp), 'g', 2)));
     }
 }
 

src/mainwindow.cpp

@@ -110,7 +110,7 @@ void MainWindow::openProject(QString dir) {
         setWindowTitle(editor->project->getProjectTitle());
         loadDataStructures();
         populateMapList();
-        setMap(getDefaultMap());
+        setMap(getDefaultMap(), true);
     } else {
         setWindowTitle(editor->project->getProjectTitle());
         loadDataStructures();
@@ -175,7 +175,7 @@ void MainWindow::on_action_Open_Project_triggered()
     }
 }
 
-void MainWindow::setMap(QString map_name) {
+void MainWindow::setMap(QString map_name, bool scrollTreeView) {
     qDebug() << QString("setMap(%1)").arg(map_name);
     if (map_name.isNull()) {
         return;
@@ -184,6 +184,11 @@ void MainWindow::setMap(QString map_name) {
     redrawMapScene();
     displayMapProperties();
 
+    if (scrollTreeView) {
+        ui->mapList->setCurrentIndex(mapListIndexes.value(map_name));
+        ui->mapList->scrollTo(ui->mapList->currentIndex(), QAbstractItemView::PositionAtCenter);
+    }
+
     setWindowTitle(map_name + " - " + editor->project->getProjectTitle());
 
     connect(editor->map, SIGNAL(mapChanged(Map*)), this, SLOT(onMapChanged(Map *)));
@@ -248,7 +253,7 @@ void MainWindow::openWarpMap(QString map_name, QString warp_num) {
     }
 
     // Open the destination map, and select the target warp event.
-    setMap(map_name);
+    setMap(map_name, true);
     QList<Event*> warp_events = editor->map->events["warp_event_group"];
     if (warp_events.length() > warpNum) {
         Event *warp_event = warp_events.at(warpNum);
@@ -450,6 +455,7 @@ void MainWindow::populateMapList() {
             QString map_name = names.value(j);
             QStandardItem *map = createMapItem(map_name, i, j);
             group->appendRow(map);
+            mapListIndexes.insert(map_name, map->index());
         }
     }
 
@@ -512,6 +518,7 @@ void MainWindow::onAddNewMapToGroupClick(QAction* triggeredAction)
     int numMapsInGroup = groupItem->rowCount();
     QStandardItem *newMapItem = createMapItem(newMapName, groupNum, numMapsInGroup);
     groupItem->appendRow(newMapItem);
+    mapListIndexes.insert(newMapName, newMapItem->index());
 
     setMap(newMapName);
 }
@@ -1083,7 +1090,7 @@ void MainWindow::checkToolButtons() {
 }
 
 void MainWindow::onLoadMapRequested(QString mapName, QString fromMapName) {
-    setMap(mapName);
+    setMap(mapName, true);
     editor->setSelectedConnectionFromMap(fromMapName);
 }
 

src/porymap.pro

@@ -1,92 +0,0 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2016-08-31T15:19:13
-#
-#-------------------------------------------------
-
-QT       += core gui
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-
-TARGET = porymap
-TEMPLATE = app
-RC_ICONS = resources/icons/porymap-icon-1.ico
-ICON = resources/icons/porymap-icon-1.ico
-
-
-SOURCES += core/block.cpp \
-    core/blockdata.cpp \
-    core/event.cpp \
-    core/heallocation.cpp \
-    core/historyitem.cpp \
-    core/map.cpp \
-    core/maplayout.cpp \
-    core/metatile.cpp \
-    core/parseutil.cpp \
-    core/tile.cpp \
-    core/tileset.cpp \
-    ui/bordermetatilespixmapitem.cpp \
-    ui/collisionpixmapitem.cpp \
-    ui/connectionpixmapitem.cpp \
-    ui/currentselectedmetatilespixmapitem.cpp \
-    ui/eventpropertiesframe.cpp \
-    ui/graphicsview.cpp \
-    ui/imageproviders.cpp \
-    ui/mappixmapitem.cpp \
-    ui/metatileselector.cpp \
-    ui/movementpermissionsselector.cpp \
-    ui/neweventtoolbutton.cpp \
-    ui/noscrollcombobox.cpp \
-    ui/noscrollspinbox.cpp \
-    ui/selectablepixmapitem.cpp \
-    editor.cpp \
-    main.cpp \
-    mainwindow.cpp \
-    project.cpp \
-    settings.cpp \
-    ui/mapsceneeventfilter.cpp \
-    ui/tileseteditor.cpp
-
-HEADERS  += core/block.h \
-    core/blockdata.h \
-    core/event.h \
-    core/heallocation.h \
-    core/history.h \
-    core/historyitem.h \
-    core/map.h \
-    core/mapconnection.h \
-    core/maplayout.h \
-    core/metatile.h \
-    core/parseutil.h \
-    core/tile.h \
-    core/tileset.h \
-    ui/bordermetatilespixmapitem.h \
-    ui/collisionpixmapitem.h \
-    ui/connectionpixmapitem.h \
-    ui/currentselectedmetatilespixmapitem.h \
-    ui/eventpropertiesframe.h \
-    ui/graphicsview.h \
-    ui/imageproviders.h \
-    ui/mappixmapitem.h \
-    ui/metatileselector.h \
-    ui/movementpermissionsselector.h \
-    ui/neweventtoolbutton.h \
-    ui/noscrollcombobox.h \
-    ui/noscrollspinbox.h \
-    ui/selectablepixmapitem.h \
-    editor.h \
-    mainwindow.h \
-    project.h \
-    settings.h \
-    ui/mapsceneeventfilter.h \
-    ui/tileseteditor.h
-
-FORMS    += mainwindow.ui \
-    eventpropertiesframe.ui \
-    tileseteditor.ui
-
-RESOURCES += \
-    resources/images.qrc
-
-INCLUDEPATH += core
-INCLUDEPATH += ui

src/ui/mapsceneeventfilter.cpp

@@ -7,7 +7,7 @@ MapSceneEventFilter::MapSceneEventFilter(QObject *parent) : QObject(parent)
 
 }
 
-bool MapSceneEventFilter::eventFilter(QObject *obj, QEvent *event)
+bool MapSceneEventFilter::eventFilter(QObject*, QEvent *event)
 {
     if (event->type() == QEvent::GraphicsSceneWheel)
     {

tileset.cpp

@@ -1,120 +0,0 @@
-#include "tileset.h"
-#include "project.h"
-
-#include <QPainter>
-#include <QImage>
-#include <QDebug>
-
-Tileset::Tileset()
-{
-
-}
-
-Metatile::Metatile()
-{
-    tiles = new QList<Tile>;
-}
-
-QImage Metatile::getMetatileImage(int tile, Tileset *primaryTileset, Tileset *secondaryTileset) {
-    QImage metatile_image(16, 16, QImage::Format_RGBA8888);
-
-    Metatile* metatile = Metatile::getMetatile(tile, primaryTileset, secondaryTileset);
-    if (!metatile || !metatile->tiles) {
-        metatile_image.fill(0xffffffff);
-        return metatile_image;
-    }
-
-    Tileset* blockTileset = Metatile::getBlockTileset(tile, primaryTileset, secondaryTileset);
-    if (!blockTileset) {
-        metatile_image.fill(0xffffffff);
-        return metatile_image;
-    }
-    QList<QList<QRgb>> palettes = Metatile::getBlockPalettes(primaryTileset, secondaryTileset);
-
-    QPainter metatile_painter(&metatile_image);
-    for (int layer = 0; layer < 2; layer++)
-    for (int y = 0; y < 2; y++)
-    for (int x = 0; x < 2; x++) {
-        Tile tile_ = metatile->tiles->value((y * 2) + x + (layer * 4));
-        QImage tile_image = Metatile::getMetatileTile(tile_.tile, primaryTileset, secondaryTileset);
-        if (tile_image.isNull()) {
-            // Some metatiles specify tiles that are outside the valid range.
-            // These are treated as completely transparent, so they can be skipped without
-            // being drawn unless they're on the bottom layer, in which case we need
-            // a placeholder.
-            if (layer == 0) {
-                metatile_painter.fillRect(x * 8, y * 8, 8, 8, palettes.value(0).value(0));
-            }
-            continue;
-        }
-
-        // Colorize the metatile tiles with its palette.
-        if (tile_.palette < palettes.length()) {
-            QList<QRgb> palette = palettes.value(tile_.palette);
-            for (int j = 0; j < palette.length(); j++) {
-                tile_image.setColor(j, palette.value(j));
-            }
-        } else {
-            qDebug() << "Tile is referring to invalid palette number: " << tile_.palette;
-        }
-
-        // The top layer of the metatile has its first color displayed at transparent.
-        if (layer > 0) {
-            QColor color(tile_image.color(0));
-            color.setAlpha(0);
-            tile_image.setColor(0, color.rgba());
-        }
-
-        QPoint origin = QPoint(x*8, y*8);
-        metatile_painter.drawImage(origin, tile_image.mirrored(tile_.xflip == 1, tile_.yflip == 1));
-    }
-    metatile_painter.end();
-
-    return metatile_image;
-}
-
-Metatile* Metatile::getMetatile(int index, Tileset *primaryTileset, Tileset *secondaryTileset) {
-    Tileset *tileset = Metatile::getBlockTileset(index, primaryTileset, secondaryTileset);
-    int local_index = Metatile::getBlockIndex(index);
-    if (!tileset || !tileset->metatiles) {
-        return nullptr;
-    }
-    Metatile *metatile = tileset->metatiles->value(local_index, nullptr);
-    return metatile;
-}
-
-QImage Metatile::getMetatileTile(int tile, Tileset *primaryTileset, Tileset *secondaryTileset) {
-    Tileset *tileset = Metatile::getBlockTileset(tile, primaryTileset, secondaryTileset);
-    int local_index = Metatile::getBlockIndex(tile);
-    if (!tileset || !tileset->tiles) {
-        return QImage();
-    }
-    return tileset->tiles->value(local_index, QImage());
-}
-
-Tileset* Metatile::getBlockTileset(int metatile_index, Tileset *primaryTileset, Tileset *secondaryTileset) {
-    if (metatile_index < Project::getNumMetatilesPrimary()) {
-        return primaryTileset;
-    } else {
-        return secondaryTileset;
-    }
-}
-
-int Metatile::getBlockIndex(int index) {
-    if (index < Project::getNumMetatilesPrimary()) {
-        return index;
-    } else {
-        return index - Project::getNumMetatilesPrimary();
-    }
-}
-
-QList<QList<QRgb>> Metatile::getBlockPalettes(Tileset *primaryTileset, Tileset *secondaryTileset) {
-    QList<QList<QRgb>> palettes;
-    for (int i = 0; i < Project::getNumPalettesPrimary(); i++) {
-        palettes.append(primaryTileset->palettes->at(i));
-    }
-    for (int i = Project::getNumPalettesPrimary(); i < Project::getNumPalettesTotal(); i++) {
-        palettes.append(secondaryTileset->palettes->at(i));
-    }
-    return palettes;
-}