scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-25 07:22:33 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Update some comments

Browse source
This commit is contained in:
DD Liu 2017-05-11 15:23:11 -04:00
parent 7841d44ccf
commit 6b774c58f5
3 changed files with 33 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/engine/blocks.js
View file

@ -270,7 +270,7 @@ class Blocks {
/** /**
* Block management: change block field values * Block management: change block field values
* @param {!object} args Blockly change event to be processed * @param {!object} args Blockly change event to be processed
* @param {?Runtime} optRuntime Optional runtime to allow changeBlock to emit actions. * @param {?Runtime} optRuntime Optional runtime to allow changeBlock to change VM state.
*/ */
changeBlock (args, optRuntime) { changeBlock (args, optRuntime) {
// Validate // Validate
@ -291,21 +291,23 @@ class Blocks {
case 'checkbox': case 'checkbox':
block.isMonitored = args.value; block.isMonitored = args.value;
if (optRuntime && wasMonitored && !block.isMonitored) { if (optRuntime && wasMonitored && !block.isMonitored) {
optRuntime.removeMonitors([{id: block.id}]); optRuntime.removeMonitor(block.id);
} else if (optRuntime && !wasMonitored && block.isMonitored) { } else if (optRuntime && !wasMonitored && block.isMonitored) {
optRuntime.addMonitors( optRuntime.addMonitor(
// Ensure that value is not undefined, since React requires it // Ensure that value is not undefined, since React requires it
[{ {
// @todo(dd) this will collide if multiple sprites use same block // @todo(dd) this will collide if multiple sprites use same block
id: block.id, id: block.id,
category: 'data', category: 'data',
// @todo(dd) how to handle translation here? // @todo(dd) how to handle translation here?
label: block.opcode, label: block.opcode,
// @todo(dd) for numerical values with decimals, some countries use comma
value: '', value: '',
x: 0, x: 0,
// @todo(dd) place below the last monitor instead // @todo(dd) Don't require sending x and y when instantiating a
// monitor. If it's not preset the GUI should decide.
y: 0 y: 0
}] }
); );
} }
break; break;

5
src/engine/execute.js
View file

@ -91,12 +91,11 @@ const execute = function (sequencer, thread) {
if (thread.showVisualReport) { if (thread.showVisualReport) {
runtime.visualReport(currentBlockId, resolvedValue); runtime.visualReport(currentBlockId, resolvedValue);
} }
if (thread.updateMonitor) { if (thread.updateMonitor) {
runtime.updateMonitors([{ runtime.updateMonitor({
id: currentBlockId, id: currentBlockId,
value: String(resolvedValue) value: String(resolvedValue)
}]); });
} }
} }
// Finished any yields. // Finished any yields.

35
src/engine/runtime.js
View file

@ -104,6 +104,11 @@ class Runtime extends EventEmitter {
*/ */
this._cloneCounter = 0; this._cloneCounter = 0;
/**
* List of all monitors.
*/
this._monitorState = {};
/** /**
* Whether the project is in "turbo mode." * Whether the project is in "turbo mode."
* @type {Boolean} * @type {Boolean}
@ -695,6 +700,7 @@ class Runtime extends EventEmitter {
// @todo: Only render when this.redrawRequested or clones rendered. // @todo: Only render when this.redrawRequested or clones rendered.
this.renderer.draw(); this.renderer.draw();
} }
this.emit(Runtime.MONITORS_UPDATE, Object.values(this._monitorState));
} }
/** /**
@ -874,27 +880,32 @@ class Runtime extends EventEmitter {
} }
/** /**
* Emit a monitor update which adds or updates if exists the given monitors. * Add a monitor to the state. If the monitor already exists in the state,
* @param {!Array} monitors Array of monitors to update. * overwrites it.
* @param {!object} monitor Monitor to add.
*/ */
updateMonitors (monitors) { addMonitor (monitor) {
this.emit(Runtime.MONITORS_UPDATE, monitors); this._monitorState[monitor.id] = monitor;
} }
/** /**
* Emit a monitor update which removes if exists the given monitors. * Update a monitor in the state. Does nothing if the monitor does not already
* @param {!Array} monitors Array of monitors to remove. * exist in the state.
* @param {!object} monitor Monitor to update.
*/ */
removeMonitors (monitors) { updateMonitor (monitor) {
this.emit(Runtime.MONITORS_REMOVED, monitors); if (this._monitorState.hasOwnProperty(monitor.id)) {
this._monitorState[monitor.id] = Object.assign({}, this._monitorState[monitor.id], monitor);
}
} }
/** /**
* Emit a monitor update which adds if it doesn't already exist the given monitors. * Removes a monitor from the state. Does nothing if the monitor already does
* @param {!Array} monitors Array of monitors to add. * not exist in the state.
* @param {!object} monitorId ID of the monitor to remove.
*/ */
addMonitors (monitors) { removeMonitor (monitorId) {
this.emit(Runtime.MONITORS_ADDED, monitors); delete this._monitorState[monitorId];
} }
/** /**