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

Comment fixes and instantiate textImageElement only as necessary

Browse source
This commit is contained in:
DD 2018-11-13 15:31:00 -05:00
parent 0b72608624
commit 679ddf9fb7
2 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/import/load-costume.js
View file

@ -50,7 +50,7 @@ const fetchBitmapCanvas_ = function (costume, runtime, rotationCenter) {
} }
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const baseImageElement = new Image(); const baseImageElement = new Image();
const textImageElement = new Image(); let textImageElement;
let loadedOne = false; let loadedOne = false;
@ -71,17 +71,19 @@ const fetchBitmapCanvas_ = function (costume, runtime, rotationCenter) {
const removeEventListeners = function () { const removeEventListeners = function () {
baseImageElement.removeEventListener('error', onError); baseImageElement.removeEventListener('error', onError);
textImageElement.removeEventListener('error', onError);
baseImageElement.removeEventListener('load', onLoad); baseImageElement.removeEventListener('load', onLoad);
if (textImageElement) {
textImageElement.removeEventListener('error', onError);
textImageElement.removeEventListener('load', onLoad); textImageElement.removeEventListener('load', onLoad);
}
}; };
baseImageElement.addEventListener('error', onError);
textImageElement.addEventListener('error', onError);
baseImageElement.addEventListener('load', onLoad); baseImageElement.addEventListener('load', onLoad);
textImageElement.addEventListener('load', onLoad); baseImageElement.addEventListener('error', onError);
if (costume.textLayerAsset) { if (costume.textLayerAsset) {
textImageElement = new Image();
textImageElement.addEventListener('load', onLoad);
textImageElement.addEventListener('error', onError);
textImageElement.src = costume.textLayerAsset.encodeDataURI(); textImageElement.src = costume.textLayerAsset.encodeDataURI();
} else { } else {
loadedOne = true; loadedOne = true;
@ -97,7 +99,7 @@ const fetchBitmapCanvas_ = function (costume, runtime, rotationCenter) {
const ctx = canvas.getContext('2d'); const ctx = canvas.getContext('2d');
ctx.drawImage(baseImageElement, 0, 0); ctx.drawImage(baseImageElement, 0, 0);
if (textImageElement.src) { if (textImageElement) {
ctx.drawImage(textImageElement, 0, 0); ctx.drawImage(textImageElement, 0, 0);
} }
if (scale !== 1) { if (scale !== 1) {
@ -120,7 +122,7 @@ const fetchBitmapCanvas_ = function (costume, runtime, rotationCenter) {
canvas: canvas, canvas: canvas,
rotationCenter: rotationCenter, rotationCenter: rotationCenter,
// True if the asset matches the base layer; false if it required adjustment // True if the asset matches the base layer; false if it required adjustment
assetMatchesBase: scale === 1 && !textImageElement.src assetMatchesBase: scale === 1 && !textImageElement
}; };
}) })
.catch(e => Promise.reject(e)) .catch(e => Promise.reject(e))
@ -135,7 +137,7 @@ const loadBitmap_ = function (costume, runtime, rotationCenter) {
return fetchBitmapCanvas_(costume, runtime, rotationCenter).then(fetched => new Promise(resolve => { return fetchBitmapCanvas_(costume, runtime, rotationCenter).then(fetched => new Promise(resolve => {
rotationCenter = fetched.rotationCenter; rotationCenter = fetched.rotationCenter;
const saveAssetToStorage = function (dataURI) { const updateCostumeAsset = function (dataURI) {
if (!runtime.v2BitmapAdapter) { if (!runtime.v2BitmapAdapter) {
return Promise.reject('No V2 Bitmap adapter present.'); return Promise.reject('No V2 Bitmap adapter present.');
} }
@ -153,7 +155,7 @@ const loadBitmap_ = function (costume, runtime, rotationCenter) {
}; };
if (!fetched.assetMatchesBase) { if (!fetched.assetMatchesBase) {
saveAssetToStorage(fetched.canvas.toDataURL()); updateCostumeAsset(fetched.canvas.toDataURL());
} }
resolve(fetched.canvas); resolve(fetched.canvas);
})) }))
@ -183,7 +185,7 @@ const loadBitmap_ = function (costume, runtime, rotationCenter) {
* @property {number} rotationCenterX - the X component of the costume's origin. * @property {number} rotationCenterX - the X component of the costume's origin.
* @property {number} rotationCenterY - the Y component of the costume's origin. * @property {number} rotationCenterY - the Y component of the costume's origin.
* @property {number} [bitmapResolution] - the resolution scale for a bitmap costume. * @property {number} [bitmapResolution] - the resolution scale for a bitmap costume.
* @param {!Asset} costume.asset - the asset of the costume loaded from storage. * @property {!Asset} costume.asset - the asset of the costume loaded from storage.
* @param {!Runtime} runtime - Scratch runtime, used to access the storage module. * @param {!Runtime} runtime - Scratch runtime, used to access the storage module.
* @param {?int} optVersion - Version of Scratch that the costume comes from. If this is set * @param {?int} optVersion - Version of Scratch that the costume comes from. If this is set
* to 2, scratch 3 will perform an upgrade step to handle quirks in SVGs from Scratch 2.0. * to 2, scratch 3 will perform an upgrade step to handle quirks in SVGs from Scratch 2.0.

2
src/serialization/deserialize-assets.js
View file

@ -111,7 +111,7 @@ const deserializeCostume = function (costume, runtime, zip, assetFileName, textL
} }
// textLayerMD5 exists if there is a text layer, which is a png of text from Scratch 1.4 // textLayerMD5 exists if there is a text layer, which is a png of text from Scratch 1.4
// that was opened in Scratch 2.0. In this case, set costume,textLayerAsset. // that was opened in Scratch 2.0. In this case, set costume.textLayerAsset.
let textLayerFilePromise; let textLayerFilePromise;
if (costume.textLayerMD5) { if (costume.textLayerMD5) {
textLayerFileName = textLayerFileName ? textLayerFileName : textLayerFileName = textLayerFileName ? textLayerFileName :