Implement RenderedTarget::contains()

Author: adazem009

ScratchCPPGui/renderedtarget.cpp

@@ -363,6 +363,19 @@ const std::vector<QPointF> &RenderedTarget::hullPoints() const
     return m_hullPoints;
 }
 
+bool RenderedTarget::contains(const QPointF &point) const
+{
+    if (m_stageModel)
+        return true; // the stage contains any point within the scene
+
+    for (const auto &hullPoint : m_hullPoints) {
+        if (point.toPoint() == hullPoint.toPoint())
+            return true;
+    }
+
+    return false;
+}
+
 void RenderedTarget::calculateSize(Target *target, double costumeWidth, double costumeHeight)
 {
     if (m_costume) {

ScratchCPPGui/renderedtarget.h

@@ -62,6 +62,8 @@ class RenderedTarget : public IRenderedTarget
         void updateHullPoints(QOpenGLFramebufferObject *fbo) override;
         const std::vector<QPointF> &hullPoints() const override;
 
+        Q_INVOKABLE bool contains(const QPointF &point) const override;
+
     signals:
         void engineChanged();
         void stageModelChanged();

test/mocks/renderedtargetmock.h

@@ -47,6 +47,7 @@ class RenderedTargetMock : public IRenderedTarget
         MOCK_METHOD(void, updateHullPoints, (QOpenGLFramebufferObject *), (override));
         MOCK_METHOD(const std::vector<QPointF> &, hullPoints, (), (const, override));
 
+        MOCK_METHOD(bool, contains, (const QPointF &), (const, override));
         MOCK_METHOD(QNanoQuickItemPainter *, createItemPainter, (), (const, override));
 };
 

test/renderedtarget/renderedtarget_test.cpp

@@ -520,6 +520,28 @@ TEST_F(RenderedTargetTest, HullPoints)
     // Release
     fbo.release();
     context.doneCurrent();
+
+    // Test contains()
+    ASSERT_FALSE(target.contains({ 0, 0 }));
+    ASSERT_FALSE(target.contains({ 1, 0 }));
+    ASSERT_FALSE(target.contains({ 2, 0 }));
+    ASSERT_FALSE(target.contains({ 3, 0 }));
+
+    ASSERT_FALSE(target.contains({ 0, 1 }));
+    ASSERT_TRUE(target.contains({ 1, 1 }));
+    ASSERT_TRUE(target.contains({ 1.4, 1.25 }));
+    ASSERT_TRUE(target.contains({ 2, 1 }));
+    ASSERT_TRUE(target.contains({ 3, 1 }));
+
+    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({ 1, 3 }));
+    ASSERT_TRUE(target.contains({ 2, 3 }));
+    ASSERT_TRUE(target.contains({ 3, 3 }));
+    ASSERT_FALSE(target.contains({ 3.3, 3.5 }));
 }
 
 TEST_F(RenderedTargetTest, Engine)