Merge pull request #45 from scratchcpp/mouse_events

Handle mouse events

Author: adazem009

ScratchCPPGui/ProjectPlayer.qml

@@ -20,6 +20,7 @@ ProjectScene {
 
     id: root
 	clip: true
+    engine: loader.engine
     onFileNameChanged: priv.loading = true;
 
     QtObject {
@@ -109,4 +110,13 @@ ProjectScene {
             Item { Layout.fillHeight: true }
         }
     }
+
+    MouseArea {
+        id: mouseArea
+        anchors.fill: parent
+        hoverEnabled: true
+        onPositionChanged: root.handleMouseMove(mouseX, mouseY)
+        onPressed: root.handleMousePress()
+        onReleased: root.handleMouseRelease()
+    }
 }

ScratchCPPGui/projectscene.cpp

@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
+#include <scratchcpp/iengine.h>
+
 #include "projectscene.h"
 
 namespace scratchcppgui
@@ -9,4 +11,38 @@ ProjectScene::ProjectScene(QQuickItem *parent)
 {
 }
 
+libscratchcpp::IEngine *ProjectScene::engine() const
+{
+    return m_engine;
+}
+
+void ProjectScene::setEngine(libscratchcpp::IEngine *newEngine)
+{
+    if (m_engine == newEngine)
+        return;
+
+    m_engine = newEngine;
+    emit engineChanged();
+}
+
+void ProjectScene::handleMouseMove(qreal x, qreal y)
+{
+    if (m_engine) {
+        m_engine->setMouseX(x - m_engine->stageWidth() / 2.0);
+        m_engine->setMouseY(-y + m_engine->stageHeight() / 2.0);
+    }
+}
+
+void ProjectScene::handleMousePress()
+{
+    if (m_engine)
+        m_engine->setMousePressed(true);
+}
+
+void ProjectScene::handleMouseRelease()
+{
+    if (m_engine)
+        m_engine->setMousePressed(false);
+}
+
 } // namespace scratchcppgui

ScratchCPPGui/projectscene.h

@@ -4,16 +4,35 @@
 
 #include <QQuickPaintedItem>
 
+namespace libscratchcpp
+{
+class IEngine;
+}
+
 namespace scratchcppgui
 {
 
 class ProjectScene : public QQuickItem
 {
         Q_OBJECT
         QML_ELEMENT
+        Q_PROPERTY(libscratchcpp::IEngine *engine READ engine WRITE setEngine NOTIFY engineChanged)
 
     public:
         ProjectScene(QQuickItem *parent = nullptr);
+
+        libscratchcpp::IEngine *engine() const;
+        void setEngine(libscratchcpp::IEngine *newEngine);
+
+        Q_INVOKABLE void handleMouseMove(qreal x, qreal y);
+        Q_INVOKABLE void handleMousePress();
+        Q_INVOKABLE void handleMouseRelease();
+
+    signals:
+        void engineChanged();
+
+    private:
+        libscratchcpp::IEngine *m_engine = nullptr;
 };
 
 } // namespace scratchcppgui

test/CMakeLists.txt

@@ -24,3 +24,4 @@ add_subdirectory(projectloader)
 add_subdirectory(renderedtarget)
 add_subdirectory(targetpainter)
 add_subdirectory(target_models)
+add_subdirectory(projectscene)

test/projectscene/CMakeLists.txt

@@ -0,0 +1,16 @@
+add_executable(
+  projectscene_test
+  projectscene_test.cpp
+)
+
+target_link_libraries(
+  projectscene_test
+  GTest::gtest_main
+  GTest::gmock_main
+  libscratchcpp-gui
+  scratchcppgui_mocks
+  ${QT_LIBS}
+)
+
+add_test(projectscene_test)
+gtest_discover_tests(projectscene_test)

test/projectscene/projectscene_test.cpp

@@ -0,0 +1,57 @@
+#include <projectscene.h>
+#include <enginemock.h>
+
+#include "../common.h"
+
+using namespace scratchcppgui;
+
+using ::testing::Return;
+
+TEST(ProjectScene, Engine)
+{
+    ProjectScene scene;
+    ASSERT_EQ(scene.engine(), nullptr);
+
+    EngineMock engine;
+    scene.setEngine(&engine);
+    ASSERT_EQ(scene.engine(), &engine);
+}
+
+TEST(ProjectScene, HandleMouseMove)
+{
+    ProjectScene scene;
+    EngineMock engine;
+    scene.setEngine(&engine);
+
+    EXPECT_CALL(engine, stageWidth()).WillOnce(Return(600));
+    EXPECT_CALL(engine, stageHeight()).WillOnce(Return(400));
+    EXPECT_CALL(engine, setMouseX(-253.1));
+    EXPECT_CALL(engine, setMouseY(216.7));
+    scene.handleMouseMove(46.9, -16.7);
+}
+
+TEST(ProjectScene, HandleMousePress)
+{
+    ProjectScene scene;
+    EngineMock engine;
+    scene.setEngine(&engine);
+
+    EXPECT_CALL(engine, setMousePressed(true));
+    scene.handleMousePress();
+
+    EXPECT_CALL(engine, setMousePressed(true));
+    scene.handleMousePress();
+}
+
+TEST(ProjectScene, HandleMouseRelease)
+{
+    ProjectScene scene;
+    EngineMock engine;
+    scene.setEngine(&engine);
+
+    EXPECT_CALL(engine, setMousePressed(false));
+    scene.handleMouseRelease();
+
+    EXPECT_CALL(engine, setMousePressed(false));
+    scene.handleMouseRelease();
+}