Skip to content

Commit 0704620

Browse files
committed
Update libscratchcpp to latest master
1 parent d91f998 commit 0704620

File tree

6 files changed

+42
-4
lines changed

6 files changed

+42
-4
lines changed

libscratchcpp

Submodule libscratchcpp updated 76 files

src/spritemodel.cpp

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// SPDX-License-Identifier: LGPL-3.0-or-later
22

33
#include <scratchcpp/costume.h>
4+
#include <scratchcpp/rect.h>
45

56
#include "spritemodel.h"
67
#include "renderedtarget.h"
@@ -21,6 +22,10 @@ void SpriteModel::init(libscratchcpp::Sprite *sprite)
2122
m_renderedTarget->loadCostume(sprite->currentCostume().get());
2223
}
2324

25+
void SpriteModel::deinitClone()
26+
{
27+
}
28+
2429
void SpriteModel::onCloned(libscratchcpp::Sprite *clone)
2530
{
2631
}
@@ -57,6 +62,19 @@ void SpriteModel::onRotationStyleChanged(libscratchcpp::Sprite::RotationStyle ro
5762
{
5863
}
5964

65+
void SpriteModel::onGraphicsEffectChanged(libscratchcpp::IGraphicsEffect *effect, double value)
66+
{
67+
}
68+
69+
void SpriteModel::onGraphicsEffectsCleared()
70+
{
71+
}
72+
73+
libscratchcpp::Rect SpriteModel::boundingRect() const
74+
{
75+
return libscratchcpp::Rect();
76+
}
77+
6078
libscratchcpp::Sprite *SpriteModel::sprite() const
6179
{
6280
return m_sprite;

src/spritemodel.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ class SpriteModel
2525
SpriteModel(QObject *parent = nullptr);
2626

2727
void init(libscratchcpp::Sprite *sprite) override;
28+
void deinitClone() override;
2829

2930
void onCloned(libscratchcpp::Sprite *clone) override;
3031

@@ -37,6 +38,11 @@ class SpriteModel
3738
void onDirectionChanged(double direction) override;
3839
void onRotationStyleChanged(libscratchcpp::Sprite::RotationStyle rotationStyle) override;
3940

41+
void onGraphicsEffectChanged(libscratchcpp::IGraphicsEffect *effect, double value) override;
42+
void onGraphicsEffectsCleared() override;
43+
44+
libscratchcpp::Rect boundingRect() const override;
45+
4046
libscratchcpp::Sprite *sprite() const;
4147

4248
IRenderedTarget *renderedTarget() const;

src/stagemodel.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,14 @@ void StageModel::onVideoTransparencyChanged(int videoTransparency)
3838
{
3939
}
4040

41+
void StageModel::onGraphicsEffectChanged(libscratchcpp::IGraphicsEffect *effect, double value)
42+
{
43+
}
44+
45+
void StageModel::onGraphicsEffectsCleared()
46+
{
47+
}
48+
4149
libscratchcpp::Stage *StageModel::stage() const
4250
{
4351
return m_stage;

src/stagemodel.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ class StageModel
3030
void onVideoStateChanged(libscratchcpp::Stage::VideoState videoState) override;
3131
void onVideoTransparencyChanged(int videoTransparency) override;
3232

33+
void onGraphicsEffectChanged(libscratchcpp::IGraphicsEffect *effect, double value) override;
34+
void onGraphicsEffectsCleared() override;
35+
3336
libscratchcpp::Stage *stage() const;
3437

3538
IRenderedTarget *renderedTarget() const;

test/mocks/enginemock.h

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ class EngineMock : public IEngine
1818

1919
MOCK_METHOD(void, start, (), (override));
2020
MOCK_METHOD(void, stop, (), (override));
21-
MOCK_METHOD(void, startScript, (std::shared_ptr<Block>, std::shared_ptr<Target>), (override));
21+
MOCK_METHOD(VirtualMachine *, startScript, (std::shared_ptr<Block>, Target *), (override));
2222
MOCK_METHOD(void, broadcast, (unsigned int, VirtualMachine *, bool), (override));
2323
MOCK_METHOD(void, broadcastByPtr, (Broadcast *, VirtualMachine *, bool), (override));
2424
MOCK_METHOD(void, stopScript, (VirtualMachine *), (override));
2525
MOCK_METHOD(void, stopTarget, (Target *, VirtualMachine *), (override));
26-
MOCK_METHOD(void, initClone, (Sprite *), (override));
27-
MOCK_METHOD(void, deinitClone, (Sprite *), (override));
26+
MOCK_METHOD(void, initClone, (std::shared_ptr<Sprite>), (override));
27+
MOCK_METHOD(void, deinitClone, (std::shared_ptr<Sprite>), (override));
2828

2929
MOCK_METHOD(void, run, (), (override));
3030
MOCK_METHOD(void, runEventLoop, (), (override));
@@ -42,6 +42,7 @@ class EngineMock : public IEngine
4242

4343
MOCK_METHOD(bool, keyPressed, (const std::string &), (const, override));
4444
MOCK_METHOD(void, setKeyState, (const std::string &, bool), (override));
45+
MOCK_METHOD(void, setKeyState, (const KeyEvent &, bool), (override));
4546
MOCK_METHOD(void, setAnyKeyPressed, (bool), (override));
4647

4748
MOCK_METHOD(double, mouseX, (), (const, override));
@@ -53,6 +54,8 @@ class EngineMock : public IEngine
5354
MOCK_METHOD(bool, mousePressed, (), (const, override));
5455
MOCK_METHOD(void, setMousePressed, (bool), (override));
5556

57+
MOCK_METHOD(void, clickTarget, (Target *), (override));
58+
5659
MOCK_METHOD(unsigned int, stageWidth, (), (const, override));
5760
MOCK_METHOD(void, setStageWidth, (unsigned int), (override));
5861

0 commit comments

Comments
 (0)