Skip to content

Commit 7a1e3fd

Browse files
adazem009adazem009
committed
Remove obsolete IEngine methods
1 parent fc58708 commit 7a1e3fd

File tree

12 files changed

+2
-155
lines changed

12 files changed

+2
-155
lines changed

‎include/scratchcpp/iengine.h‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -162,25 +162,6 @@ class LIBSCRATCHCPP_EXPORT IEngine
162162
*/
163163
virtual void requestRedraw() = 0;
164164

165-
/*!
166-
* Call this from a block implementation to break the execution of the current frame.
167-
* \note This has no effect in "run without screen refresh" custom blocks.
168-
*/
169-
virtual void breakFrame() = 0;
170-
171-
/*! Returns true if breakFrame() was called. */
172-
virtual bool breakingCurrentFrame() = 0;
173-
174-
/*!
175-
* Call this from a block implementation to skip a frame and run the next frame immediately.\n
176-
* The screen will be refreshed according to the frame rate.
177-
* \note This also works in "run without screen refresh" custom blocks.
178-
*/
179-
virtual void skipFrame() = 0;
180-
181-
/*! Call this from a block implementation to ignore calls to skipFrame() until the current frame ends. */
182-
virtual void lockFrame() = 0;
183-
184165
/*! Returns the timer of the project. */
185166
virtual ITimer *timer() const = 0;
186167

‎src/blocks/controlblocks.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,6 @@ unsigned int ControlBlocks::wait(VirtualMachine *vm)
233233
vm->stop(true, true, false);
234234
} else
235235
vm->stop(true, true, true);
236-
237-
vm->engine()->lockFrame();
238236
return 0;
239237
}
240238

‎src/blocks/motionblocks.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,6 @@ void MotionBlocks::continueGliding(VirtualMachine *vm)
500500
}
501501

502502
vm->stop(true, true, true);
503-
vm->engine()->lockFrame();
504503
}
505504
}
506505

‎src/engine/internal/engine.cpp‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ void Engine::clear()
4646
m_clones.clear();
4747

4848
m_running = false;
49-
m_breakFrame = false;
50-
m_skipFrame = false;
51-
m_lockFrame = false;
5249
}
5350

