fix #141: Ignore invisible sprites in contains point methods

Author: adazem009

src/renderedtarget.cpp

@@ -599,7 +599,7 @@ const std::vector<QPoint> &RenderedTarget::hullPoints() const
 
 bool RenderedTarget::contains(const QPointF &point) const
 {
-    if (!m_costume || !m_texture.isValid() || !m_cpuTexture.isValid() || !parentItem())
+    if (!isVisible() || !m_costume || !m_texture.isValid() || !m_cpuTexture.isValid() || !parentItem())
         return false;
 
     const double scaleRatio = m_skin->getTextureScale(m_texture) / m_skin->getTextureScale(m_cpuTexture);
@@ -612,7 +612,7 @@ bool RenderedTarget::contains(const QPointF &point) const
 
 bool RenderedTarget::containsScratchPoint(double x, double y) const
 {
-    if (!m_engine || !m_skin || !m_costume)
+    if (!isVisible() || !m_engine || !m_skin || !m_costume)
         return false;
 
     return containsLocalPoint(mapFromScratchToLocal(QPointF(x, y)));

test/renderedtarget/renderedtarget_test.cpp

@@ -401,6 +401,12 @@ TEST_F(RenderedTargetTest, CpuRendering)
     ASSERT_TRUE(target.contains({ 3, 3 }));
     ASSERT_TRUE(target.contains({ 3.3, 3.5 }));
 
+    // Regtest for #141
+    target.setVisible(false);
+    ASSERT_FALSE(target.contains({ 1, 3 }));
+    ASSERT_FALSE(target.contains({ 2, 3 }));
+    target.setVisible(true);
+
     // Test contains() with horizontal mirroring
     target.updateRotationStyle(Sprite::RotationStyle::LeftRight);
     target.updateDirection(-45);
@@ -435,6 +441,12 @@ TEST_F(RenderedTargetTest, CpuRendering)
     ASSERT_TRUE(target.containsScratchPoint(-225, 162));     // [3, 3]
     ASSERT_TRUE(target.containsScratchPoint(-224.7, 161.5)); // [3.3, 3.5]
 
+    // Regtest for #141
+    target.setVisible(false);
+    ASSERT_FALSE(target.containsScratchPoint(-227, 162)); // [1, 3]
+    ASSERT_FALSE(target.containsScratchPoint(-226, 162)); // [2, 3]
+    target.setVisible(true);
+
     // Test colorAtScratchPoint()
     ASSERT_EQ(target.colorAtScratchPoint(-228, 165), 0); // [0, 0]
     ASSERT_EQ(target.colorAtScratchPoint(-227, 165), 0); // [1, 0]