fix #119: Translate coordinates in contains() correctly

Author: adazem009

src/renderedtarget.cpp

@@ -548,19 +548,22 @@ const std::vector<QPoint> &RenderedTarget::hullPoints() const
 
 bool RenderedTarget::contains(const QPointF &point) const
 {
-    if (!m_costume || !m_texture.isValid() || !m_cpuTexture.isValid())
+    if (!m_costume || !m_texture.isValid() || !m_cpuTexture.isValid() || !parentItem())
         return false;
 
     if (m_stageModel)
         return true; // the stage contains any point within the scene
 
-    if (!boundingRect().contains(point))
+    const double scaleRatio = m_skin->getTextureScale(m_texture) / m_skin->getTextureScale(m_cpuTexture);
+    QPointF translatedPoint = mapToItem(parentItem(), point);
+    translatedPoint = mapFromStageWithOriginPoint(translatedPoint);
+    translatedPoint /= scaleRatio;
+
+    if (!boundingRect().contains(translatedPoint))
         return false;
 
     const std::vector<QPoint> &points = hullPoints();
-
-    const double scaleRatio = m_skin->getTextureScale(m_texture) / m_skin->getTextureScale(m_cpuTexture);
-    QPoint intPoint = (point / scaleRatio).toPoint();
+    QPoint intPoint = translatedPoint.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()) {
@@ -696,6 +699,23 @@ QPointF RenderedTarget::transformPoint(double scratchX, double scratchY, double
     return QPointF(x, y);
 }
 
+QPointF RenderedTarget::mapFromStageWithOriginPoint(const QPointF &scenePoint) const
+{
+    // mapFromItem() doesn't use the transformOriginPoint property, so we must do this ourselves
+    QTransform t;
+    const double mirror = m_mirrorHorizontally ? -1 : 1;
+    const double originX = transformOriginPoint().x();
+    const double originY = transformOriginPoint().y();
+    t.translate(originX, originY);
+    t.rotate(-rotation());
+    t.scale(1 / scale() * mirror, 1 / scale());
+    t.translate(-originX * mirror, -originY);
+    t.translate(-x(), -y());
+
+    QPointF localPoint = t.map(scenePoint);
+    return localPoint;
+}
+
 CpuTextureManager *RenderedTarget::textureManager()
 {
     if (!m_textureManager)

src/renderedtarget.h

@@ -116,6 +116,7 @@ class RenderedTarget : public IRenderedTarget
         bool convexHullPointsNeeded() const;
         void updateHullPoints();
         QPointF transformPoint(double scratchX, double scratchY, double originX, double originY, double rot) const;
+        QPointF mapFromStageWithOriginPoint(const QPointF &scenePoint) const;
         CpuTextureManager *textureManager();
 
         libscratchcpp::IEngine *m_engine = nullptr;

test/renderedtarget/renderedtarget_test.cpp

@@ -306,8 +306,8 @@ TEST_F(RenderedTargetTest, HullPoints)
     model.init(&sprite);
 
     QQuickItem parent;
-    parent.setWidth(200);
-    parent.setHeight(100);
+    parent.setWidth(480);
+    parent.setHeight(360);
     RenderedTarget target(&parent);
     target.setEngine(&engine);
     target.setSpriteModel(&model);
@@ -357,7 +357,23 @@ TEST_F(RenderedTargetTest, HullPoints)
     ASSERT_TRUE(target.contains({ 3, 3 }));
     ASSERT_FALSE(target.contains({ 3.3, 3.5 }));
 
+    // Test contains() with horizontal mirroring
+    target.updateRotationStyle(Sprite::RotationStyle::LeftRight);
+    target.updateDirection(-45);
+    target.setX(25);
+    target.setY(30);
+    ASSERT_FALSE(target.contains({ 0, 0 }));
+    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({ -2, 3 }));
+    ASSERT_FALSE(target.contains({ -3.3, 3.5 }));
+
     // Test containsScratchPoint()
+    target.updateDirection(0);
+    target.setX(25);
+    target.setY(30);
     ASSERT_FALSE(target.containsScratchPoint(-227.5, 165)); // [0, 0]
     ASSERT_FALSE(target.containsScratchPoint(-226.5, 165)); // [1, 0]
     ASSERT_FALSE(target.containsScratchPoint(-225.5, 165)); // [2, 0]