Skip to content

Commit 534b04c

Browse files
nthnnnthnn
committedMar 19, 2024·
Updated facial animation classes.
1 parent a6e2107 commit 534b04c

12 files changed

+126
-120
lines changed
 

‎src/scenes/tomo_blink.cpp

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
#include <scenes/tomo_blink.h>
22
#include <scenes/tomo_closing_eyes.h>
3+
#include <scenes/tomo_interrupt.h>
34
#include <scenes/tomo_opening_eyes.h>
45

56
#include <tomo_scene.h>
67

7-
TomoBlinkScene::TomoBlinkScene() {
8-
this->hasNoInterrupt();
9-
}
8+
TomoBlinkScene::TomoBlinkScene() { }
109

1110
void TomoBlinkScene::rendition() {
12-
if(TomoScene::renderScene<TomoClosingEyesScene>(1))
11+
if(TomoScene::renderScene<TomoClosingEyesScene>())
1312
return;
1413

15-
if(TomoScene::renderScene<TomoOpeningEyesScene>(1))
14+
if(TomoScene::renderScene<TomoOpeningEyesScene>())
1615
return;
1716
}
1817

19-
void TomoBlinkScene::onInteract() { }
18+
void TomoBlinkScene::onInteract() {
19+
TomoScene::renderScene<TomoInterruptScene>();
20+
}

‎src/scenes/tomo_closing_eyes.cpp

+12-13
Original file line numberDiff line numberDiff line change
@@ -538,20 +538,19 @@ const uint8_t tomo_closing_eyes_8[] PROGMEM = {
538538
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
539539
};
540540

541-
TomoClosingEyesScene::TomoClosingEyesScene() { }
541+
TomoClosingEyesScene::TomoClosingEyesScene() {
542+
this->hasNoInterrupt();
543+
}
542544

543545
void TomoClosingEyesScene::rendition() {
544-
TomoDisplay::renderBitmap(tomo_closing_eyes_1), delay(1000);
545-
TomoDisplay::renderBitmap(tomo_closing_eyes_2), delay(5);
546-
TomoDisplay::renderBitmap(tomo_closing_eyes_3), delay(5);
547-
TomoDisplay::renderBitmap(tomo_closing_eyes_4), delay(5);
548-
TomoDisplay::renderBitmap(tomo_closing_eyes_5), delay(5);
549-
TomoDisplay::renderBitmap(tomo_closing_eyes_6), delay(5);
550-
TomoDisplay::renderBitmap(tomo_closing_eyes_7), delay(5);
551-
TomoDisplay::renderBitmap(tomo_closing_eyes_8), delay(5);
546+
TomoDisplay::renderBitmap(tomo_closing_eyes_1, 1000);
547+
TomoDisplay::renderBitmap(tomo_closing_eyes_2);
548+
TomoDisplay::renderBitmap(tomo_closing_eyes_3);
549+
TomoDisplay::renderBitmap(tomo_closing_eyes_4);
550+
TomoDisplay::renderBitmap(tomo_closing_eyes_5);
551+
TomoDisplay::renderBitmap(tomo_closing_eyes_6);
552+
TomoDisplay::renderBitmap(tomo_closing_eyes_7);
553+
TomoDisplay::renderBitmap(tomo_closing_eyes_8);
552554
}
553555

554-
void TomoClosingEyesScene::onInteract() {
555-
TomoScene::renderScene<TomoOpeningEyesScene>(1, false);
556-
TomoScene::renderScene<TomoInterruptScene>(1);
557-
}
556+
void TomoClosingEyesScene::onInteract() { }

‎src/scenes/tomo_exhausted.cpp

+13-13
Original file line numberDiff line numberDiff line change
@@ -206,19 +206,19 @@ TomoExhaustedScene::TomoExhaustedScene() {
206206
}
207207

