scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2025-07-26 22:20:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions1

Clicking blocks in the toolbox ()

Browse source
This commit is contained in:
Tim Mickel 2016-10-13 17:15:49 -04:00 • committed by GitHub
parent dcda82a009
commit 1e86d48a31
5 changed files with 55 additions and 26 deletions
src/engine
execute.js

31
src/engine/execute.js
View file

@ -22,19 +22,34 @@ var execute = function (sequencer, thread) {
var currentBlockId = thread.peekStack();
var currentStackFrame = thread.peekStackFrame();
// Verify that the block still exists.
if (!target ||
typeof target.blocks.getBlock(currentBlockId) === 'undefined') {
// Check where the block lives: target blocks or flyout blocks.
var targetHasBlock = (
typeof target.blocks.getBlock(currentBlockId) !== 'undefined'
);
var flyoutHasBlock = (
typeof runtime.flyoutBlocks.getBlock(currentBlockId) !== 'undefined'
);
// Stop if block or target no longer exists.
if (!target || (!targetHasBlock && !flyoutHasBlock)) {
// No block found: stop the thread; script no longer exists.
sequencer.retireThread(thread);
return;
}
// Query info about the block.
var opcode = target.blocks.getOpcode(currentBlockId);
var blockContainer = null;
if (targetHasBlock) {
blockContainer = target.blocks;
} else {
blockContainer = runtime.flyoutBlocks;
}
var opcode = blockContainer.getOpcode(currentBlockId);
var fields = blockContainer.getFields(currentBlockId);
var inputs = blockContainer.getInputs(currentBlockId);
var blockFunction = runtime.getOpcodeFunction(opcode);
var isHat = runtime.getIsHat(opcode);
var fields = target.blocks.getFields(currentBlockId);
var inputs = target.blocks.getInputs(currentBlockId);
if (!opcode) {
console.warn('Could not get opcode for block: ' + currentBlockId);
@ -133,7 +148,7 @@ var execute = function (sequencer, thread) {
}
// Add any mutation to args (e.g., for procedures).
var mutation = target.blocks.getMutation(currentBlockId);
var mutation = blockContainer.getMutation(currentBlockId);
if (mutation) {
argValues.mutation = mutation;
}
@ -165,7 +180,7 @@ var execute = function (sequencer, thread) {
sequencer.stepToProcedure(thread, procedureName);
},
getProcedureParamNames: function (procedureName) {
return thread.target.blocks.getProcedureParamNames(procedureName);
return blockContainer.getProcedureParamNames(procedureName);
},
pushParam: function (paramName, paramValue) {
thread.pushParam(paramName, paramValue);