fix palette problem #83

Author: mongonta0716

src/Face.cpp

@@ -4,30 +4,6 @@
 
 #include "Face.h"
 
-// TODO(meganetaaan): move to another file
-void transformSprite(M5Canvas *from, M5Canvas *to, float r, float s) {
-  int width = to->width();
-  int height = to->height();
-  int fromWidth = from->width();
-  int fromHeight = from->height();
-  int cx = width / 2;
-  int cy = height / 2;
-  float cosr = cos(r);
-  float sinr = sin(r);
-
-  for (int y2 = 0; y2 < height; y2++) {
-    for (int x2 = 0; x2 < width; x2++) {
-      int x1 = ((((x2 - cx) * cosr) - ((y2 - cy) * sinr)) + cx) / s;
-      int y1 = ((((x2 - cx) * sinr) + ((y2 - cy) * cosr)) + cy) / s;
-      if (x1 < 0 || x1 >= fromWidth || y1 < 0 || y1 >= fromHeight) {
-        continue;
-      }
-      int color = from->readPixel(x1, y1);
-      to->drawPixel(x2, y2, color);
-    }
-  }
-}
-
 namespace m5avatar {
 Balloon b;
 Effect h;
@@ -61,8 +37,7 @@ Face::Face(Drawable *mouth, BoundingRect *mouthPos, Drawable *eyeR,
       eyeblowRPos{eyeblowRPos},
       eyeblowLPos{eyeblowLPos},
       boundingRect{new BoundingRect(0, 0, 320, 240)},
-      sprite{new M5Canvas(&M5.Lcd)},
-      tmpSpr{new M5Canvas(&M5.Lcd)} {}
+      sprite{new M5Canvas(&M5.Lcd)} {}
 
 Face::~Face() {
   delete mouth;
@@ -76,7 +51,6 @@ Face::~Face() {
   delete eyeblowL;
   delete eyeblowLPos;
   delete sprite;
-  delete tmpSpr;
   delete boundingRect;
 }
 
@@ -137,21 +111,7 @@ void Face::draw(DrawContext *ctx) {
   float rotation = ctx->getRotation();
 
   if (scale != 1.0 || rotation != 0) {
-    uint16_t w = boundingRect->getWidth();
-    uint16_t h = boundingRect->getHeight();
-    uint16_t tmpSprWidth = _min(w * scale, 320);
-    uint16_t tmpSprHeight = _min(h * scale, 240);
-    tmpSpr->createSprite(tmpSprWidth, tmpSprHeight);
-    tmpSpr->setColorDepth(ctx->getColorDepth());
-    tmpSpr->setBitmapColor(ctx->getColorPalette()->get(COLOR_PRIMARY),
-      ctx->getColorPalette()->get(COLOR_BACKGROUND));
-    if (ctx->getColorDepth() != 1) {
-      sprite->fillSprite(ctx->getColorPalette()->get(COLOR_BACKGROUND));
-    }
-    transformSprite(sprite, tmpSpr, rotation, scale);
-
-    tmpSpr->pushSprite(boundingRect->getLeft(), boundingRect->getTop());
-    tmpSpr->deleteSprite();
+    sprite->pushRotateZoom(rotation, scale, scale);
   } else {
     sprite->pushSprite(boundingRect->getLeft(), boundingRect->getTop());
   }

src/Face.h

@@ -28,7 +28,6 @@ class Face {
   BoundingRect *eyeblowLPos;
   BoundingRect *boundingRect;
   M5Canvas *sprite;
-  M5Canvas *tmpSpr;
 
  public:
   // constructor