Handle invisible sprites in touchingSprite()

Author: adazem009

src/scratch/sprite.cpp

@@ -479,7 +479,7 @@ Target *Sprite::dataSource() const
 
 bool Sprite::touchingClones(const std::vector<Sprite *> &clones) const
 {
-    if (!impl->iface)
+    if (!impl->iface || !impl->visible) // If the sprite invisible, it cannot touch anything
         return false;
 
     return impl->iface->touchingClones(clones);

src/scratch/target.cpp

@@ -443,11 +443,11 @@ bool Target::touchingSprite(Sprite *sprite) const
     assert(firstClone);
     std::vector<Sprite *> clones;
 
-    if (firstClone != this) // TODO: Filter clones that are being dragged, including firstClone
+    if (firstClone != this && firstClone->visible()) // TODO: Filter clones that are being dragged, including firstClone
         clones.push_back(firstClone);
 
     for (auto clone : firstClone->clones()) {
-        if (clone.get() != this) // TODO: Filter clones that are being dragged
+        if (clone.get() != this && clone->visible()) // TODO: Filter clones that are being dragged
             clones.push_back(clone.get());
     }
 

test/scratch_classes/sprite_test.cpp

@@ -673,6 +673,18 @@ TEST(SpriteTest, TouchingSprite)
     })));
     ASSERT_FALSE(clone2->touchingSprite(clone2.get()));
     ASSERT_EQ(clones, actualClones);
+
+    // If the sprite is invisible, it cannot touch anything
+    EXPECT_CALL(iface, onVisibleChanged).Times(2);
+    sprite.setVisible(false);
+    EXPECT_CALL(iface, touchingClones).Times(0);
+    ASSERT_FALSE(sprite.touchingSprite(&another));
+
+    sprite.setVisible(true);
+    EXPECT_CALL(iface3, onVisibleChanged);
+    clone2->setVisible(false);
+    EXPECT_CALL(iface, touchingClones).Times(0);
+    ASSERT_FALSE(clone2->touchingSprite(&another));
 }
 
 TEST(SpriteTest, TouchingPoint)

test/scratch_classes/target_test.cpp

@@ -619,6 +619,39 @@ TEST(TargetTest, TouchingSprite)
     })));
     ASSERT_TRUE(target.touchingSprite(clone2.get()));
     ASSERT_EQ(clones, actualClones);
+
+    // Pass an invisible sprite
+    clone2->setVisible(false);
+    clones.erase(clones.begin() + 2);
+    EXPECT_CALL(target, touchingClones(_)).WillOnce(WithArgs<0>(Invoke([&clones, &actualClones](const std::vector<Sprite *> &candidates) {
+        actualClones = candidates;
+        return true;
+    })));
+    ASSERT_TRUE(target.touchingSprite(clone2.get()));
+    ASSERT_EQ(clones, actualClones);
+
+    EXPECT_CALL(target, touchingClones(_)).WillOnce(WithArgs<0>(Invoke([&clones, &actualClones](const std::vector<Sprite *> &candidates) {
+        actualClones = candidates;
+        return true;
+    })));
+    ASSERT_TRUE(target.touchingSprite(&sprite));
+    ASSERT_EQ(clones, actualClones);
+
+    sprite.setVisible(false);
+    clones.erase(clones.begin());
+    EXPECT_CALL(target, touchingClones(_)).WillOnce(WithArgs<0>(Invoke([&clones, &actualClones](const std::vector<Sprite *> &candidates) {
+        actualClones = candidates;
+        return true;
+    })));
+    ASSERT_TRUE(target.touchingSprite(clone3.get()));
+    ASSERT_EQ(clones, actualClones);
+
+    EXPECT_CALL(target, touchingClones(_)).WillOnce(WithArgs<0>(Invoke([&clones, &actualClones](const std::vector<Sprite *> &candidates) {
+        actualClones = candidates;
+        return true;
+    })));
+    ASSERT_TRUE(target.touchingSprite(&sprite));
+    ASSERT_EQ(clones, actualClones);
 }
 
 TEST(TargetTest, TouchingPoint)