5451
// Resolves ID references and sets pointers of entities.
@@ -189,8 +186,6 @@ void Engine::broadcast(unsigned int index, VirtualMachine *sourceScript, bool wa
189186

190187
void Engine::broadcastByPtr(Broadcast *broadcast, VirtualMachine *sourceScript, bool wait)
191188
{
192-
bool previousSkipFrame = m_skipFrame;
193-
skipFrame();
194189
const std::vector<Script *> &scripts = m_broadcastMap[broadcast];
195190

196191
for (auto script : scripts) {
@@ -325,7 +320,6 @@ void Engine::eventLoop(bool untilProjectStops)
325320
auto frameStart = m_clock->currentSteadyTime();
326321
std::chrono::steady_clock::time_point currentTime;
327322
std::chrono::milliseconds elapsedTime, sleepTime;
328-
m_lockFrame = false;
329323
m_redrawRequested = false;
330324
bool timeout = false;
331325
bool stop = false;
@@ -373,7 +367,6 @@ void Engine::runScripts(const std::vector<std::shared_ptr<VirtualMachine>> &scri
373367
for (int i = 0; i < scripts.size(); i++) {
374368
auto script = scripts[i];
375369
assert(script);
376-
m_breakFrame = false;
377370

378371
script->run();
379372
if (script->atEnd() && m_running) {
@@ -581,30 +574,6 @@ void Engine::requestRedraw()
581574
m_redrawRequested = true;
582575
}
583576

584-
void Engine::breakFrame()
585-
{
586-
m_breakFrame = true;
587-
}
588-
589-
bool Engine::breakingCurrentFrame()
590-
{
591-
return m_breakFrame;
592-
}
593-
594-
void Engine::skipFrame()
595-
{
596-
if (!m_lockFrame) {
597-
breakFrame();
598-
m_skipFrame = true;
599-
}
600-
}
601-
602-
void Engine::lockFrame()
603-
{
604-
m_skipFrame = false;
605-
m_lockFrame = true;
606-
}
607-
608577
ITimer *Engine::timer() const
609578
{
610579
return m_timer;
@@ -978,9 +947,6 @@ void Engine::finalize()
978947
m_scriptsToRemove.clear();
979948
m_running = false;
980949
m_redrawRequested = false;
981-
m_breakFrame = false;
982-
m_skipFrame = false;
983-
m_lockFrame = false;
984950
}
985951

986952
void Engine::deleteClones()

‎src/engine/internal/engine.h‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,6 @@ class Engine : public IEngine
7575

7676
void requestRedraw() override;
7777

78-
void breakFrame() override;
79-
bool breakingCurrentFrame() override;
80-
81-
void skipFrame() override;
82-
void lockFrame() override;
83-
8478
ITimer *timer() const override;
8579
void setTimer(ITimer *timer);
8680

@@ -168,9 +162,6 @@ class Engine : public IEngine
168162

169163
bool m_running = false;
170164
bool m_redrawRequested = false;
171-
bool m_breakFrame = false;
172-
bool m_skipFrame = false;
173-
bool m_lockFrame = false;
174165
};
175166

176167
} // namespace libscratchcpp

‎src/engine/virtualmachine_p.cpp‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -319,16 +319,12 @@ do_loop_end : {
319319
pos = l.start;
320320
else
321321
loops.pop_back();
322-
if (!noBreak && !warp) {
323-
engine->breakFrame();
322+
if (!noBreak && !warp)
324323
return pos;
325-
}
326324
DISPATCH();
327325
} else {
328-
if (!noBreak && !warp) {
329-
engine->breakFrame();
326+
if (!noBreak && !warp)
330327
return pos - 1;
331-
}
332328
loopStart = run(l.start, false);
333329
if (!READ_LAST_REG()->toBool())
334330
pos = loopStart;
@@ -698,8 +694,6 @@ do_exec : {
698694
procedureArgTree.clear();
699695
procedureArgs = nullptr;
700696
nextProcedureArgs = nullptr;
701-
if (!noBreak)
702-
engine->breakFrame();
703697
if (goBack) {
704698
goBack = false;
705699
pos -= instruction_arg_count[OP_EXEC] + 1;

‎test/blocks/control_blocks_test.cpp‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -752,8 +752,6 @@ TEST_F(ControlBlocksTest, WaitImpl)
752752

753753
std::chrono::steady_clock::time_point startTime(std::chrono::milliseconds(1000));
754754
EXPECT_CALL(clock, currentSteadyTime()).Times(2).WillRepeatedly(Return(startTime));
755-
EXPECT_CALL(m_engineMock, lockFrame()).Times(1);
756-
EXPECT_CALL(m_engineMock, breakFrame()).Times(1);
757755
vm.run();
758756

759757
ASSERT_EQ(vm.registerCount(), 0);
@@ -762,8 +760,6 @@ TEST_F(ControlBlocksTest, WaitImpl)
762760

763761
std::chrono::steady_clock::time_point time1(std::chrono::milliseconds(6450));
764762
EXPECT_CALL(clock, currentSteadyTime()).WillOnce(Return(time1));
765-
EXPECT_CALL(m_engineMock, lockFrame()).Times(1);
766-
EXPECT_CALL(m_engineMock, breakFrame()).Times(1);
767763
vm.run();
768764

769765
ASSERT_EQ(vm.registerCount(), 0);
@@ -772,16 +768,12 @@ TEST_F(ControlBlocksTest, WaitImpl)
772768

773769
std::chrono::steady_clock::time_point time2(std::chrono::milliseconds(6500));
774770
EXPECT_CALL(clock, currentSteadyTime()).WillOnce(Return(time2));
775-
EXPECT_CALL(m_engineMock, lockFrame()).Times(1);
776-
EXPECT_CALL(m_engineMock, breakFrame()).Times(1);
777771
vm.run();
778772

779773
ASSERT_EQ(vm.registerCount(), 0);
780774
ASSERT_TRUE(ControlBlocks::m_timeMap.find(&vm) == ControlBlocks::m_timeMap.cend());
781775
ASSERT_FALSE(vm.atEnd());
782776

783-
EXPECT_CALL(m_engineMock, lockFrame()).Times(0);
784-
EXPECT_CALL(m_engineMock, breakFrame()).Times(0);
785777
vm.run();
786778

787779
ASSERT_EQ(vm.registerCount(), 0);
@@ -842,19 +834,16 @@ TEST_F(ControlBlocksTest, WaitUntilImpl)
842834
vm.setConstValues(constValuesBefore);
843835
vm.setBytecode(bytecode);
844836

845-
EXPECT_CALL(m_engineMock, breakFrame()).Times(1);
846837
vm.run();
847838

848839
ASSERT_EQ(vm.registerCount(), 0);
849840
ASSERT_FALSE(vm.atEnd());
850841

851-
EXPECT_CALL(m_engineMock, breakFrame()).Times(1);
852842
vm.run();
853843

854844
ASSERT_EQ(vm.registerCount(), 0);
855845
ASSERT_FALSE(vm.atEnd());
856846

857-
EXPECT_CALL(m_engineMock, breakFrame()).Times(0);
858847
vm.setConstValues(constValuesAfter);
859848
vm.run();
860849

‎test/blocks/looks_blocks_test.cpp‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2023,7 +2023,6 @@ TEST_F(LooksBlocksTest, SwitchBackdropToAndWaitImpl)
20232023
EXPECT_CALL(m_engineMock, stage()).Times(3).WillRepeatedly(Return(&stage));
20242024
EXPECT_CALL(m_engineMock, broadcastByPtr(stage.costumeAt(1)->broadcast(), &vm, true));
20252025
EXPECT_CALL(m_engineMock, broadcastByPtrRunning(stage.costumeAt(1)->broadcast(), &vm)).WillOnce(Return(true));
2026-
EXPECT_CALL(m_engineMock, breakFrame());
20272026
vm.setBytecode(bytecode1);
20282027
vm.run();
20292028

@@ -2033,7 +2032,6 @@ TEST_F(LooksBlocksTest, SwitchBackdropToAndWaitImpl)
20332032

20342033
EXPECT_CALL(m_engineMock, stage()).WillOnce(Return(&stage));
20352034
EXPECT_CALL(m_engineMock, broadcastByPtrRunning(stage.costumeAt(1)->broadcast(), &vm)).WillOnce(Return(false));
2036-
EXPECT_CALL(m_engineMock, breakFrame()).Times(0);
20372035
vm.run();
20382036

20392037
ASSERT_EQ(vm.registerCount(), 0);
@@ -2043,7 +2041,6 @@ TEST_F(LooksBlocksTest, SwitchBackdropToAndWaitImpl)
20432041
EXPECT_CALL(m_engineMock, stage()).Times(3).WillRepeatedly(Return(&stage));
20442042
EXPECT_CALL(m_engineMock, broadcastByPtr(stage.costumeAt(1)->broadcast(), &vm, true));
20452043
EXPECT_CALL(m_engineMock, broadcastByPtrRunning(stage.costumeAt(1)->broadcast(), &vm)).WillOnce(Return(true));
2046-
EXPECT_CALL(m_engineMock, breakFrame());
20472044
vm.setBytecode(bytecode2);
20482045
vm.run();
20492046

@@ -2053,7 +2050,6 @@ TEST_F(LooksBlocksTest, SwitchBackdropToAndWaitImpl)
20532050

20542051
EXPECT_CALL(m_engineMock, stage()).WillOnce(Return(&stage));
20552052
EXPECT_CALL(m_engineMock, broadcastByPtrRunning(stage.costumeAt(1)->broadcast(), &vm)).WillOnce(Return(false));
2056-
EXPECT_CALL(m_engineMock, breakFrame()).Times(0);
20572053
vm.run();
20582054

20592055
ASSERT_EQ(vm.registerCount(), 0);
@@ -2075,7 +2071,6 @@ TEST_F(LooksBlocksTest, SwitchBackdropToAndWaitImpl)
20752071
EXPECT_CALL(m_engineMock, stage()).Times(3).WillRepeatedly(Return(&stage));
20762072
EXPECT_CALL(m_engineMock, broadcastByPtr(stage.costumeAt(0)->broadcast(), &vm, true));
20772073
EXPECT_CALL(m_engineMock, broadcastByPtrRunning(stage.costumeAt(0)->broadcast(), &vm)).WillOnce(Return(false));
2078-
EXPECT_CALL(m_engineMock, breakFrame()).Times(0);
20792074
vm.setBytecode(bytecode3);
20802075
vm.run();
20812076

@@ -2087,7 +2082,6 @@ TEST_F(LooksBlocksTest, SwitchBackdropToAndWaitImpl)
20872082
EXPECT_CALL(m_engineMock, stage()).Times(3).WillRepeatedly(Return(&stage));
20882083
EXPECT_CALL(m_engineMock, broadcastByPtr(stage.costumeAt(1)->broadcast(), &vm, true));
20892084
EXPECT_CALL(m_engineMock, broadcastByPtrRunning(stage.costumeAt(1)->broadcast(), &vm)).WillOnce(Return(false));
2090-
EXPECT_CALL(m_engineMock, breakFrame()).Times(0);
20912085
vm.setBytecode(bytecode4);
20922086
vm.run();
20932087

@@ -2124,7 +2118,6 @@ TEST_F(LooksBlocksTest, SwitchBackdropToAndWaitImpl)
21242118
EXPECT_CALL(m_engineMock, stage()).Times(4).WillRepeatedly(Return(&stage));
21252119
EXPECT_CALL(m_engineMock, broadcastByPtr(stage.costumeAt(3)->broadcast(), &vm, true));
21262120
EXPECT_CALL(m_engineMock, broadcastByPtrRunning(stage.costumeAt(3)->broadcast(), &vm)).WillOnce(Return(true));
2127-
EXPECT_CALL(m_engineMock, breakFrame());
21282121
vm.setBytecode(bytecode7);
21292122
vm.run();
21302123

@@ -2134,7 +2127,6 @@ TEST_F(LooksBlocksTest, SwitchBackdropToAndWaitImpl)
21342127

21352128
EXPECT_CALL(m_engineMock, stage()).WillOnce(Return(&stage));
21362129
EXPECT_CALL(m_engineMock, broadcastByPtrRunning(stage.costumeAt(3)->broadcast(), &vm)).WillOnce(Return(false));
2137-
EXPECT_CALL(m_engineMock, breakFrame()).Times(0);
21382130
vm.run();
21392131

21402132
ASSERT_EQ(vm.registerCount(), 0);
@@ -2173,7 +2165,6 @@ TEST_F(LooksBlocksTest, SwitchBackdropToAndWaitImpl)
21732165
EXPECT_CALL(m_engineMock, stage()).Times(4).WillRepeatedly(Return(&stage));
21742166
EXPECT_CALL(m_engineMock, broadcastByPtr(stage.costumeAt(3)->broadcast(), &vm, true));
21752167
EXPECT_CALL(m_engineMock, broadcastByPtrRunning(stage.costumeAt(3)->broadcast(), &vm)).WillOnce(Return(true));
2176-
EXPECT_CALL(m_engineMock, breakFrame());
21772168
vm.setBytecode(bytecode8);
21782169
vm.run();
21792170

@@ -2183,7 +2174,6 @@ TEST_F(LooksBlocksTest, SwitchBackdropToAndWaitImpl)
21832174

21842175
EXPECT_CALL(m_engineMock, stage()).WillOnce(Return(&stage));
21852176
EXPECT_CALL(m_engineMock, broadcastByPtrRunning(stage.costumeAt(3)->broadcast(), &vm)).WillOnce(Return(false));
2186-
EXPECT_CALL(m_engineMock, breakFrame()).Times(0);
21872177
vm.run();
21882178

21892179
ASSERT_EQ(vm.registerCount(), 0);
@@ -2226,7 +2216,6 @@ TEST_F(LooksBlocksTest, SwitchBackdropToAndWaitImpl)
22262216
EXPECT_CALL(m_engineMock, stage()).Times(3).WillRepeatedly(Return(&stage));
22272217
EXPECT_CALL(m_engineMock, broadcastByPtr(stage.costumeAt(5)->broadcast(), &vm, true));
22282218
EXPECT_CALL(m_engineMock, broadcastByPtrRunning(stage.costumeAt(5)->broadcast(), &vm)).WillOnce(Return(true));
2229-
EXPECT_CALL(m_engineMock, breakFrame());
22302219
vm.setBytecode(bytecode9);
22312220
vm.run();
22322221

@@ -2236,7 +2225,6 @@ TEST_F(LooksBlocksTest, SwitchBackdropToAndWaitImpl)
22362225

22372226
EXPECT_CALL(m_engineMock, stage()).WillOnce(Return(&stage));
22382227
EXPECT_CALL(m_engineMock, broadcastByPtrRunning(stage.costumeAt(5)->broadcast(), &vm)).WillOnce(Return(false));
2239-
EXPECT_CALL(m_engineMock, breakFrame()).Times(0);
22402228
vm.run();
22412229

22422230
ASSERT_EQ(vm.registerCount(), 0);
@@ -2352,7 +2340,6 @@ TEST_F(LooksBlocksTest, NextBackdropAndWait)
23522340
EXPECT_CALL(m_engineMock, stage()).Times(3).WillRepeatedly(Return(&stage));
23532341
EXPECT_CALL(m_engineMock, broadcastByPtr(stage.costumeAt(1)->broadcast(), &vm, true));
23542342
EXPECT_CALL(m_engineMock, broadcastByPtrRunning(stage.costumeAt(1)->broadcast(), &vm)).WillOnce(Return(true));
2355-
EXPECT_CALL(m_engineMock, breakFrame());
23562343
vm.run();
23572344

23582345
ASSERT_EQ(vm.registerCount(), 0);
@@ -2361,7 +2348,6 @@ TEST_F(LooksBlocksTest, NextBackdropAndWait)
23612348

23622349
EXPECT_CALL(m_engineMock, stage()).WillOnce(Return(&stage));
23632350
EXPECT_CALL(m_engineMock, broadcastByPtrRunning(stage.costumeAt(1)->broadcast(), &vm)).WillOnce(Return(false));
2364-
EXPECT_CALL(m_engineMock, breakFrame()).Times(0);
23652351
vm.run();
23662352

23672353
ASSERT_EQ(vm.registerCount(), 0);
@@ -2448,7 +2434,6 @@ TEST_F(LooksBlocksTest, PreviousBackdropAndWait)
24482434
EXPECT_CALL(m_engineMock, stage()).Times(3).WillRepeatedly(Return(&stage));
24492435
EXPECT_CALL(m_engineMock, broadcastByPtr(stage.costumeAt(1)->broadcast(), &vm, true));
24502436
EXPECT_CALL(m_engineMock, broadcastByPtrRunning(stage.costumeAt(1)->broadcast(), &vm)).WillOnce(Return(true));
2451-
EXPECT_CALL(m_engineMock, breakFrame());
24522437
vm.run();
24532438

24542439
ASSERT_EQ(vm.registerCount(), 0);
@@ -2457,7 +2442,6 @@ TEST_F(LooksBlocksTest, PreviousBackdropAndWait)
24572442

24582443
EXPECT_CALL(m_engineMock, stage()).WillOnce(Return(&stage));
24592444
EXPECT_CALL(m_engineMock, broadcastByPtrRunning(stage.costumeAt(1)->broadcast(), &vm)).WillOnce(Return(false));
2460-
EXPECT_CALL(m_engineMock, breakFrame()).Times(0);
24612445
vm.run();
24622446

24632447
ASSERT_EQ(vm.registerCount(), 0);
@@ -2551,7 +2535,6 @@ TEST_F(LooksBlocksTest, RandomBackdropAndWait)
25512535
EXPECT_CALL(rng, randint).Times(0);
25522536
EXPECT_CALL(m_engineMock, stage()).Times(3).WillRepeatedly(Return(&stage));
25532537
EXPECT_CALL(m_engineMock, broadcastByPtrRunning).Times(0);
2554-
EXPECT_CALL(m_engineMock, breakFrame()).Times(0);
25552538
vm.run();
25562539

25572540
ASSERT_EQ(vm.registerCount(), 0);
@@ -2564,7 +2547,6 @@ TEST_F(LooksBlocksTest, RandomBackdropAndWait)
25642547
EXPECT_CALL(m_engineMock, stage()).Times(3).WillRepeatedly(Return(&stage));
25652548
EXPECT_CALL(m_engineMock, broadcastByPtr(stage.costumeAt(1)->broadcast(), &vm, true));
25662549
EXPECT_CALL(m_engineMock, broadcastByPtrRunning(stage.costumeAt(1)->broadcast(), &vm)).WillOnce(Return(true));
2567-
EXPECT_CALL(m_engineMock, breakFrame());
25682550
vm.reset();
25692551
vm.run();
25702552

@@ -2574,7 +2556,6 @@ TEST_F(LooksBlocksTest, RandomBackdropAndWait)
25742556

25752557
EXPECT_CALL(m_engineMock, stage()).WillOnce(Return(&stage));
25762558
EXPECT_CALL(m_engineMock, broadcastByPtrRunning(stage.costumeAt(1)->broadcast(), &vm)).WillOnce(Return(false));
2577-
EXPECT_CALL(m_engineMock, breakFrame()).Times(0);
25782559
vm.run();
25792560

25802561
ASSERT_EQ(vm.registerCount(), 0);

0 commit comments

Comments
 (0)