Mirror costume image horizontally based on rotation style

Author: adazem009

src/scratch/sprite.cpp

@@ -196,8 +196,10 @@ void Sprite::setCurrentCostume(int newCostume)
     // TODO: Make currentCostume() return the costume (not index)
     auto costume = costumeAt(newCostume - 1);
 
-    if (costume)
+    if (costume) {
         costume->setScale(impl->size / 100);
+        costume->setMirrorHorizontally(impl->rotationStyle == RotationStyle::LeftRight);
+    }
 
     Target::setCurrentCostume(newCostume);
 }
@@ -258,6 +260,12 @@ std::string Sprite::rotationStyleStr() const
 void Sprite::setRotationStyle(RotationStyle newRotationStyle)
 {
     impl->rotationStyle = newRotationStyle;
+    // TODO: Make currentCostume() return the costume (not index)
+    auto costume = costumeAt(currentCostume() - 1);
+
+    if (costume)
+        costume->setMirrorHorizontally(newRotationStyle == RotationStyle::LeftRight);
+
     if (impl->iface)
         impl->iface->onRotationStyleChanged(impl->rotationStyle);
 }

test/scratch_classes/sprite_test.cpp

@@ -281,51 +281,79 @@ TEST(SpriteTest, Draggable)
 
 TEST(SpriteTest, RotationStyle)
 {
+    auto c1 = std::make_shared<Costume>("", "", "");
+    auto c2 = std::make_shared<Costume>("", "", "");
+
     Sprite sprite;
     ASSERT_EQ(sprite.rotationStyle(), Sprite::RotationStyle::AllAround); // default
     ASSERT_EQ(sprite.rotationStyleStr(), "all around");
+    sprite.addCostume(c1);
+    sprite.addCostume(c2);
+    sprite.setCurrentCostume(1);
+
+    ASSERT_EQ(c1->mirrorHorizontally(), false);
 
     sprite.setRotationStyle(Sprite::RotationStyle::DoNotRotate);
     ASSERT_EQ(sprite.rotationStyle(), Sprite::RotationStyle::DoNotRotate);
     ASSERT_EQ(sprite.rotationStyleStr(), "don't rotate");
+    ASSERT_EQ(c1->mirrorHorizontally(), false);
 
     sprite.setRotationStyle(Sprite::RotationStyle::LeftRight);
     ASSERT_EQ(sprite.rotationStyle(), Sprite::RotationStyle::LeftRight);
     ASSERT_EQ(sprite.rotationStyleStr(), "left-right");
+    ASSERT_EQ(c1->mirrorHorizontally(), true);
 
     sprite.setRotationStyle(Sprite::RotationStyle::AllAround);
     ASSERT_EQ(sprite.rotationStyle(), Sprite::RotationStyle::AllAround);
     ASSERT_EQ(sprite.rotationStyleStr(), "all around");
+    ASSERT_EQ(c1->mirrorHorizontally(), false);
 
     sprite.setRotationStyle("invalid");
     ASSERT_EQ(sprite.rotationStyle(), Sprite::RotationStyle::AllAround); // shouldn't change
     ASSERT_EQ(sprite.rotationStyleStr(), "all around");
+    ASSERT_EQ(c1->mirrorHorizontally(), false);
+
+    sprite.setCurrentCostume(2);
+    sprite.setRotationStyle(Sprite::RotationStyle::LeftRight);
+    ASSERT_EQ(c2->mirrorHorizontally(), true);
+
+    sprite.setCurrentCostume(1);
+    sprite.setRotationStyle(Sprite::RotationStyle::AllAround);
+    sprite.setCurrentCostume(2);
+    ASSERT_EQ(c2->mirrorHorizontally(), false);
 
     sprite.setRotationStyle("don't rotate");
     ASSERT_EQ(sprite.rotationStyle(), Sprite::RotationStyle::DoNotRotate);
     ASSERT_EQ(sprite.rotationStyleStr(), "don't rotate");
+    ASSERT_EQ(c2->mirrorHorizontally(), false);
 
     sprite.setRotationStyle("left-right");
     ASSERT_EQ(sprite.rotationStyle(), Sprite::RotationStyle::LeftRight);
     ASSERT_EQ(sprite.rotationStyleStr(), "left-right");
+    ASSERT_EQ(c2->mirrorHorizontally(), true);
 
     sprite.setRotationStyle("all around");
     ASSERT_EQ(sprite.rotationStyle(), Sprite::RotationStyle::AllAround);
     ASSERT_EQ(sprite.rotationStyleStr(), "all around");
+    ASSERT_EQ(c2->mirrorHorizontally(), false);
 
     sprite.setRotationStyle(std::string("invalid"));
     ASSERT_EQ(sprite.rotationStyle(), Sprite::RotationStyle::AllAround); // shouldn't change
     ASSERT_EQ(sprite.rotationStyleStr(), "all around");
+    ASSERT_EQ(c2->mirrorHorizontally(), false);
 
     sprite.setRotationStyle(std::string("don't rotate"));
     ASSERT_EQ(sprite.rotationStyle(), Sprite::RotationStyle::DoNotRotate);
     ASSERT_EQ(sprite.rotationStyleStr(), "don't rotate");
+    ASSERT_EQ(c2->mirrorHorizontally(), false);
 
     sprite.setRotationStyle(std::string("left-right"));
     ASSERT_EQ(sprite.rotationStyle(), Sprite::RotationStyle::LeftRight);
     ASSERT_EQ(sprite.rotationStyleStr(), "left-right");
+    ASSERT_EQ(c2->mirrorHorizontally(), true);
 
     sprite.setRotationStyle(std::string("all around"));
     ASSERT_EQ(sprite.rotationStyle(), Sprite::RotationStyle::AllAround);
     ASSERT_EQ(sprite.rotationStyleStr(), "all around");
+    ASSERT_EQ(c2->mirrorHorizontally(), false);
 }