scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2025-01-11 10:39:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

don't show green flag when monitor running

Browse source
This commit is contained in:
DD Liu 2017-05-10 14:06:02 -04:00
parent 777d1f3824
commit 4687fe41fe
2 changed files with 32 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/engine/execute.js
View file

@ -95,11 +95,14 @@ const execute = function (sequencer, thread) {
if (thread.updateMonitor) {
runtime.updateMonitors([{
id: currentBlockId, // @todo(dd) this will collide if multiple sprites use same block
// @todo(dd) this will collide if multiple sprites use same block
id: currentBlockId,
category: 'data',
label: blockContainer.getOpcode(blockContainer.getBlock(currentBlockId)), // @todo(dd) how to handle translation here?
// @todo(dd) how to handle translation here?
label: blockContainer.getOpcode(blockContainer.getBlock(currentBlockId)),
value: String(resolvedValue),
x: 0, // @todo(dd) place below the last monitor instead
x: 0,
// @todo(dd) place below the last monitor instead
y: 0
}]);
}

34
src/engine/runtime.js
View file

@ -93,10 +93,10 @@ class Runtime extends EventEmitter {
this._scriptGlowsPreviousFrame = [];
/**
* Number of threads running during the previous frame
* Number of non-monitor threads running during the previous frame.
* @type {number}
*/
this._threadCount = 0;
this._nonMonitorThreadCount = 0;
/**
* Currently known number of clones, used to enforce clone limit.
@ -670,13 +670,31 @@ class Runtime extends EventEmitter {
this._pushMonitors();
const doneThreads = this.sequencer.stepThreads();
this._updateGlows(doneThreads);
this._setThreadCount(this.threads.length + doneThreads.length);
// Add done threads so that even if a thread finishes within 1 frame, the green
// flag will still indicate that a script ran.
this._maybeEmitProjectRunStartOrStop(
this.threads.length - this._getMonitorThreadCount(this.threads) +
doneThreads.length - this._getMonitorThreadCount(doneThreads));
if (this.renderer) {
// @todo: Only render when this.redrawRequested or clones rendered.
this.renderer.draw();
}
}
/**
* Get the number of threads in the given array that are monitor threads (threads
* that update monitor values, and don't count as running a script).
* @param {!Array.<Thread>} threads The set of threads to look through.
* @return {number} The number of monitor threads in threads.
*/
_getMonitorThreadCount (threads) {
let count = 0;
threads.forEach(thread => {
if (thread.updateMonitor) count++;
});
return count;
}
/**
* Queue monitor blocks to sequencer to be run.
*/
@ -769,16 +787,16 @@ class Runtime extends EventEmitter {
* Emit run start/stop after each tick. Emits when `this.threads.length` goes
* between non-zero and zero
*
* @param {number} threadCount The new threadCount
* @param {number} nonMonitorThreadCount The new nonMonitorThreadCount
*/
_setThreadCount (threadCount) {
if (this._threadCount === 0 && threadCount > 0) {
_maybeEmitProjectRunStartOrStop (nonMonitorThreadCount) {
if (this._nonMonitorThreadCount === 0 && nonMonitorThreadCount > 0) {
this.emit(Runtime.PROJECT_RUN_START);
}
if (this._threadCount > 0 && threadCount === 0) {
if (this._nonMonitorThreadCount > 0 && nonMonitorThreadCount === 0) {
this.emit(Runtime.PROJECT_RUN_STOP);
}
this._threadCount = threadCount;
this._nonMonitorThreadCount = nonMonitorThreadCount;
}
/**