Add rect eyebrow

Author: botamochi6277

src/Eyebrows.cpp

@@ -23,11 +23,15 @@ void BaseEyebrow::update(M5Canvas *canvas, BoundingRect rect,
         ctx->getColorDepth() == 1 ? ERACER_COLOR : cp->get(COLOR_BACKGROUND);
     center_x_ = rect.getCenterX();
     center_y_ = rect.getCenterY();
+    expression_ = ctx->getExpression();
 }
 
 void EllipseEyebrow::draw(M5Canvas *canvas, BoundingRect rect,
                           DrawContext *ctx) {
     this->update(canvas, rect, ctx);
+    if (width_ == 0 || height_ == 0) {
+        return;  // draw nothing
+    }
 
     canvas->fillEllipse(center_x_, center_y_, this->width_ / 2,
                         this->height_ / 2, primary_color_);
@@ -43,4 +47,22 @@ void BowEyebrow::draw(M5Canvas *canvas, BoundingRect rect, DrawContext *ctx) {
                     angle0, angle0 + stroke_angle, primary_color_);
 }
 
+void RectEyebrow::draw(M5Canvas *canvas, BoundingRect rect, DrawContext *ctx) {
+    this->update(canvas, rect, ctx);
+
+    if (width_ == 0 || height_ == 0) {
+        return;
+    }
+    float angle = 0.0f;
+    if (expression_ == Expression::Angry) {
+        angle = is_left_ ? -M_PI / 6.0f : M_PI / 6.0f;
+    }
+    if (expression_ == Expression::Sad) {
+        angle = is_left_ ? M_PI / 6.0f : -M_PI / 6.0f;
+    }
+
+    fillRotatedRect(canvas, center_x_, center_y_, width_, height_, angle,
+                    primary_color_);
+}
+
 }  // namespace m5avatar

src/Eyebrows.hpp

@@ -51,6 +51,12 @@ class BowEyebrow : public BaseEyebrow {
     void draw(M5Canvas *canvas, BoundingRect rect, DrawContext *ctx);
 };
 
+class RectEyebrow : public BaseEyebrow {
+   public:
+    using BaseEyebrow::BaseEyebrow;
+    void draw(M5Canvas *canvas, BoundingRect rect, DrawContext *ctx);
+};
+
 }  // namespace m5avatar
 
 #endif