Update libscratchcpp to latest master

Author: adazem009

src/spritemodel.cpp

@@ -140,6 +140,16 @@ void SpriteModel::onBubbleTextChanged(const std::string &text)
     }
 }
 
+int SpriteModel::costumeWidth() const
+{
+    return m_renderedTarget->costumeWidth();
+}
+
+int SpriteModel::costumeHeight() const
+{
+    return m_renderedTarget->costumeHeight();
+}
+
 libscratchcpp::Rect SpriteModel::boundingRect() const
 {
     return m_renderedTarget->getBounds();

src/spritemodel.h

@@ -54,6 +54,9 @@ class SpriteModel
         void onBubbleTypeChanged(libscratchcpp::Target::BubbleType type) override;
         void onBubbleTextChanged(const std::string &text) override;
 
+        int costumeWidth() const override;
+        int costumeHeight() const override;
+
         libscratchcpp::Rect boundingRect() const override;
         libscratchcpp::Rect fastBoundingRect() const override;
 

src/stagemodel.cpp

@@ -77,6 +77,16 @@ void StageModel::onBubbleTextChanged(const std::string &text)
     }
 }
 
+int StageModel::costumeWidth() const
+{
+    return m_renderedTarget->costumeWidth();
+}
+
+int StageModel::costumeHeight() const
+{
+    return m_renderedTarget->costumeHeight();
+}
+
 libscratchcpp::Rect StageModel::boundingRect() const
 {
     return libscratchcpp::Rect();

src/stagemodel.h

@@ -40,6 +40,9 @@ class StageModel
         void onBubbleTypeChanged(libscratchcpp::Target::BubbleType type) override;
         void onBubbleTextChanged(const std::string &text) override;
 
+        int costumeWidth() const override;
+        int costumeHeight() const override;
+
         libscratchcpp::Rect boundingRect() const override;
         libscratchcpp::Rect fastBoundingRect() const override;
 

test/mocks/enginemock.h

@@ -26,7 +26,10 @@ class EngineMock : public IEngine
         MOCK_METHOD(void, stopTarget, (Target *, VirtualMachine *), (override));
         MOCK_METHOD(void, initClone, (std::shared_ptr<Sprite>), (override));
         MOCK_METHOD(void, deinitClone, (std::shared_ptr<Sprite>), (override));
+
         MOCK_METHOD(void, stopSounds, (), (override));
+        MOCK_METHOD(double, globalVolume, (), (const, override));
+        MOCK_METHOD(void, setGlobalVolume, (double), (override));
 
         MOCK_METHOD(void, updateMonitors, (), (override));
         MOCK_METHOD(void, step, (), (override));
@@ -36,6 +39,7 @@ class EngineMock : public IEngine
 
         MOCK_METHOD(sigslot::signal<> &, aboutToRender, (), (override));
         MOCK_METHOD(sigslot::signal<VirtualMachine *> &, threadAboutToStop, (), (override));
+        MOCK_METHOD(sigslot::signal<> &, stopped, (), (override));
 
         MOCK_METHOD(bool, isRunning, (), (const, override));
 
@@ -104,6 +108,7 @@ class EngineMock : public IEngine
         MOCK_METHOD(int, findBroadcast, (const std::string &), (const, override));
         MOCK_METHOD(int, findBroadcastById, (const std::string &), (const, override));
 
+        MOCK_METHOD(void, addWhenTouchingObjectScript, (std::shared_ptr<Block>), (override));
         MOCK_METHOD(void, addGreenFlagScript, (std::shared_ptr<Block>), (override));
         MOCK_METHOD(void, addBroadcastScript, (std::shared_ptr<Block>, int, Broadcast *), (override));
         MOCK_METHOD(void, addBackdropChangeScript, (std::shared_ptr<Block>, int), (override));
@@ -131,6 +136,7 @@ class EngineMock : public IEngine
         MOCK_METHOD((sigslot::signal<Monitor *, IMonitorHandler *> &), monitorRemoved, (), (override));
 
         MOCK_METHOD(sigslot::signal<const std::string &> &, questionAsked, (), (override));
+        MOCK_METHOD(sigslot::signal<> &, questionAborted, (), (override));
         MOCK_METHOD(sigslot::signal<const std::string &> &, questionAnswered, (), (override));
 
         MOCK_METHOD(std::vector<std::string> &, extensions, (), (const, override));

test/target_models/spritemodel_test.cpp

@@ -287,6 +287,28 @@ TEST(SpriteModelTest, OnBubbleTextChanged)
     ASSERT_EQ(spy.count(), 2);
 }
 
+TEST(SpriteModelTest, CostumeWidth)
+{
+    SpriteModel model;
+
+    RenderedTargetMock renderedTarget;
+    model.setRenderedTarget(&renderedTarget);
+
+    EXPECT_CALL(renderedTarget, costumeWidth()).WillOnce(Return(15));
+    ASSERT_EQ(model.costumeWidth(), 15);
+}
+
+TEST(SpriteModelTest, CostumeHeight)
+{
+    SpriteModel model;
+
+    RenderedTargetMock renderedTarget;
+    model.setRenderedTarget(&renderedTarget);
+
+    EXPECT_CALL(renderedTarget, costumeHeight()).WillOnce(Return(10));
+    ASSERT_EQ(model.costumeHeight(), 10);
+}
+
 TEST(SpriteModelTest, BoundingRect)
 {
     SpriteModel model;

test/target_models/stagemodel_test.cpp

@@ -112,6 +112,28 @@ TEST(StageModelTest, OnBubbleTextChanged)
     ASSERT_EQ(spy.count(), 2);
 }
 
+TEST(StageModelTest, CostumeWidth)
+{
+    StageModel model;
+
+    RenderedTargetMock renderedTarget;
+    model.setRenderedTarget(&renderedTarget);
+
+    EXPECT_CALL(renderedTarget, costumeWidth()).WillOnce(Return(15));
+    ASSERT_EQ(model.costumeWidth(), 15);
+}
+
+TEST(StageModelTest, CostumeHeight)
+{
+    StageModel model;
+
+    RenderedTargetMock renderedTarget;
+    model.setRenderedTarget(&renderedTarget);
+
+    EXPECT_CALL(renderedTarget, costumeHeight()).WillOnce(Return(10));
+    ASSERT_EQ(model.costumeHeight(), 10);
+}
+
 TEST(SpriteModelTest, TouchingClones)
 {
     StageModel model;