Merge pull request #689 from GriffinRichards/event-speed-improvements

Event speed improvements

include/config.h

@@ -79,6 +79,7 @@ public:
         this->textEditorGotoLine = "";
         this->paletteEditorBitDepth = 24;
         this->projectSettingsTab = 0;
+        this->loadAllEventScripts = false;
         this->warpBehaviorWarningDisabled = false;
         this->eventDeleteWarningDisabled = false;
         this->eventOverlayEnabled = false;
@@ -136,6 +137,7 @@ public:
     QString textEditorGotoLine;
     int paletteEditorBitDepth;
     int projectSettingsTab;
+    bool loadAllEventScripts;
     bool warpBehaviorWarningDisabled;
     bool eventDeleteWarningDisabled;
     bool eventOverlayEnabled;

include/core/events.h

@@ -41,14 +41,6 @@ public:
     virtual void visitSign(SignEvent *) = 0;
 };
 
-struct EventGraphics
-{
-    QImage spritesheet;
-    int spriteWidth;
-    int spriteHeight;
-    bool inanimate;
-};
-
 
 ///
 /// Event base class -- purely virtual
@@ -64,11 +56,7 @@ public:
     Event& operator=(const Event &other) = delete;
 
 protected:
-    Event() {
-        this->spriteWidth = 16;
-        this->spriteHeight = 16;
-        this->usingSprite = false;
-    }
+    Event() {}
 
 // public enums & static methods
 public:
@@ -119,8 +107,6 @@ public:
 
     static Event* create(Event::Type type);
 
-    static QMap<Event::Group, const QPixmap*> icons;
-
 // standard public methods
 public:
 
@@ -143,8 +129,8 @@ public:
     int getZ() const { return this->elevation; }
     int getElevation() const { return this->elevation; }
 
-    int getPixelX() const { return (this->x * 16) - qMax(0, (this->spriteWidth - 16) / 2); }
-    int getPixelY() const { return (this->y * 16) - qMax(0, this->spriteHeight - 16); }
+    int getPixelX() const { return (this->x * 16) - qMax(0, (pixmap.width() - 16) / 2); }
+    int getPixelY() const { return (this->y * 16) - qMax(0, pixmap.height() - 16); }
 
     virtual EventFrame *getEventFrame();
     virtual EventFrame *createEventFrame() = 0;
@@ -172,14 +158,8 @@ public:
     void setPixmapItem(DraggablePixmapItem *item);
     DraggablePixmapItem *getPixmapItem() const { return this->pixmapItem; }
 
-    void setUsingSprite(bool newUsingSprite) { this->usingSprite = newUsingSprite; }
-    bool getUsingSprite() const { return this->usingSprite; }
-
-    void setSpriteWidth(int newSpriteWidth) { this->spriteWidth = newSpriteWidth; }
-    int getspriteWidth() const { return this->spriteWidth; }
-
-    void setSpriteHeight(int newSpriteHeight) { this->spriteHeight = newSpriteHeight; }
-    int getspriteHeight() const { return this->spriteHeight; }
+    void setUsesDefaultPixmap(bool newUsesDefaultPixmap) { this->usesDefaultPixmap = newUsesDefaultPixmap; }
+    bool getUsesDefaultPixmap() const { return this->usesDefaultPixmap; }
 
     int getEventIndex();
 
@@ -189,8 +169,6 @@ public:
     static QString groupToString(Event::Group group);
     static QString typeToString(Event::Type type);
     static Event::Type typeFromString(QString type);
-    static void clearIcons();
-    static void setIcons();
 
 // protected attributes
 protected:
@@ -204,9 +182,7 @@ protected:
     int y = 0;
     int elevation = 0;
 
-    int spriteWidth = 16;
-    int spriteHeight = 16;
-    bool usingSprite = false;
+    bool usesDefaultPixmap = true;
 
     // Some events can have an associated #define name that should be unique to this event.
     // e.g. object events can have a 'LOCALID', or Heal Locations have a 'HEAL_LOCATION' id.
