Fixed interrupt animation bugs on scenes.

nthnn · Mar 18, 2024 · 5fcc5f3 · 5fcc5f3
1 parent 305e69c
commit 5fcc5f3
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 14 deletions.
diff --git a/include/tomo_scene.h b/include/tomo_scene.h
@@ -21,18 +21,21 @@ class TomoScene {
     void disableInterrupt();
     void hasNoInterrupt();
     bool hasInterrupt();
+    bool wasInterrupted();
 
     void setRepeatCount(uint8_t repeatCount);
     uint8_t getRepeatCount() const;
 
     template <typename T>
-    static void renderScene(uint8_t repeatCount, bool interruptEnabled = true) {
+    static bool renderScene(uint8_t repeatCount, bool interruptEnabled = true) {
         T scene;
         if(!interruptEnabled)
             scene.disableInterrupt();
 
         scene.setRepeatCount(repeatCount);
         scene.render();
+
+        return scene.wasInterrupted();
     }
 };
 

diff --git a/src/scenes/tomo_blink.cpp b/src/scenes/tomo_blink.cpp
@@ -9,8 +9,11 @@ TomoBlinkScene::TomoBlinkScene() {
 }
 
 void TomoBlinkScene::rendition() {
-	TomoScene::renderScene<TomoClosingEyesScene>(1);
-	TomoScene::renderScene<TomoOpeningEyesScene>(1);
+	if(TomoScene::renderScene<TomoClosingEyesScene>(1))
+		return;
+
+	if(TomoScene::renderScene<TomoOpeningEyesScene>(1))
+		return;
 }
 
 void TomoBlinkScene::onInteract() { }
diff --git a/src/scenes/tomo_rest.cpp b/src/scenes/tomo_rest.cpp
@@ -11,11 +11,17 @@ TomoRestScene::TomoRestScene() {
 }
 
 void TomoRestScene::rendition() {
-	TomoScene::renderScene<TomoClosingEyesScene>(1);
-    TomoScene::renderScene<TomoExhaustedScene>(1);
-    TomoScene::renderScene<TomoSleepingScene>(12);
-    TomoScene::renderScene<TomoExhaustedScene>(1);
-	TomoScene::renderScene<TomoOpeningEyesScene>(1);
+	if(TomoScene::renderScene<TomoClosingEyesScene>(1))
+        return;
+
+    if(TomoScene::renderScene<TomoExhaustedScene>(1))
+        return;
+
+    if(TomoScene::renderScene<TomoSleepingScene>(12))
+        return;
+
+	if(TomoScene::renderScene<TomoOpeningEyesScene>(1))
+        return;
 }
 
 void TomoRestScene::onInteract() { }
diff --git a/src/tomo_scene.cpp b/src/tomo_scene.cpp
@@ -1,11 +1,10 @@
 #include <tomo_scene.h>
 
-bool shouldContinue = true;
-TomoScene* instancePtr = nullptr;
+bool shouldContinue = true,
+    interrupted = false;
 
 void IRAM_ATTR touchInterruptWrapper() {
-    if(instancePtr != nullptr)
-        shouldContinue = false;
+    shouldContinue = false;
 }
 
 void TomoScene::disableInterrupt() {
@@ -22,20 +21,25 @@ void TomoScene::initializeTouchPin() {
 }
 
 void TomoScene::render() {
-    instancePtr = this;
-
     for(uint8_t i = 0; i < this->getRepeatCount(); i++) {
         if(!shouldContinue && this->_hasInterrupt && this->_interruptEnabled) {
             this->onInteract();
+
             shouldContinue = true;
+            interrupted = true;
 
             break;
         }
 
         this->rendition();
+        interrupted = false;
     }
 }
 
+bool TomoScene::wasInterrupted() {
+    return interrupted;
+}
+
 void TomoScene::setRepeatCount(uint8_t repeatCount) {
     this->repeatCount = repeatCount;
 }