Use CPU texture in contains methods

Author: adazem009

src/renderedtarget.cpp

@@ -814,20 +814,7 @@ void RenderedTarget::updateHullPoints()
 
 bool RenderedTarget::containsLocalPoint(const QPointF &point) const
 {
-    if (!boundingRect().contains(point))
-        return false;
-
-    const std::vector<QPoint> &points = hullPoints();
-    QPoint intPoint = point.toPoint();
-    auto it = std::lower_bound(points.begin(), points.end(), intPoint, [](const QPointF &lhs, const QPointF &rhs) { return (lhs.y() < rhs.y()) || (lhs.y() == rhs.y() && lhs.x() < rhs.x()); });
-
-    if (it == points.end()) {
-        // The point is beyond the last point in the convex hull
-        return false;
-    }
-
-    // Check if the point is equal to the one found
-    return *it == intPoint;
+    return textureManager()->textureContainsPoint(m_cpuTexture, point);
 }
 
 QPointF RenderedTarget::transformPoint(double scratchX, double scratchY, double originX, double originY, double rot) const

test/renderedtarget/renderedtarget_test.cpp

@@ -394,12 +394,12 @@ TEST_F(RenderedTargetTest, CpuRendering)
     ASSERT_TRUE(target.contains({ 1, 2 }));
     ASSERT_FALSE(target.contains({ 2, 2 }));
     ASSERT_TRUE(target.contains({ 3, 2 }));
-    ASSERT_FALSE(target.contains({ 3.5, 2.1 }));
+    ASSERT_TRUE(target.contains({ 3.5, 2.1 }));
 
     ASSERT_TRUE(target.contains({ 1, 3 }));
     ASSERT_TRUE(target.contains({ 2, 3 }));
     ASSERT_TRUE(target.contains({ 3, 3 }));
-    ASSERT_FALSE(target.contains({ 3.3, 3.5 }));
+    ASSERT_TRUE(target.contains({ 3.3, 3.5 }));
 
     // Test contains() with horizontal mirroring
     target.updateRotationStyle(Sprite::RotationStyle::LeftRight);
@@ -408,9 +408,9 @@ TEST_F(RenderedTargetTest, CpuRendering)
     ASSERT_TRUE(target.contains({ -1, 1 }));
     ASSERT_FALSE(target.contains({ -2, 2 }));
     ASSERT_TRUE(target.contains({ -3, 2 }));
-    ASSERT_FALSE(target.contains({ -3.5, 2.1 }));
+    ASSERT_TRUE(target.contains({ -3.5, 2.1 }));
     ASSERT_TRUE(target.contains({ -2, 3 }));
-    ASSERT_FALSE(target.contains({ -3.3, 3.5 }));
+    ASSERT_TRUE(target.contains({ -3.3, 3.5 }));
 
     // Test containsScratchPoint()
     target.updateDirection(0);
@@ -425,15 +425,15 @@ TEST_F(RenderedTargetTest, CpuRendering)
     ASSERT_TRUE(target.containsScratchPoint(-226, 164));      // [2, 1]
     ASSERT_TRUE(target.containsScratchPoint(-225, 164));      // [3, 1]
 
-    ASSERT_TRUE(target.containsScratchPoint(-227, 163));      // [1, 2]
-    ASSERT_FALSE(target.containsScratchPoint(-226, 163));     // [2, 2]
-    ASSERT_TRUE(target.containsScratchPoint(-225, 163));      // [3, 2]
-    ASSERT_FALSE(target.containsScratchPoint(-224.5, 162.9)); // [3.5, 2.1]
+    ASSERT_TRUE(target.containsScratchPoint(-227, 163));     // [1, 2]
+    ASSERT_FALSE(target.containsScratchPoint(-226, 163));    // [2, 2]
+    ASSERT_TRUE(target.containsScratchPoint(-225, 163));     // [3, 2]
+    ASSERT_TRUE(target.containsScratchPoint(-224.5, 162.9)); // [3.5, 2.1]
 
-    ASSERT_TRUE(target.containsScratchPoint(-227, 162));      // [1, 3]
-    ASSERT_TRUE(target.containsScratchPoint(-226, 162));      // [2, 3]
-    ASSERT_TRUE(target.containsScratchPoint(-225, 162));      // [3, 3]
-    ASSERT_FALSE(target.containsScratchPoint(-224.7, 161.5)); // [3.3, 3.5]
+    ASSERT_TRUE(target.containsScratchPoint(-227, 162));     // [1, 3]
+    ASSERT_TRUE(target.containsScratchPoint(-226, 162));     // [2, 3]
+    ASSERT_TRUE(target.containsScratchPoint(-225, 162));     // [3, 3]
+    ASSERT_TRUE(target.containsScratchPoint(-224.7, 161.5)); // [3.3, 3.5]
 
     // Test colorAtScratchPoint()
     ASSERT_EQ(target.colorAtScratchPoint(-228, 165), 0); // [0, 0]