208208
void TomoExhaustedScene::rendition() {
209-
TomoDisplay::renderBitmap(tomo_exhausted_1), delay(5);
210-
TomoDisplay::renderBitmap(tomo_exhausted_2), delay(50);
211-
TomoDisplay::renderBitmap(tomo_exhausted_3), delay(400);
212-
TomoDisplay::renderBitmap(tomo_exhausted_2), delay(50);
213-
TomoDisplay::renderBitmap(tomo_exhausted_1), delay(5);
214-
TomoDisplay::renderBitmap(tomo_exhausted_2), delay(50);
215-
TomoDisplay::renderBitmap(tomo_exhausted_3), delay(800);
216-
TomoDisplay::renderBitmap(tomo_exhausted_2), delay(50);
217-
TomoDisplay::renderBitmap(tomo_exhausted_1), delay(5);
218-
TomoDisplay::renderBitmap(tomo_exhausted_2), delay(50);
219-
TomoDisplay::renderBitmap(tomo_exhausted_3), delay(1000);
220-
TomoDisplay::renderBitmap(tomo_exhausted_2), delay(50);
221-
TomoDisplay::renderBitmap(tomo_exhausted_1), delay(5);
209+
TomoDisplay::renderBitmap(tomo_exhausted_1);
210+
TomoDisplay::renderBitmap(tomo_exhausted_2, 50);
211+
TomoDisplay::renderBitmap(tomo_exhausted_3, 400);
212+
TomoDisplay::renderBitmap(tomo_exhausted_2, 50);
213+
TomoDisplay::renderBitmap(tomo_exhausted_1);
214+
TomoDisplay::renderBitmap(tomo_exhausted_2, 50);
215+
TomoDisplay::renderBitmap(tomo_exhausted_3, 800);
216+
TomoDisplay::renderBitmap(tomo_exhausted_2, 50);
217+
TomoDisplay::renderBitmap(tomo_exhausted_1);
218+
TomoDisplay::renderBitmap(tomo_exhausted_2, 50);
219+
TomoDisplay::renderBitmap(tomo_exhausted_3, 1000);
220+
TomoDisplay::renderBitmap(tomo_exhausted_2, 50);
221+
TomoDisplay::renderBitmap(tomo_exhausted_1);
222222
}
223223

224224
void TomoExhaustedScene::onInteract() { }

‎src/scenes/tomo_interrupt.cpp

+9-4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#include <scenes/tomo_angry.h>
12
#include <scenes/tomo_interrupt.h>
23
#include <scenes/tomo_interrupta.h>
34
#include <scenes/tomo_left_lift.h>
@@ -11,17 +12,21 @@ TomoInterruptScene::TomoInterruptScene() {
1112
}
1213