@@ -273,10 +249,6 @@ public:
     void setFlag(QString newFlag) { this->flag = newFlag; }
     QString getFlag() const { return this->flag; }
 
-public:
-    void setFrameFromMovement(QString movement);
-    void setPixmapFromSpritesheet(EventGraphics * gfx);
-
 
 protected:
     QString gfx;

include/project.h

@@ -45,7 +45,6 @@ public:
     QStringList layoutIdsMaster;
     QMap<QString, Layout*> mapLayouts;
     QMap<QString, Layout*> mapLayoutsMaster;
-    QMap<QString, EventGraphics*> eventGraphicsMap;
     QMap<QString, int> gfxDefines;
     QString defaultSong;
     QStringList songNames;
@@ -68,7 +67,6 @@ public:
     QMap<QString, uint16_t> unusedMetatileLabels;
     QMap<QString, uint32_t> metatileBehaviorMap;
     QMap<uint32_t, QString> metatileBehaviorMapInverse;
-    QMap<QString, QString> facingDirections;
     ParseUtil parser;
     QFileSystemWatcher fileWatcher;
     QSet<QString> modifiedFiles;
@@ -210,7 +208,10 @@ public:
     bool readFieldmapMasks();
     QMap<QString, QMap<QString, QString>> readObjEventGfxInfo();
 
-    void setEventPixmap(Event *event, bool forceLoad = false);
+    QPixmap getEventPixmap(const QString &gfxName, const QString &movementName);
+    QPixmap getEventPixmap(const QString &gfxName, int frame, bool hFlip);
+    QPixmap getEventPixmap(Event::Group group);
+    void loadEventPixmap(Event *event, bool forceLoad = false);
 
     QString fixPalettePath(QString path);
     QString fixGraphicPath(QString path);
@@ -218,6 +219,7 @@ public:
     static QString getScriptFileExtension(bool usePoryScript);
     QString getScriptDefaultString(bool usePoryScript, QString mapName) const;
     QStringList getEventScriptsFilePaths() const;
+    void insertGlobalScriptLabels(QStringList &scriptLabels) const;
 
     QString getDefaultPrimaryTilesetLabel() const;
     QString getDefaultSecondaryTilesetLabel() const;
@@ -254,6 +256,18 @@ public:
 private:
     QMap<QString, QString> mapSectionDisplayNames;
     QMap<QString, qint64> modifiedFileTimestamps;
+    QMap<QString, QString> facingDirections;
+
+    struct EventGraphics
+    {
+        QString filepath;
+        bool loaded = false;
+        QImage spritesheet;
+        int spriteWidth = -1;
+        int spriteHeight = -1;
+        bool inanimate = false;
+    };
+    QMap<QString, EventGraphics*> eventGraphicsMap;
 
     void updateLayout(Layout *);
 
@@ -284,6 +298,7 @@ signals:
     void mapSectionDisplayNameChanged(const QString &idName, const QString &displayName);
     void mapSectionIdNamesChanged(const QStringList &idNames);
     void mapsExcluded(const QStringList &excludedMapNames);
+    void eventScriptLabelsRead();
 };
 
 #endif // PROJECT_H

include/ui/eventframes.h

@@ -31,8 +31,6 @@ public:
     void invalidateUi();
     void invalidateValues();
 
-    void populateScriptDropdown(NoScrollComboBox * combo, Project * project);
-
     virtual void setActive(bool active);
 
 public:
@@ -59,6 +57,8 @@ protected:
     bool initialized = false;
     bool connected = false;
 
+    void populateScriptDropdown(NoScrollComboBox * combo, Project * project);
+
 private:
     Event *event;
 };

include/ui/preferenceeditor.h

@@ -23,6 +23,7 @@ public:
 signals:
     void preferencesSaved();
     void themeChanged(const QString &theme);
+    void scriptSettingsChanged(bool on);
 
 private:
     Ui::PreferenceEditor *ui;