RenderedTarget: Use IEngine::getVisibleTargets()

Author: adazem009

src/renderedtarget.cpp

@@ -678,10 +678,13 @@ bool RenderedTarget::touchingClones(const std::vector<libscratchcpp::Sprite *> &
 bool RenderedTarget::touchingColor(const Value &color) const
 {
     // https://github.com/scratchfoundation/scratch-render/blob/0a04c2fb165f5c20406ec34ab2ea5682ae45d6e0/src/RenderWebGL.js#L775-L841
+    if (!m_engine)
+        return false;
+
     QRgb rgb = convertColor(color);
 
     std::vector<Target *> targets;
-    getVisibleTargets(targets);
+    m_engine->getVisibleTargets(targets);
 
     QRectF myRect = touchingBounds();
     std::vector<IRenderedTarget *> candidates;
@@ -870,38 +873,6 @@ CpuTextureManager *RenderedTarget::textureManager() const
     return m_textureManager.get();
 }
 
-void RenderedTarget::getVisibleTargets(std::vector<Target *> &dst) const
-{
-    dst.clear();
-
-    if (!m_engine)
-        return;
-
-    const auto &targets = m_engine->targets();
-
-    for (auto target : targets) {
-        Q_ASSERT(target);
-
-        if (target->isStage())
-            dst.push_back(target.get());
-        else {
-            Sprite *sprite = static_cast<Sprite *>(target.get());
-
-            if (sprite->visible())
-                dst.push_back(target.get());
-
-            const auto &clones = sprite->clones();
-
-            for (auto clone : clones) {
-                if (clone->visible())
-                    dst.push_back(clone.get());
-            }
-        }
-    }
-
-    std::sort(dst.begin(), dst.end(), [](Target *t1, Target *t2) { return t1->layerOrder() > t2->layerOrder(); });
-}
-
 QRectF RenderedTarget::touchingBounds() const
 {
     // https://github.com/scratchfoundation/scratch-render/blob/0a04c2fb165f5c20406ec34ab2ea5682ae45d6e0/src/RenderWebGL.js#L1330-L1350

src/renderedtarget.h

@@ -130,7 +130,6 @@ class RenderedTarget : public IRenderedTarget
         QPointF mapFromStageWithOriginPoint(const QPointF &scenePoint) const;
         QPointF mapFromScratchToLocal(const QPointF &point) const;
         CpuTextureManager *textureManager() const;
-        void getVisibleTargets(std::vector<libscratchcpp::Target *> &dst) const;
         QRectF touchingBounds() const;
         QRectF candidatesBounds(const QRectF &targetRect, const std::vector<libscratchcpp::Target *> &candidates, std::vector<IRenderedTarget *> &dst) const;
         QRectF candidatesBounds(const QRectF &targetRect, const std::vector<libscratchcpp::Sprite *> &candidates, std::vector<IRenderedTarget *> &dst) const;

test/renderedtarget/renderedtarget_test.cpp

@@ -23,6 +23,8 @@ using namespace libscratchcpp;
 
 using ::testing::Return;
 using ::testing::ReturnRef;
+using ::testing::Invoke;
+using ::testing::_;
 
 class RenderedTargetTest : public testing::Test
 {
@@ -1093,6 +1095,31 @@ TEST_F(RenderedTargetTest, TouchingColor)
     sprite2->setLayerOrder(3);
 
     const std::vector<std::shared_ptr<Target>> targets = { stage, sprite, sprite1 };
+    EXPECT_CALL(engine, getVisibleTargets(_)).WillRepeatedly(Invoke([&targets](std::vector<Target *> &dst) {
+        dst.clear();
+
+        for (auto target : targets) {
+            ASSERT_TRUE(target);
+
+            if (target->isStage())
+                dst.push_back(target.get());
+            else {
+                Sprite *sprite = static_cast<Sprite *>(target.get());
+
+                if (sprite->visible())
+                    dst.push_back(target.get());
+
+                const auto &clones = sprite->clones();
+
+                for (auto clone : clones) {
+                    if (clone->visible())
+                        dst.push_back(clone.get());
+                }
+            }
+        }
+
+        std::sort(dst.begin(), dst.end(), [](Target *t1, Target *t2) { return t1->layerOrder() > t2->layerOrder(); });
+    }));
 
     QQuickItem parent;
     parent.setWidth(480);
@@ -1128,7 +1155,6 @@ TEST_F(RenderedTargetTest, TouchingColor)
     target.beforeRedraw();
 
     Rect penBounds(5, 1, 6, -5);
-    EXPECT_CALL(engine, targets()).WillRepeatedly(ReturnRef(targets));
     EXPECT_CALL(stageTarget, stageModel()).WillRepeatedly(Return(&stageModel));
     EXPECT_CALL(target1, stageModel()).WillRepeatedly(Return(nullptr));
     EXPECT_CALL(target2, stageModel()).WillRepeatedly(Return(nullptr));