Use ProjectLoader to get sprites in MouseEventHandler

Author: adazem009

src/mouseeventhandler.cpp

@@ -5,6 +5,8 @@
 
 #include "mouseeventhandler.h"
 #include "renderedtarget.h"
+#include "projectloader.h"
+#include "spritemodel.h"
 
 using namespace scratchcpprender;
 
@@ -88,23 +90,23 @@ bool MouseEventHandler::eventFilter(QObject *obj, QEvent *event)
 
 void MouseEventHandler::forwardPointEvent(QSinglePointEvent *event, QQuickItem *oldClickedItem)
 {
-    Q_ASSERT(m_spriteRepeater);
+    Q_ASSERT(m_projectLoader);
 
-    if (!m_spriteRepeater)
+    if (!m_projectLoader)
         return;
 
     // Create list of sprites
+    const auto &spriteModels = m_projectLoader->spriteList();
     std::vector<IRenderedTarget *> sprites;
-    int count = m_spriteRepeater->property("count").toInt();
+    auto count = spriteModels.size();
     sprites.reserve(count);
 
     for (int i = 0; i < count; i++) {
-        QQuickItem *sprite = nullptr;
-        QMetaObject::invokeMethod(m_spriteRepeater, "itemAt", Qt::DirectConnection, Q_RETURN_ARG(QQuickItem *, sprite), Q_ARG(int, i));
+        Q_ASSERT(spriteModels[i]);
+        IRenderedTarget *sprite = spriteModels[i]->renderedTarget();
         Q_ASSERT(sprite);
-        Q_ASSERT(dynamic_cast<IRenderedTarget *>(sprite));
-        Q_ASSERT(dynamic_cast<IRenderedTarget *>(sprite)->scratchTarget());
-        sprites.push_back(dynamic_cast<IRenderedTarget *>(sprite));
+        Q_ASSERT(sprite->scratchTarget());
+        sprites.push_back(sprite);
     }
 
     // Sort the list by layer order

test/mouseeventhandler/CMakeLists.txt

@@ -1,8 +1,6 @@
 add_executable(
   mouseeventhandler_test
   mouseeventhandler_test.cpp
-  fakerepeater.cpp
-  fakerepeater.h
 )
 
 target_link_libraries(

test/mouseeventhandler/fakerepeater.cpp

@@ -2,10 +2,10 @@
 #include <scratchcpp/sprite.h>
 #include <mouseeventhandler.h>
 #include <projectloader.h>
+#include <spritemodel.h>
 #include <renderedtargetmock.h>
 
 #include "../common.h"
-#include "fakerepeater.h"
 
 using namespace scratchcpprender;
 using namespace libscratchcpp;
@@ -56,14 +56,21 @@ TEST(MouseEventHandlerTest, HoverEnterLeaveEvent)
 {
     MouseEventHandler handler;
     RenderedTargetMock stage, renderedTarget1, renderedTarget2, renderedTarget3;
+    SpriteModel model1, model2, model3;
+    model1.setRenderedTarget(&renderedTarget1);
+    model2.setRenderedTarget(&renderedTarget2);
+    model3.setRenderedTarget(&renderedTarget3);
     Sprite sprite1, sprite2, sprite3;
     sprite1.setLayerOrder(2);
     sprite2.setLayerOrder(1);
     sprite3.setLayerOrder(3);
-    FakeRepeater repeater;
-    repeater.items = { &renderedTarget1, &renderedTarget2, &renderedTarget3 };
+    ProjectLoader loader;
+    auto sprites = loader.sprites();
+    sprites.append(&sprites, &model1);
+    sprites.append(&sprites, &model2);
+    sprites.append(&sprites, &model3);
     handler.setStage(&stage);
-    handler.setSpriteRepeater(&repeater);
+    handler.setProjectLoader(&loader);
     QPointingDevice dev;
 
     static const QPointF localPos(8.5, 2.9);
@@ -117,14 +124,21 @@ TEST(MouseEventHandlerTest, HoverMoveEvent)
 {
     MouseEventHandler handler;
     RenderedTargetMock stage, renderedTarget1, renderedTarget2, renderedTarget3;
+    SpriteModel model1, model2, model3;
+    model1.setRenderedTarget(&renderedTarget1);
+    model2.setRenderedTarget(&renderedTarget2);
+    model3.setRenderedTarget(&renderedTarget3);
     Sprite sprite1, sprite2, sprite3;
     sprite1.setLayerOrder(2);
     sprite2.setLayerOrder(1);
     sprite3.setLayerOrder(3);
-    FakeRepeater repeater;
-    repeater.items = { &renderedTarget1, &renderedTarget2, &renderedTarget3 };
+    ProjectLoader loader;
+    auto sprites = loader.sprites();
+    sprites.append(&sprites, &model1);
+    sprites.append(&sprites, &model2);
+    sprites.append(&sprites, &model3);
     handler.setStage(&stage);
-    handler.setSpriteRepeater(&repeater);
+    handler.setProjectLoader(&loader);
     QPointingDevice dev;
 
     static const QPointF localPos(8.5, 2.9);
@@ -201,14 +215,21 @@ TEST(MouseEventHandlerTest, MouseMoveEvent)
 {
     MouseEventHandler handler;
     RenderedTargetMock stage, renderedTarget1, renderedTarget2, renderedTarget3;
+    SpriteModel model1, model2, model3;
+    model1.setRenderedTarget(&renderedTarget1);
+    model2.setRenderedTarget(&renderedTarget2);
+    model3.setRenderedTarget(&renderedTarget3);
     Sprite sprite1, sprite2, sprite3;
     sprite1.setLayerOrder(2);
     sprite2.setLayerOrder(1);
     sprite3.setLayerOrder(3);
-    FakeRepeater repeater;
-    repeater.items = { &renderedTarget1, &renderedTarget2, &renderedTarget3 };
+    ProjectLoader loader;
+    auto sprites = loader.sprites();
+    sprites.append(&sprites, &model1);
+    sprites.append(&sprites, &model2);
+    sprites.append(&sprites, &model3);
     handler.setStage(&stage);
-    handler.setSpriteRepeater(&repeater);
+    handler.setProjectLoader(&loader);
     QPointingDevice dev;
 
     static const QPointF localPos(8.5, 2.9);
@@ -261,14 +282,21 @@ TEST(MouseEventHandlerTest, MousePressReleaseEvent)
 {
     MouseEventHandler handler;
     RenderedTargetMock stage, renderedTarget1, renderedTarget2, renderedTarget3;
+    SpriteModel model1, model2, model3;
+    model1.setRenderedTarget(&renderedTarget1);
+    model2.setRenderedTarget(&renderedTarget2);
+    model3.setRenderedTarget(&renderedTarget3);
     Sprite sprite1, sprite2, sprite3;
     sprite1.setLayerOrder(2);
     sprite2.setLayerOrder(1);
     sprite3.setLayerOrder(3);
-    FakeRepeater repeater;
-    repeater.items = { &renderedTarget1, &renderedTarget2, &renderedTarget3 };
+    ProjectLoader loader;
+    auto sprites = loader.sprites();
+    sprites.append(&sprites, &model1);
+    sprites.append(&sprites, &model2);
+    sprites.append(&sprites, &model3);
     handler.setStage(&stage);
-    handler.setSpriteRepeater(&repeater);
+    handler.setProjectLoader(&loader);
     QPointingDevice dev;
 
     static const QPointF localPos(8.5, 2.9);