Moved the animation display code into its own class which can and will also be used to display static images and sprites.

include/Animation.h

@@ -0,0 +1,76 @@
+/**
+   Animations are structured in AnimationData as follows:
+
+   .colors contains .color_count*3 uint8_t values for R, G and B.
+
+   .offsets contains the frame start offsets within .data + the length of the data. (So
+   you can always do something like `for (int i=anim.offsets[i]; i<anim.offsets[i+1]; i++)`.
+   Accordingly it has a length of .frame_count+1.
+
+   .data contains all frames data with a run-length compression with escape char 255.
+   This data references the index of one or multiple pixels in .colors. It starts at the
+   top left pixel and walks each row to the right before starting the next row.
+   To decode it: Start at a frame (indicated by .offsets). Get one byte as x.
+   If x is <255: This is a single pixel of color x.
+   if x is 255: Run-length-encoding. The next byte indicates of often the byte after that
+   will be repeated. So, {255, 4, 10} is equal to {10, 10, 10, 10}.
+   A special case that may happen in larger GIFs is that there are more than 255 repetitions
+   of a color. Those will be split, so 355*color #10 will be: {255, 255, 10, 255, 100, 10},
+   e.g. 255*10 + 100*10. Usually this shouldn't need special handling within a decoder.
+   Regarding colors in .data:
+   Color 0 means "keep the color from the previous frame". This color should never appear on frame #0.
+   Color 1 means "show the background color".
+   All other color values point to a color in .colors - with an offset of 2.
+   So if in .data there's a color 3, paint this pixel in .colors[1].
+
+   .individual_delays contains either 1 or .frame_count delays. They are given in ms and
+   indicate how long the matching frame should be displayed. If all times are equal, then
+   it contains only one entry and .individual_delays will be false.
+
+   .w and .h contain the dimensions of the image.
+ **/
+
+#pragma once
+#include <Arduino.h>
+#include "prototypes.h"
+#include "my_fastled.h"
+
+class Animation {
+	protected:
+		AnimationData* data;
+		unsigned long currentFrameSince;
+		uint8_t currentFrame = 0;
+		uint8_t* animation_data;
+		CRGB* colors;
+		CRGB* fgColor;
+		CRGB* bgColor;
+		uint16_t xOffset = 0;
+		uint16_t yOffset = 0;
+
+		virtual CRGB* getColor(uint8_t color_index);
+		void drawFrame(uint8_t frame_index);
+		void drawPixel(int index, CRGB* color);
+		uint16_t getFrameDelay(int frame);
+	public:
+		Animation(AnimationData* d) : Animation(d, new CRGB(0x000000), 0, 0) {};
+		Animation(AnimationData* d, CRGB* bg_color): Animation(d, bg_color, 0, 0) {};
+		Animation(AnimationData* d, CRGB* bg_color, uint16_t xOffset, uint16_t yOffset);
+		virtual ~Animation();
+		void draw();
+		void drawFrame();
+		virtual bool advance();
+};
+
+class Image : public Animation {
+	protected:
+		virtual bool advance();
+};
+
+class Sprite : public Image {
+	protected:
+		virtual CRGB* getColor(uint8_t color_index);
+	public:
+		void setFgColor(CRGB c);
+		void setBgColor(CRGB c);
+		void setColors(CRGB c1, CRGB c2);
+};

include/animations.h

@@ -30,8 +30,7 @@
    .w and .h contain the dimensions of the image.
  **/
 
-#ifndef Animations_H
-#define Animations_H
+#pragma once
 #include <Arduino.h>
 #include "prototypes.h"
 
@@ -39,5 +38,3 @@ extern AnimationData animation_koopa;
 extern AnimationData animation_couple_rain;
 extern AnimationData animation_couple_snow;
 extern AnimationData animation_heart;
-
-#endif

include/effect_animation.h

@@ -1,23 +1,22 @@
-#ifndef effect_animation_H
-#define effect_animation_H
+#pragma once
 
 #include "Effect.h"
 #include "prototypes.h"
 #include "my_fastled.h"
+#include "Animation.h"
 
 class AnimationEffect : public Effect {
   private:
-    AnimationData *animation;
-    int frame = 0;
-    CRGB background_color;
-    int xOffset, yOffset;
-    unsigned long frameSince = 0;
+    Animation *animation;
+    AnimationData *animation_data;
+    CRGB *bg_color;
+    uint16_t xOffset;
+    uint16_t yOffset;
   public:
-    AnimationEffect(AnimationData *anim);
-    AnimationEffect(AnimationData *anim, CRGB background_color);
-    AnimationEffect(AnimationData *anim, CRGB bg_color, int x, int y);
+    AnimationEffect(AnimationData* anim) : AnimationEffect(anim, new CRGB(0x000000), 0, 0) {}
+    AnimationEffect(AnimationData* anim, CRGB* background_color) : AnimationEffect(anim, background_color, 0, 0) {}
+    AnimationEffect(AnimationData* anim, CRGB* bg_color, int x, int y);
+    void start();
+    void stop();
     void loop();
-    void set(int i, CRGB* color);
-    uint16_t frameDelay(AnimationData* animation, int frame);
 };
-#endif