scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2025-06-03 17:14:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions1

Merge pull request from mzgoddard/motion-detect-4

Browse source 
Motion detect 4
This commit is contained in:
Andrew Sliwinski 2018-04-13 08:16:34 -04:00 • committed by GitHub
commit 3ac2922a07
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 77 additions and 64 deletions
src/serialization
sb2.jssb2_specmap.js

16
src/serialization/sb2.js
View file

@ -611,21 +611,13 @@ const parseBlock = function (sb2block, addBroadcastMsg, getVariableId, extension
if (shadowObscured) {
fieldValue = 1;
}
} else if (expectedArg.inputOp === 'videoSensing.menu.MOTION_DIRECTION') {
} else if (expectedArg.inputOp === 'videoSensing.menu.ATTRIBUTE') {
if (shadowObscured) {
fieldValue = 1;
} else if (fieldValue === 'motion') {
fieldValue = 1;
} else if (fieldValue === 'direction') {
fieldValue = 2;
fieldValue = 'motion';
}
} else if (expectedArg.inputOp === 'videoSensing.menu.STAGE_SPRITE') {
} else if (expectedArg.inputOp === 'videoSensing.menu.SUBJECT') {
if (shadowObscured) {
fieldValue = 2;
} else if (fieldValue === 'Stage') {
fieldValue = 1;
} else if (fieldValue === 'this sprite') {
fieldValue = 2;
fieldValue = 'this sprite';
}
} else if (expectedArg.inputOp === 'videoSensing.menu.VIDEO_STATE') {
if (shadowObscured) {

8
src/serialization/sb2_specmap.js
View file

@ -614,13 +614,13 @@ const specMap = {
argMap: [
{
type: 'input',
inputOp: 'videoSensing.menu.MOTION_DIRECTION',
inputName: 'MOTION_DIRECTION'
inputOp: 'videoSensing.menu.ATTRIBUTE',
inputName: 'ATTRIBUTE'
},
{
type: 'input',
inputOp: 'videoSensing.menu.STAGE_SPRITE',
inputName: 'STAGE_SPRITE'
inputOp: 'videoSensing.menu.SUBJECT',
inputName: 'SUBJECT'
}
]
},