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

fix sb2 conversion to load into correct VIDEO_STATE

Browse source
This commit is contained in:
Corey Frang 2018-04-05 15:10:16 -04:00 committed by Michael "Z" Goddard
parent 9cd5e4da2b
commit e20723994f
No known key found for this signature in database
GPG key ID: 762CD40DD5349872
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/extensions/scratch3_video_sensing/index.js
View file

@ -339,14 +339,13 @@ class Scratch3VideoSensingBlocks {
} }
videoToggle (args) { videoToggle (args) {
// imported blocks have VIDEO_STATE "off", "on", "on-flipped" as opposed to the numerics?
const state = Number(args.VIDEO_STATE); const state = Number(args.VIDEO_STATE);
// 1 == off, 2 & 3 are on (3 is flipped) // 1 == off, 2 & 3 are on (3 is flipped)
if (args.VIDEO_STATE === 'off' || state === 1) { if (state === 1) {
this.runtime.ioDevices.video.disableVideo(); this.runtime.ioDevices.video.disableVideo();
} else { } else {
this.runtime.ioDevices.video.enableVideo(); this.runtime.ioDevices.video.enableVideo();
this.runtime.ioDevices.video.mirror = args.VIDEO_STATE === 'on' || state === 2; this.runtime.ioDevices.video.mirror = state === 2;
} }
} }

10
src/serialization/sb2.js
View file

@ -627,6 +627,16 @@ const parseBlock = function (sb2block, addBroadcastMsg, getVariableId, extension
} else if (fieldValue === 'this sprite') { } else if (fieldValue === 'this sprite') {
fieldValue = 2; fieldValue = 2;
} }
} else if (expectedArg.inputOp === 'videoSensing.menu.VIDEO_STATE') {
if (shadowObscured) {
fieldValue = 2;
} else if (fieldValue === 'off') {
fieldValue = 1;
} else if (fieldValue === 'on') {
fieldValue = 2;
} else if (fieldValue === 'on-flipped') {
fieldValue = 3;
}
} else if (shadowObscured) { } else if (shadowObscured) {
// Filled drop-down menu. // Filled drop-down menu.
fieldValue = ''; fieldValue = '';