ScCN/scratch-vm
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

js: Optimize sensing.of

Browse Source
This commit is contained in:
Thomas Weber committed 2021-12-23 18:08:56 -06:00
1 parent 1d99176a57
commit 6c32c4ddbb
1 file changed
+28 -2
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/jsgen.js
+28 -2
View File
@@ -613,8 +613,34 @@ class JSGenerator {
return new TypedInput(`(new Date().getMinutes())`, TYPE_NUMBER);
case 'sensing.month':
return new TypedInput(`(new Date().getMonth() + 1)`, TYPE_NUMBER);
case 'sensing.of':
return new TypedInput(`runtime.ext_scratch3_sensing.getAttributeOf({OBJECT: ${this.descendInput(node.object).asString()}, PROPERTY: "${sanitize(node.property)}" })`, TYPE_UNKNOWN);
case 'sensing.of': {
const object = this.descendInput(node.object).asString();
const property = node.property;
if (node.object.kind === 'constant') {
const isStage = node.object.value === '_stage_';
const objectReference = isStage ? 'stage' : this.evaluateOnce(`runtime.getSpriteTargetByName(${object})`);
if (property === 'volume') return new TypedInput(`${objectReference}.volume`, TYPE_NUMBER);
if (isStage) {
switch (property) {
case 'background #': // fallthrough for scratch 1.0 compatibility
case 'backdrop #': return new TypedInput(`(${objectReference}.currentCostume + 1)`, TYPE_NUMBER);
case 'backdrop name': return new TypedInput(`${objectReference}.getCostumes()[${objectReference}.currentCostume].name`, TYPE_STRING);
}
} else {
switch (property) {
case 'x position': return new TypedInput(`${objectReference}.x`, TYPE_NUMBER);
case 'y position': return new TypedInput(`${objectReference}.y`, TYPE_NUMBER);
case 'direction': return new TypedInput(`${objectReference}.direction`, TYPE_NUMBER);
case 'costume #': return new TypedInput(`(${objectReference}.currentCostume + 1)`, TYPE_NUMBER);
case 'costume name': return new TypedInput(`${objectReference}.getCostumes()[${objectReference}.currentCostume].name`, TYPE_STRING);
case 'size': return new TypedInput(`${objectReference}.size`, TYPE_NUMBER);
}
}
const variableReference = this.evaluateOnce(`${objectReference} && ${objectReference}.lookupVariableByNameAndType("${sanitize(property)}", "", true)`);
return new TypedInput(`(${variableReference} ? ${variableReference}.value : 0)`, TYPE_UNKNOWN);
}
return new TypedInput(`runtime.ext_scratch3_sensing.getAttributeOf({OBJECT: ${object}, PROPERTY: "${sanitize(property)}" })`, TYPE_UNKNOWN);
}
case 'sensing.second':
return new TypedInput(`(new Date().getSeconds())`, TYPE_NUMBER);
case 'sensing.touching':