Compact bitmap animation #10

fweiss · Jul 19, 2024 · e96b4f0 · e96b4f0
1 parent 846452a
commit e96b4f0
Show file tree

Hide file tree

Showing 21 changed files with 338 additions and 142 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -4,6 +4,89 @@
         "vector": "cpp",
         "map": "cpp",
         "queue": "cpp",
-        "utility": "cpp"
-    }
+        "utility": "cpp",
+        "cstdint": "cpp",
+        "__config": "cpp",
+        "type_traits": "cpp",
+        "__bit_reference": "cpp",
+        "__bits": "cpp",
+        "__debug": "cpp",
+        "__errc": "cpp",
+        "__hash_table": "cpp",
+        "__locale": "cpp",
+        "__mutex_base": "cpp",
+        "__node_handle": "cpp",
+        "__nullptr": "cpp",
+        "__split_buffer": "cpp",
+        "__string": "cpp",
+        "__threading_support": "cpp",
+        "__tree": "cpp",
+        "__tuple": "cpp",
+        "array": "cpp",
+        "atomic": "cpp",
+        "bit": "cpp",
+        "bitset": "cpp",
+        "cctype": "cpp",
+        "charconv": "cpp",
+        "chrono": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "compare": "cpp",
+        "complex": "cpp",
+        "concepts": "cpp",
+        "condition_variable": "cpp",
+        "cstdarg": "cpp",
+        "cstddef": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "cwctype": "cpp",
+        "deque": "cpp",
+        "exception": "cpp",
+        "format": "cpp",
+        "future": "cpp",
+        "initializer_list": "cpp",
+        "iomanip": "cpp",
+        "ios": "cpp",
+        "iosfwd": "cpp",
+        "iostream": "cpp",
+        "istream": "cpp",
+        "limits": "cpp",
+        "list": "cpp",
+        "locale": "cpp",
+        "memory": "cpp",
+        "mutex": "cpp",
+        "new": "cpp",
+        "numbers": "cpp",
+        "numeric": "cpp",
+        "optional": "cpp",
+        "ostream": "cpp",
+        "random": "cpp",
+        "ratio": "cpp",
+        "regex": "cpp",
+        "semaphore": "cpp",
+        "set": "cpp",
+        "span": "cpp",
+        "sstream": "cpp",
+        "stack": "cpp",
+        "stdexcept": "cpp",
+        "streambuf": "cpp",
+        "string": "cpp",
+        "string_view": "cpp",
+        "system_error": "cpp",
+        "tuple": "cpp",
+        "typeinfo": "cpp",
+        "unordered_map": "cpp",
+        "variant": "cpp",
+        "*.tcc": "cpp",
+        "functional": "cpp",
+        "iterator": "cpp",
+        "memory_resource": "cpp",
+        "stop_token": "cpp",
+        "thread": "cpp",
+        "cinttypes": "cpp"
+    },
+    "cmake.configureOnOpen": false
 }
diff --git a/components/animations/Alphabet.cpp b/components/animations/Alphabet.cpp
diff --git a/components/animations/BitmapAnimation.cpp b/components/animations/BitmapAnimation.cpp
@@ -6,16 +6,3 @@ void BitmapAnimation::drawFrame(Frame &frame) {
     frame.draw(currentFrame);
     nextFrame();
 }
