scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-24 06:52:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #593 from fsih/fixWaitCalledEveryFrame

Browse source 
Change wait to use a promise instead of being called every frame
This commit is contained in:
DD Liu 2017-06-08 15:35:48 -04:00 committed by GitHub
commit fb986effe6
1 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/blocks/scratch3_control.js
View file

@ -1,5 +1,4 @@
const Cast = require('../util/cast'); const Cast = require('../util/cast');
const Timer = require('../util/timer');
class Scratch3ControlBlocks { class Scratch3ControlBlocks {
constructor (runtime) { constructor (runtime) {
@ -73,18 +72,13 @@ class Scratch3ControlBlocks {
util.startBranch(1, true); util.startBranch(1, true);
} }
wait (args, util) { wait (args) {
if (!util.stackFrame.timer) { const duration = Math.max(0, 1000 * Cast.toNumber(args.DURATION));
util.stackFrame.timer = new Timer(); return new Promise(resolve => {
util.stackFrame.timer.start(); setTimeout(() => {
util.yield(); resolve();
this.runtime.requestRedraw(); }, duration);
} else { });
const duration = Math.max(0, 1000 * Cast.toNumber(args.DURATION));
if (util.stackFrame.timer.timeElapsed() < duration) {
util.yield();
}
}
} }
if (args, util) { if (args, util) {