Add faces to face-and-color.ino

Author: botamochi6277

examples/face-and-color/face-and-color.ino

@@ -1,72 +1,79 @@
-#include <M5Unified.h>
 #include <Avatar.h>
-#include <faces/DogFace.h>
+#include <M5Unified.h>
+
+#include <faces/FaceTemplates.hpp>
 
 using namespace m5avatar;
 
 Avatar avatar;
 
-Face* faces[2];
-const int facesSize = sizeof(faces) / sizeof(Face*);
-int faceIdx = 0;
+Face* faces[5];
+const int num_faces = sizeof(faces) / sizeof(Face*);
+int face_idx = 0;  // face index
 
-const Expression expressions[] = {
-  Expression::Angry,
-  Expression::Sleepy,
-  Expression::Happy,
-  Expression::Sad,
-  Expression::Doubt,
-  Expression::Neutral
-};
-const int expressionsSize = sizeof(expressions) / sizeof(Expression);
+const Expression expressions[] = {Expression::Angry, Expression::Sleepy,
+                                  Expression::Happy, Expression::Sad,
+                                  Expression::Doubt, Expression::Neutral};
+const int num_expressions = sizeof(expressions) / sizeof(Expression);
 int idx = 0;
 
-ColorPalette* cps[4];
-const int cpsSize = sizeof(cps) / sizeof(ColorPalette*);
-int cpsIdx = 0;
+ColorPalette* color_palettes[5];
+const int num_palettes = sizeof(color_palettes) / sizeof(ColorPalette*);
+int palette_idx = 0;
 
 bool isShowingQR = false;
 
-void setup()
-{
-  M5.begin();
-  M5.Lcd.setBrightness(30);
-  M5.Lcd.clear();
+void setup() {
+    M5.begin();
+    M5.Lcd.setBrightness(30);
+    M5.Lcd.clear();
 
-  faces[0] = avatar.getFace();
-  faces[1] = new DogFace();
+    faces[0] = avatar.getFace();  // native face
+    faces[1] = new DoggyFace();
+    faces[2] = new OmegaFace();
+    faces[3] = new GirlyFace();
+    faces[4] = new PinkDemonFace();
 
-  cps[0] = new ColorPalette();
-  cps[1] = new ColorPalette();
-  cps[2] = new ColorPalette();
-  cps[3] = new ColorPalette();
-  cps[1]->set(COLOR_PRIMARY, TFT_YELLOW);
-  cps[1]->set(COLOR_BACKGROUND, TFT_DARKCYAN);
-  cps[2]->set(COLOR_PRIMARY, TFT_DARKGREY);
-  cps[2]->set(COLOR_BACKGROUND, TFT_WHITE);
-  cps[3]->set(COLOR_PRIMARY, TFT_RED);
-  cps[3]->set(COLOR_BACKGROUND, TFT_PINK);
+    color_palettes[0] = new ColorPalette();
+    color_palettes[1] = new ColorPalette();
+    color_palettes[2] = new ColorPalette();
+    color_palettes[3] = new ColorPalette();
+    color_palettes[4] = new ColorPalette();
+    color_palettes[1]->set(COLOR_PRIMARY,
+                           M5.Lcd.color24to16(0x383838));  // eye
+    color_palettes[1]->set(COLOR_BACKGROUND,
+                           M5.Lcd.color24to16(0xfac2a8));  // skin
+    color_palettes[1]->set(COLOR_SECONDARY,
+                           TFT_PINK);  // cheek
+    color_palettes[2]->set(COLOR_PRIMARY, TFT_YELLOW);
+    color_palettes[2]->set(COLOR_BACKGROUND, TFT_DARKCYAN);
+    color_palettes[3]->set(COLOR_PRIMARY, TFT_DARKGREY);
+    color_palettes[3]->set(COLOR_BACKGROUND, TFT_WHITE);
+    color_palettes[4]->set(COLOR_PRIMARY, TFT_RED);
+    color_palettes[4]->set(COLOR_BACKGROUND, TFT_PINK);
 
-  avatar.init();
-  avatar.setColorPalette(*cps[0]);
+    avatar.init(8);  // start drawing w/ 8bit color mode
+    avatar.setColorPalette(*color_palettes[0]);
 }
 
-void loop()
-{
-  M5.update();
-  if (M5.BtnA.wasPressed())
-  {
-    avatar.setFace(faces[faceIdx]);
-    faceIdx = (faceIdx + 1) % facesSize;
-  }
-  if (M5.BtnB.wasPressed())
-  {
-    avatar.setColorPalette(*cps[cpsIdx]);
-    cpsIdx = (cpsIdx + 1) % cpsSize;
-  }
-  if (M5.BtnC.wasPressed())
-  {
-    avatar.setExpression(expressions[idx]);
-    idx = (idx + 1) % expressionsSize;
-  }
+void loop() {
+    M5.update();
+    // M5Stack Core's button layout:
+    // -----------
+    // |         |
+    // |         |
+    // -----------
+    // [A] [B] [C]
+    if (M5.BtnA.wasPressed()) {
+        avatar.setFace(faces[face_idx]);
+        face_idx = (face_idx + 1) % num_faces;  // loop index
+    }
+    if (M5.BtnB.wasPressed()) {
+        avatar.setColorPalette(*color_palettes[palette_idx]);
+        palette_idx = (palette_idx + 1) % num_palettes;
+    }
+    if (M5.BtnC.wasPressed()) {
+        avatar.setExpression(expressions[idx]);
+        idx = (idx + 1) % num_expressions;
+    }
 }

src/Eyes.cpp

@@ -231,13 +231,11 @@ void PinkDemonEye::drawEyeLid(M5Canvas *canvas) {
 
     float tilt = 0.0f;
     float ref_tilt = open_ratio_ * M_PI / 6.0f;
-    float bias;
     if (expression_ == Expression::Angry) {
         tilt = this->is_left_ ? -ref_tilt : ref_tilt;
     } else if (expression_ == Expression::Sad) {
         tilt = this->is_left_ ? ref_tilt : -ref_tilt;
     }
-    bias = 0.2f * width_ * tilt / (M_PI / 6.0f);
 
     if ((open_ratio_ < 0.99f) || (abs(tilt) > 0.1f)) {
         // mask
@@ -253,18 +251,14 @@ void PinkDemonEye::drawEyeLid(M5Canvas *canvas) {
                               shifted_x_, upper_eyelid_y, background_color_);
 
         // eyelid
-        float eyelid_top_left_x = shifted_x_ - (this->width_ / 2) + bias;
+        float eyelid_top_left_x = shifted_x_ - (this->width_ / 2);
         float eyelid_top_left_y = upper_eyelid_y - 4;
-        float eyelid_bottom_right_x = shifted_x_ + (this->width_ / 2) + bias;
+        float eyelid_bottom_right_x = shifted_x_ + (this->width_ / 2);
         float eyelid_bottom_right_y = upper_eyelid_y;
 
         fillRectRotatedAround(canvas, eyelid_top_left_x, eyelid_top_left_y,
                               eyelid_bottom_right_x, eyelid_bottom_right_y,
                               tilt, shifted_x_, upper_eyelid_y, primary_color_);
-
-        eyelash_x0 += bias;
-        eyelash_x1 += bias;
-        eyelash_x2 += bias;
     }
 
     // eyelash