From 938f1aeea15c6b68495bb1cb0a80467f4e8cf343 Mon Sep 17 00:00:00 2001
From: Crystalwarrior <varsash@gmail.com>
Date: Sat, 14 Sep 2019 22:35:02 +0300
Subject: Optimize the heck out of animated images. There is no lag after the
 image is loaded now. HOWEVER, there's lag when the image is first loaded due
 to the aspect ratio and sizing (at least with .apng's).

---
 include/aocharmovie.h | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/aocharmovie.h b/include/aocharmovie.h
index 65ab79fe..0921bc5f 100644
--- a/include/aocharmovie.h
+++ b/include/aocharmovie.h
@@ -6,6 +6,7 @@
 #include <QTimer>
 #include <QDebug>
 #include <QImageReader>
+#include <QElapsedTimer>
 
 class AOApplication;
 
@@ -21,7 +22,8 @@ public:
   void play_talking(QString p_char, QString p_emote);
   void play_idle(QString p_char, QString p_emote);
 
-  void set_frame(QImage image);
+  QPixmap get_pixmap(QImage image);
+  void set_frame(QPixmap f_pixmap);
 
   void stop();
 
@@ -35,19 +37,22 @@ public:
 private:
   AOApplication *ao_app;
 
-  QImageReader *m_reader;
+  QVector<QPixmap> movie_frames;
+  QVector<int> movie_delays;
   QTimer *preanim_timer;
   QTimer *ticker;
   QString last_path;
 
+  QElapsedTimer actual_time;
   const int time_mod = 60;
 
   // These are the X and Y values before they are fixed based on the sprite's width.
   int x = 0;
   int y = 0;
 
-  bool m_flipped = false;
+  int frame = 0;
 
+  bool m_flipped = false;
   bool play_once = true;
 
 signals:
-- 
cgit