-
-void BitmapAnimation::drawFrame(uint16_t frameIndex) {
-    // std::vector<uint32_t> frame = frames.at(frameIndex);
-    // uint16_t p = 0;
-    // for (uint32_t c : frame) {
-    //     display.setPixel(p++, c);
-    // }
-    // display.update();
-}
-
-//const <std::vector<uint32_t> *frameDump() const {
-//    return display.
-//}
diff --git a/components/animations/CMakeLists.txt b/components/animations/CMakeLists.txt
@@ -12,6 +12,7 @@ idf_component_register(
 		Funbit64.cpp
 		Gravity.cpp
 		HeartAnimation.cpp
+        IndexedColorAnimation.cpp
 		JsonAnimation.cpp
 		Kaleidascope.cpp
 		MarqueeAniumation.cpp
@@ -36,3 +37,5 @@ idf_component_register(
     	json
 		motion
 )
+
+set_target_properties(${COMPONENT_LIB} PROPERTIES COMPILE_FLAGS "-save-temps=obj")
diff --git a/components/animations/DiceAnimation.cpp b/components/animations/DiceAnimation.cpp
@@ -1,32 +1,41 @@
 #include "DiceAnimation.h"
 
-DiceAnimation::DiceAnimation() : BitmapAnimation(frames, 2000) {
+DiceAnimation::DiceAnimation() : IndexedColorAnimation(2000) {
+    IndexedColorAnimation::setFrameCount(pixelIndexes);
+}
 
+void DiceAnimation::drawFrame(Frame &frame) {
+    IndexedColorAnimation::drawFrame(frame, colorMap, pixelIndexes);
 }
 
-std::vector<std::vector<uint32_t>> DiceAnimation::frames = {
+std::map<DiceAnimation::ColorIndex,uint32_t> DiceAnimation::colorMap = {
+        {black, 0x000000},
+        {white, 0xffffff}
+};
+
+DiceAnimation::ColorIndex DiceAnimation::pixelIndexes[6][64]{
 //        1 Die
 
-        {0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0xffffff,0xffffff,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0xffffff,0xffffff,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000},
+        {black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,white,white,black,black,black,black,black,black,white,white,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black},
 
 //        2 Die
 
-        {0xffffff,0xffffff,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0xffffff,0xffffff,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0xffffff,0xffffff,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0xffffff,0xffffff},
+        {white,white,black,black,black,black,black,black,white,white,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,white,white,black,black,black,black,black,black,white,white},
 
 //        3 Die
 
-        {0xffffff,0xffffff,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0xffffff,0xffffff,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0xffffff,0xffffff,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0xffffff,0xffffff,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0xffffff,0xffffff,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0xffffff,0xffffff},
+        {white,white,black,black,black,black,black,black,white,white,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,white,white,black,black,black,black,black,black,white,white,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,white,white,black,black,black,black,black,black,white,white},
 
 //        4 Die
 
-        {0xffffff,0xffffff,0x000000,0x000000,0x000000,0x000000,0xffffff,0xffffff,0xffffff,0xffffff,0x000000,0x000000,0x000000,0x000000,0xffffff,0xffffff,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0xffffff,0xffffff,0x000000,0x000000,0x000000,0x000000,0xffffff,0xffffff,0xffffff,0xffffff,0x000000,0x000000,0x000000,0x000000,0xffffff,0xffffff},
+        {white,white,black,black,black,black,white,white,white,white,black,black,black,black,white,white,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black,white,white,black,black,black,black,white,white,white,white,black,black,black,black,white,white},
 
 //        5 Die
 
-        {0xffffff,0xffffff,0x000000,0x000000,0x000000,0x000000,0xffffff,0xffffff,0xffffff,0xffffff,0x000000,0x000000,0x000000,0x000000,0xffffff,0xffffff,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0xffffff,0xffffff,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0xffffff,0xffffff,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0xffffff,0xffffff,0x000000,0x000000,0x000000,0x000000,0xffffff,0xffffff,0xffffff,0xffffff,0x000000,0x000000,0x000000,0x000000,0xffffff,0xffffff},
+        {white,white,black,black,black,black,white,white,white,white,black,black,black,black,white,white,black,black,black,black,black,black,black,black,black,black,black,white,white,black,black,black,black,black,black,white,white,black,black,black,black,black,black,black,black,black,black,black,white,white,black,black,black,black,white,white,white,white,black,black,black,black,white,white},
 
 //        6 Die
 
-        {0x000000,0xffffff,0xffffff,0x000000,0x000000,0xffffff,0xffffff,0x000000,0x000000,0xffffff,0xffffff,0x000000,0x000000,0xffffff,0xffffff,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0xffffff,0xffffff,0x000000,0x000000,0xffffff,0xffffff,0x000000,0x000000,0xffffff,0xffffff,0x000000,0x000000,0xffffff,0xffffff,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0x000000,0xffffff,0xffffff,0x000000,0x000000,0xffffff,0xffffff,0x000000,0x000000,0xffffff,0xffffff,0x000000,0x000000,0xffffff,0xffffff,0x000000}
+        {black,white,white,black,black,white,white,black,black,white,white,black,black,white,white,black,black,black,black,black,black,black,black,black,black,white,white,black,black,white,white,black,black,white,white,black,black,white,white,black,black,black,black,black,black,black,black,black,black,white,white,black,black,white,white,black,black,white,white,black,black,white,white,black}
 
 };