1314
void TomoInterruptScene::rendition() {
14-
switch(TomoRNGEngine::get(0, 2)) {
15+
switch(TomoRNGEngine::get(0, 3)) {
16+
case TOMO_INT_ANGRY:
17+
TomoScene::renderScene<TomoAngryScene>();
18+
break;
19+
1520
case TOMO_INT_A:
16-
TomoScene::renderScene<TomoInterruptAScene>(1);
21+
TomoScene::renderScene<TomoInterruptAScene>();
1722
break;
1823

1924
case TOMO_INT_LEFT_LIFT:
20-
TomoScene::renderScene<TomoLeftLiftScene>(1);
25+
TomoScene::renderScene<TomoLeftLiftScene>();
2126
break;
2227

2328
case TOMO_INT_RIGHT_LIFT:
24-
TomoScene::renderScene<TomoRightLiftScene>(1);
29+
TomoScene::renderScene<TomoRightLiftScene>();
2530
break;
2631
}
2732
}

‎src/scenes/tomo_interrupta.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -206,10 +206,10 @@ TomoInterruptAScene::TomoInterruptAScene() {
206206
}
207207

208208
void TomoInterruptAScene::rendition() {
209-
TomoDisplay::renderBitmap(tomo_interrupta_1), delay(50);
210-
TomoDisplay::renderBitmap(tomo_interrupta_2), delay(1000);
211-
TomoDisplay::renderBitmap(tomo_interrupta_3), delay(60);
212-
TomoDisplay::renderBitmap(tomo_interrupta_1), delay(50);
209+
TomoDisplay::renderBitmap(tomo_interrupta_1, 50);
210+
TomoDisplay::renderBitmap(tomo_interrupta_2, 1000);
211+
TomoDisplay::renderBitmap(tomo_interrupta_3, 60);
212+
TomoDisplay::renderBitmap(tomo_interrupta_1, 50);
213213
}
214214

215215
void TomoInterruptAScene::onInteract() { }

‎src/scenes/tomo_left.cpp

+14-14
Original file line numberDiff line numberDiff line change
@@ -541,20 +541,20 @@ TomoLeftScene::TomoLeftScene() {
541541
}
542542

543543
void TomoLeftScene::rendition() {
544-
TomoDisplay::renderBitmap(tomo_left_1), delay(1000);
545-
TomoDisplay::renderBitmap(tomo_left_2), delay(5);
546-
TomoDisplay::renderBitmap(tomo_left_3), delay(5);
547-
TomoDisplay::renderBitmap(tomo_left_4), delay(5);
548-
TomoDisplay::renderBitmap(tomo_left_5), delay(5);
549-
TomoDisplay::renderBitmap(tomo_left_6), delay(5);
550-
TomoDisplay::renderBitmap(tomo_left_7), delay(5);
551-
TomoDisplay::renderBitmap(tomo_left_8), delay(1000);
552-
TomoDisplay::renderBitmap(tomo_left_7), delay(5);
553-
TomoDisplay::renderBitmap(tomo_left_6), delay(5);
554-
TomoDisplay::renderBitmap(tomo_left_5), delay(5);
555-
TomoDisplay::renderBitmap(tomo_left_4), delay(5);
556-
TomoDisplay::renderBitmap(tomo_left_3), delay(5);
557-
TomoDisplay::renderBitmap(tomo_left_2), delay(5);
544+
TomoDisplay::renderBitmap(tomo_left_1, 1000);
545+
TomoDisplay::renderBitmap(tomo_left_2);
546+
TomoDisplay::renderBitmap(tomo_left_3);
547+
TomoDisplay::renderBitmap(tomo_left_4);
548+
TomoDisplay::renderBitmap(tomo_left_5);
549+
TomoDisplay::renderBitmap(tomo_left_6);
550+
TomoDisplay::renderBitmap(tomo_left_7);
551+
TomoDisplay::renderBitmap(tomo_left_8, 1000);
552+
TomoDisplay::renderBitmap(tomo_left_7);
553+
TomoDisplay::renderBitmap(tomo_left_6);
554+
TomoDisplay::renderBitmap(tomo_left_5);
555+
TomoDisplay::renderBitmap(tomo_left_4);
556+
TomoDisplay::renderBitmap(tomo_left_3);
557+
TomoDisplay::renderBitmap(tomo_left_2);
558558
}
559559

560560
void TomoLeftScene::onInteract() { }

‎src/scenes/tomo_left_lift.cpp

+15-15
Original file line numberDiff line numberDiff line change
@@ -541,21 +541,21 @@ TomoLeftLiftScene::TomoLeftLiftScene() {
541541
}
542542

543543
void TomoLeftLiftScene::rendition() {
544-
TomoDisplay::renderBitmap(tomo_left_lift_1), delay(5);
545-
TomoDisplay::renderBitmap(tomo_left_lift_2), delay(5);
546-
TomoDisplay::renderBitmap(tomo_left_lift_3), delay(5);
547-
TomoDisplay::renderBitmap(tomo_left_lift_4), delay(5);
548-
TomoDisplay::renderBitmap(tomo_left_lift_5), delay(5);
549-
TomoDisplay::renderBitmap(tomo_left_lift_6), delay(5);
550-
TomoDisplay::renderBitmap(tomo_left_lift_7), delay(5);
551-
TomoDisplay::renderBitmap(tomo_left_lift_8), delay(1000);
552-
TomoDisplay::renderBitmap(tomo_left_lift_7), delay(5);
553-
TomoDisplay::renderBitmap(tomo_left_lift_6), delay(5);
554-
TomoDisplay::renderBitmap(tomo_left_lift_5), delay(5);
555-
TomoDisplay::renderBitmap(tomo_left_lift_4), delay(5);
556-
TomoDisplay::renderBitmap(tomo_left_lift_3), delay(5);
557-
TomoDisplay::renderBitmap(tomo_left_lift_2), delay(5);
558-
TomoDisplay::renderBitmap(tomo_left_lift_1), delay(5);
544+
TomoDisplay::renderBitmap(tomo_left_lift_1);
545+
TomoDisplay::renderBitmap(tomo_left_lift_2);
546+
TomoDisplay::renderBitmap(tomo_left_lift_3);
547+
TomoDisplay::renderBitmap(tomo_left_lift_4);
548+
TomoDisplay::renderBitmap(tomo_left_lift_5);
549+
TomoDisplay::renderBitmap(tomo_left_lift_6);
550+
TomoDisplay::renderBitmap(tomo_left_lift_7);
551+
TomoDisplay::renderBitmap(tomo_left_lift_8, 1000);
552+
TomoDisplay::renderBitmap(tomo_left_lift_7);
553+
TomoDisplay::renderBitmap(tomo_left_lift_6);
554+
TomoDisplay::renderBitmap(tomo_left_lift_5);
555+
TomoDisplay::renderBitmap(tomo_left_lift_4);
556+
TomoDisplay::renderBitmap(tomo_left_lift_3);
557+
TomoDisplay::renderBitmap(tomo_left_lift_2);
558+
TomoDisplay::renderBitmap(tomo_left_lift_1);
559559
}
560560

561561
void TomoLeftLiftScene::onInteract() { }

‎src/scenes/tomo_opening_eyes.cpp

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#include <scenes/tomo_opening_eyes.h>
2-
#include <scenes/tomo_interrupta.h>
2+
#include <scenes/tomo_interrupt.h>
3+
4+
#include <tomo_scene.h>
35

46
const uint8_t tomo_opening_eyes_1[] PROGMEM = {
57
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -542,16 +544,14 @@ TomoOpeningEyesScene::TomoOpeningEyesScene() {
542544
}
543545

544546
void TomoOpeningEyesScene::rendition() {
545-
TomoDisplay::renderBitmap(tomo_opening_eyes_1), delay(5);
546-
TomoDisplay::renderBitmap(tomo_opening_eyes_2), delay(5);
547-
TomoDisplay::renderBitmap(tomo_opening_eyes_3), delay(5);
548-
TomoDisplay::renderBitmap(tomo_opening_eyes_4), delay(5);
549-
TomoDisplay::renderBitmap(tomo_opening_eyes_5), delay(5);
550-
TomoDisplay::renderBitmap(tomo_opening_eyes_6), delay(5);
551-
TomoDisplay::renderBitmap(tomo_opening_eyes_7), delay(5);
552-
TomoDisplay::renderBitmap(tomo_opening_eyes_8), delay(1000);
547+
TomoDisplay::renderBitmap(tomo_opening_eyes_1);
548+
TomoDisplay::renderBitmap(tomo_opening_eyes_2);
549+
TomoDisplay::renderBitmap(tomo_opening_eyes_3);
550+
TomoDisplay::renderBitmap(tomo_opening_eyes_4);
551+
TomoDisplay::renderBitmap(tomo_opening_eyes_5);
552+
TomoDisplay::renderBitmap(tomo_opening_eyes_6);
553+
TomoDisplay::renderBitmap(tomo_opening_eyes_7);
554+
TomoDisplay::renderBitmap(tomo_opening_eyes_8, 1000);
553555
}
554556

555-
void TomoOpeningEyesScene::onInteract() {
556-
TomoScene::renderScene<TomoInterruptAScene>(1);
557-
}
557+
void TomoOpeningEyesScene::onInteract() { }

‎src/scenes/tomo_rest.cpp

+5-4
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,24 @@
44
#include <scenes/tomo_rest.h>
55
#include <scenes/tomo_sleeping.h>
66

7+
#include <tomo_rng_engine.h>
78
#include <tomo_scene.h>
89

910
TomoRestScene::TomoRestScene() {
1011
this->hasNoInterrupt();
1112
}
1213

1314
void TomoRestScene::rendition() {
14-
if(TomoScene::renderScene<TomoClosingEyesScene>(1))
15+
if(TomoScene::renderScene<TomoClosingEyesScene>())
1516
return;
1617

17-
if(TomoScene::renderScene<TomoExhaustedScene>(1))
18+
if(TomoScene::renderScene<TomoExhaustedScene>())
1819
return;
1920

20-
if(TomoScene::renderScene<TomoSleepingScene>(12))
21+
if(TomoScene::renderScene<TomoSleepingScene>(TomoRNGEngine::get(0, 12)))
2122
return;
2223

23-
if(TomoScene::renderScene<TomoOpeningEyesScene>(1))
24+
if(TomoScene::renderScene<TomoOpeningEyesScene>())
2425
return;
2526
}
2627

‎src/scenes/tomo_right.cpp

+14-14
Original file line numberDiff line numberDiff line change
@@ -541,20 +541,20 @@ TomoRightScene::TomoRightScene() {
541541
}
542542

543543
void TomoRightScene::rendition() {
544-
TomoDisplay::renderBitmap(tomo_right_1), delay(1000);
545-
TomoDisplay::renderBitmap(tomo_right_2), delay(5);
546-
TomoDisplay::renderBitmap(tomo_right_3), delay(5);
547-
TomoDisplay::renderBitmap(tomo_right_4), delay(5);
548-
TomoDisplay::renderBitmap(tomo_right_5), delay(5);
549-
TomoDisplay::renderBitmap(tomo_right_6), delay(5);
550-
TomoDisplay::renderBitmap(tomo_right_7), delay(5);
551-
TomoDisplay::renderBitmap(tomo_right_8), delay(1000);
552-
TomoDisplay::renderBitmap(tomo_right_7), delay(5);
553-
TomoDisplay::renderBitmap(tomo_right_6), delay(5);
554-
TomoDisplay::renderBitmap(tomo_right_5), delay(5);
555-
TomoDisplay::renderBitmap(tomo_right_4), delay(5);
556-
TomoDisplay::renderBitmap(tomo_right_3), delay(5);
557-
TomoDisplay::renderBitmap(tomo_right_2), delay(5);
544+
TomoDisplay::renderBitmap(tomo_right_1, 1000);
545+
TomoDisplay::renderBitmap(tomo_right_2);
546+
TomoDisplay::renderBitmap(tomo_right_3);
547+
TomoDisplay::renderBitmap(tomo_right_4);
548+
TomoDisplay::renderBitmap(tomo_right_5);
549+
TomoDisplay::renderBitmap(tomo_right_6);
550+
TomoDisplay::renderBitmap(tomo_right_7);
551+
TomoDisplay::renderBitmap(tomo_right_8, 1000);
552+
TomoDisplay::renderBitmap(tomo_right_7);
553+
TomoDisplay::renderBitmap(tomo_right_6);
554+
TomoDisplay::renderBitmap(tomo_right_5);
555+
TomoDisplay::renderBitmap(tomo_right_4);
556+
TomoDisplay::renderBitmap(tomo_right_3);
557+
TomoDisplay::renderBitmap(tomo_right_2);
558558
}
559559

560560
void TomoRightScene::onInteract() { }

‎src/scenes/tomo_right_lift.cpp

+15-15
Original file line numberDiff line numberDiff line change
@@ -541,21 +541,21 @@ TomoRightLiftScene::TomoRightLiftScene() {
541541
}
542542

543543
void TomoRightLiftScene::rendition() {
544-
TomoDisplay::renderBitmap(tomo_right_lift_1), delay(5);
545-
TomoDisplay::renderBitmap(tomo_right_lift_2), delay(5);
546-
TomoDisplay::renderBitmap(tomo_right_lift_3), delay(5);
547-
TomoDisplay::renderBitmap(tomo_right_lift_4), delay(5);
548-
TomoDisplay::renderBitmap(tomo_right_lift_5), delay(5);
549-
TomoDisplay::renderBitmap(tomo_right_lift_6), delay(5);
550-
TomoDisplay::renderBitmap(tomo_right_lift_7), delay(5);
551-
TomoDisplay::renderBitmap(tomo_right_lift_8), delay(1000);
552-
TomoDisplay::renderBitmap(tomo_right_lift_7), delay(5);
553-
TomoDisplay::renderBitmap(tomo_right_lift_6), delay(5);
554-
TomoDisplay::renderBitmap(tomo_right_lift_5), delay(5);
555-
TomoDisplay::renderBitmap(tomo_right_lift_4), delay(5);
556-
TomoDisplay::renderBitmap(tomo_right_lift_3), delay(5);
557-
TomoDisplay::renderBitmap(tomo_right_lift_2), delay(5);
558-
TomoDisplay::renderBitmap(tomo_right_lift_1), delay(5);
544+
TomoDisplay::renderBitmap(tomo_right_lift_1);
545+
TomoDisplay::renderBitmap(tomo_right_lift_2);
546+
TomoDisplay::renderBitmap(tomo_right_lift_3);
547+
TomoDisplay::renderBitmap(tomo_right_lift_4);
548+
TomoDisplay::renderBitmap(tomo_right_lift_5);
549+
TomoDisplay::renderBitmap(tomo_right_lift_6);
550+
TomoDisplay::renderBitmap(tomo_right_lift_7);
551+
TomoDisplay::renderBitmap(tomo_right_lift_8, 1000);
552+
TomoDisplay::renderBitmap(tomo_right_lift_7);
553+
TomoDisplay::renderBitmap(tomo_right_lift_6);
554+
TomoDisplay::renderBitmap(tomo_right_lift_5);
555+
TomoDisplay::renderBitmap(tomo_right_lift_4);
556+
TomoDisplay::renderBitmap(tomo_right_lift_3);
557+
TomoDisplay::renderBitmap(tomo_right_lift_2);
558+
TomoDisplay::renderBitmap(tomo_right_lift_1);
559559
}
560560

561561
void TomoRightLiftScene::onInteract() { }

‎src/scenes/tomo_sleeping.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -406,12 +406,12 @@ const uint8_t tomo_sleeping_6[] PROGMEM = {
406406
TomoSleepingScene::TomoSleepingScene() { }
407407

408408
void TomoSleepingScene::rendition() {
409-
TomoDisplay::renderBitmap(tomo_sleeping_1), delay(100);
410-
TomoDisplay::renderBitmap(tomo_sleeping_2), delay(100);
411-
TomoDisplay::renderBitmap(tomo_sleeping_3), delay(100);
412-
TomoDisplay::renderBitmap(tomo_sleeping_4), delay(100);
413-
TomoDisplay::renderBitmap(tomo_sleeping_5), delay(100);
414-
TomoDisplay::renderBitmap(tomo_sleeping_6), delay(100);
409+
TomoDisplay::renderBitmap(tomo_sleeping_1, 100);
410+
TomoDisplay::renderBitmap(tomo_sleeping_2, 100);
411+
TomoDisplay::renderBitmap(tomo_sleeping_3, 100);
412+
TomoDisplay::renderBitmap(tomo_sleeping_4, 100);
413+
TomoDisplay::renderBitmap(tomo_sleeping_5, 100);
414+
TomoDisplay::renderBitmap(tomo_sleeping_6, 100);
415415
}
416416

417417
void TomoSleepingScene::onInteract() {

0 commit comments

Comments
 (0)
Please sign in to comment.