Add containsScratchPoint() method

Author: adazem009

src/irenderedtarget.h

@@ -84,6 +84,8 @@ class IRenderedTarget : public QNanoQuickItem
         virtual void clearGraphicEffects() = 0;
 
         virtual const std::vector<QPoint> &hullPoints() const = 0;
+
+        virtual bool containsScratchPoint(double x, double y) const = 0;
 };
 
 } // namespace scratchcpprender

src/renderedtarget.cpp

@@ -567,6 +567,20 @@ bool RenderedTarget::contains(const QPointF &point) const
     return *it == intPoint;
 }
 
+bool RenderedTarget::containsScratchPoint(double x, double y) const
+{
+    if (!m_engine || !parentItem())
+        return false;
+
+    // contains() expects item coordinates, so translate the Scratch coordinates first
+    double stageWidth = m_engine->stageWidth();
+    double stageHeight = m_engine->stageHeight();
+    x = m_stageScale * (x + stageWidth / 2);
+    y = m_stageScale * (stageHeight / 2 - y);
+
+    return contains(mapFromItem(parentItem(), QPointF(x, y)));
+}
+
 void RenderedTarget::calculatePos()
 {
     if (!m_skin || !m_costume || !m_engine)

src/renderedtarget.h

@@ -92,6 +92,7 @@ class RenderedTarget : public IRenderedTarget
         const std::vector<QPoint> &hullPoints() const override;
 
         Q_INVOKABLE bool contains(const QPointF &point) const override;
+        bool containsScratchPoint(double x, double y) const override;
 
     signals:
         void engineChanged();

test/mocks/renderedtargetmock.h

@@ -70,6 +70,8 @@ class RenderedTargetMock : public IRenderedTarget
         MOCK_METHOD(const std::vector<QPoint> &, hullPoints, (), (const, override));
 
         MOCK_METHOD(bool, contains, (const QPointF &), (const, override));
+        MOCK_METHOD(bool, containsScratchPoint, (double, double), (const, override));
+
         MOCK_METHOD(QNanoQuickItemPainter *, createItemPainter, (), (const, override));
         MOCK_METHOD(void, hoverEnterEvent, (QHoverEvent *), (override));
         MOCK_METHOD(void, hoverLeaveEvent, (QHoverEvent *), (override));

test/renderedtarget/renderedtarget_test.cpp

@@ -305,7 +305,10 @@ TEST_F(RenderedTargetTest, HullPoints)
     SpriteModel model;
     model.init(&sprite);
 
-    RenderedTarget target;
+    QQuickItem parent;
+    parent.setWidth(200);
+    parent.setHeight(100);
+    RenderedTarget target(&parent);
     target.setEngine(&engine);
     target.setSpriteModel(&model);
 
@@ -315,14 +318,17 @@ TEST_F(RenderedTargetTest, HullPoints)
     createContextAndSurface(&context, &surface);
 
     // Load costume
-    EXPECT_CALL(engine, stageWidth()).WillOnce(Return(480));
-    EXPECT_CALL(engine, stageHeight()).WillOnce(Return(360));
+    EXPECT_CALL(engine, stageWidth()).WillRepeatedly(Return(480));
+    EXPECT_CALL(engine, stageHeight()).WillRepeatedly(Return(360));
     auto costume = std::make_shared<Costume>("", "", "png");
     std::string costumeData = readFileStr("image.png");
     costume->setData(costumeData.size(), static_cast<void *>(costumeData.data()));
     sprite.addCostume(costume);
     target.loadCostumes();
     target.updateCostume(costume.get());
+    target.setStageScale(2);
+    target.setX(25);
+    target.setY(30);
 
     // Test hull points
     target.setWidth(3);
@@ -351,6 +357,28 @@ TEST_F(RenderedTargetTest, HullPoints)
     ASSERT_TRUE(target.contains({ 3, 3 }));
     ASSERT_FALSE(target.contains({ 3.3, 3.5 }));
 
+    // Test containsScratchPoint()
+    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]
+    ASSERT_FALSE(target.containsScratchPoint(-224.5, 165)); // [3, 0]
+
+    ASSERT_FALSE(target.containsScratchPoint(-227.5, 164));   // [0, 1]
+    ASSERT_TRUE(target.containsScratchPoint(-226.5, 164));    // [1, 1]
+    ASSERT_TRUE(target.containsScratchPoint(-226.1, 163.75)); // [1.4, 1.25]
+    ASSERT_TRUE(target.containsScratchPoint(-225.5, 164));    // [2, 1]
+    ASSERT_TRUE(target.containsScratchPoint(-224.5, 164));    // [3, 1]
+
+    ASSERT_TRUE(target.containsScratchPoint(-226.5, 163));  // [1, 2]
+    ASSERT_FALSE(target.containsScratchPoint(-225.5, 163)); // [2, 2]
+    ASSERT_TRUE(target.containsScratchPoint(-224.5, 163));  // [3, 2]
+    ASSERT_FALSE(target.containsScratchPoint(-224, 162.9)); // [3.5, 2.1]
+
+    ASSERT_TRUE(target.containsScratchPoint(-226.5, 162));    // [1, 3]
+    ASSERT_TRUE(target.containsScratchPoint(-225.5, 162));    // [2, 3]
+    ASSERT_TRUE(target.containsScratchPoint(-224.5, 162));    // [3, 3]
+    ASSERT_FALSE(target.containsScratchPoint(-224.2, 161.5)); // [3.3, 3.5]
+
     // Cleanup
     context.doneCurrent();
 }