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

lazy evaluate project loading related code

Browse source
This commit is contained in:
Michael "Z" Goddard 2019-01-22 17:41:35 -05:00
parent a5009b4c59
commit bc5605cf80
No known key found for this signature in database
GPG key ID: 762CD40DD5349872
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/virtual-machine.js
View file

@ -8,12 +8,8 @@ const ExtensionManager = require('./extension-support/extension-manager');
const log = require('./util/log');
const MathUtil = require('./util/math-util');
const Runtime = require('./engine/runtime');
const {SB1File, ValidationError} = require('scratch-sb1-converter');
const sb2 = require('./serialization/sb2');
const sb3 = require('./serialization/sb3');
const StringUtil = require('./util/string-util');
const formatMessage = require('format-message');
const validate = require('scratch-parser');
const Variable = require('./engine/variable');
const newBlockIds = require('./util/new-block-ids');
@ -297,6 +293,7 @@ class VirtualMachine extends EventEmitter {
}
const validationPromise = new Promise((resolve, reject) => {
const validate = require('scratch-parser');
// The second argument of false below indicates to the validator that the
// input should be parsed/validated as an entire project (and not a single sprite)
validate(input, false, (error, res) => {
@ -305,6 +302,8 @@ class VirtualMachine extends EventEmitter {
});
})
.catch(error => {
const {SB1File, ValidationError} = require('scratch-sb1-converter');
try {
const sb1 = new SB1File(input);
const json = sb1.json;
@ -410,6 +409,8 @@ class VirtualMachine extends EventEmitter {
* specified by optZipType or blob by default.
*/
exportSprite (targetId, optZipType) {
const sb3 = require('./serialization/sb3');
const soundDescs = serializeSounds(this.runtime, targetId);
const costumeDescs = serializeCostumes(this.runtime, targetId);
const spriteJson = StringUtil.stringify(sb3.serialize(this.runtime, targetId));
@ -432,6 +433,7 @@ class VirtualMachine extends EventEmitter {
* @return {string} Serialized state of the runtime.
*/
toJSON () {
const sb3 = require('./serialization/sb3');
return StringUtil.stringify(sb3.serialize(this.runtime));
}
@ -461,9 +463,11 @@ class VirtualMachine extends EventEmitter {
const deserializePromise = function () {
const projectVersion = projectJSON.projectVersion;
if (projectVersion === 2) {
const sb2 = require('./serialization/sb2');
return sb2.deserialize(projectJSON, runtime, false, zip);
}
if (projectVersion === 3) {
const sb3 = require('./serialization/sb3');
return sb3.deserialize(projectJSON, runtime, zip);
}
return Promise.reject('Unable to verify Scratch Project version.');
@ -553,6 +557,7 @@ class VirtualMachine extends EventEmitter {
}
const validationPromise = new Promise((resolve, reject) => {
const validate = require('scratch-parser');
// The second argument of true below indicates to the parser/validator
// that the given input should be treated as a single sprite and not
// an entire project
@ -592,6 +597,7 @@ class VirtualMachine extends EventEmitter {
_addSprite2 (sprite, zip) {
// Validate & parse
const sb2 = require('./serialization/sb2');
return sb2.deserialize(sprite, this.runtime, true, zip)
.then(({targets, extensions}) =>
this.installTargets(targets, extensions, false));
@ -605,7 +611,7 @@ class VirtualMachine extends EventEmitter {
*/
_addSprite3 (sprite, zip) {
// Validate & parse
const sb3 = require('./serialization/sb3');
return sb3
.deserialize(sprite, this.runtime, zip, true)
.then(({targets, extensions}) => this.installTargets(targets, extensions, false));
@ -1187,6 +1193,8 @@ class VirtualMachine extends EventEmitter {
* @return {!Promise} Promise that resolves when the extensions and blocks have been added.
*/
shareBlocksToTarget (blocks, targetId, optFromTargetId) {
const sb3 = require('./serialization/sb3');
const copiedBlocks = JSON.parse(JSON.stringify(blocks));
newBlockIds(copiedBlocks);
const target = this.runtime.getTargetById(targetId);