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

Update load costume fixes to handle storage resolving null and put all error handling in one place. Could be used in the future to handle bitmap loading issues as well

Browse source
This commit is contained in:
Karishma Chadha 2022-05-02 16:38:56 -04:00
parent deadce3bc6
commit a8618b378f
1 changed files with 39 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -247,6 +247,37 @@ const loadBitmap_ = function (costume, runtime, _rotationCenter) {
}); });
}; };
// Handle all manner of costume errors with a Gray Question Mark (default costume)
// and preserve as much of the original costume data as possible
// Returns a promise of a costume
const handleCostumeLoadError = function (costume, runtime) {
// Keep track of the old assetId until we're done loading the default costume
// const oldAsset = costume.asset; // could be null
const oldAssetId = costume.assetId;
const oldRotationX = costume.rotationCenterX;
const oldRotationY = costume.rotationCenterY;
// Use default asset if original fails to load
costume.assetId = runtime.storage.defaultAssetId.ImageVector;
costume.asset = runtime.storage.get(costume.assetId);
costume.md5 = `${costume.assetId}.${costume.dataFormat}`;
const AssetType = runtime.storage.AssetType;
const defaultCostumePromise = (costume.dataFormat === AssetType.ImageVector.runtimeFormat) ?
loadVector_(costume, runtime) : loadBitmap_(costume, runtime);
return defaultCostumePromise.then(loadedCostume => {
loadedCostume.broken = {};
loadedCostume.broken.assetId = oldAssetId;
loadedCostume.broken.md5 = `${oldAssetId}.${costume.dataFormat}`;
// Should be null if we got here because the costume was missing
loadedCostume.broken.asset = runtime.storage.get(oldAssetId);
loadedCostume.broken.rotationCenterX = oldRotationX;
loadedCostume.broken.rotationCenterY = oldRotationY;
return loadedCostume;
});
};
/** /**
* Initialize a costume from an asset asynchronously. * Initialize a costume from an asset asynchronously.
* Do not call this unless there is a renderer attached. * Do not call this unless there is a renderer attached.
@ -280,30 +311,14 @@ const loadCostumeFromAsset = function (costume, runtime, optVersion) {
return loadVector_(costume, runtime, rotationCenter, optVersion) return loadVector_(costume, runtime, rotationCenter, optVersion)
.catch(error => { .catch(error => {
log.warn(`Error loading vector image: ${error.name}: ${error.message}`); log.warn(`Error loading vector image: ${error.name}: ${error.message}`);
return handleCostumeLoadError(costume, runtime);
// Keep track of the old assetId until we're done loading the default costume
const oldAssetId = costume.assetId;
const oldRotationX = costume.rotationCenterX;
const oldRotationY = costume.rotationCenterY;
// Use default asset if original fails to load
costume.assetId = runtime.storage.defaultAssetId.ImageVector;
costume.asset = runtime.storage.get(costume.assetId);
costume.md5 = `${costume.assetId}.${AssetType.ImageVector.runtimeFormat}`;
return loadVector_(costume, runtime).then(loadedCostume => {
loadedCostume.broken = {};
loadedCostume.broken.assetId = oldAssetId;
loadedCostume.broken.md5 = `${oldAssetId}.${AssetType.ImageVector.runtimeFormat}`;
loadedCostume.broken.asset = runtime.storage.get(oldAssetId);
loadedCostume.broken.rotationCenterX = oldRotationX;
loadedCostume.broken.rotationCenterY = oldRotationY;
return loadedCostume;
});
}); });
} }
return loadBitmap_(costume, runtime, rotationCenter, optVersion); return loadBitmap_(costume, runtime, rotationCenter, optVersion);
}; };
/** /**
* Load a costume's asset into memory asynchronously. * Load a costume's asset into memory asynchronously.
* Do not call this unless there is a renderer attached. * Do not call this unless there is a renderer attached.
@ -344,10 +359,6 @@ const loadCostume = function (md5ext, costume, runtime, optVersion) {
const assetType = (ext === 'svg') ? AssetType.ImageVector : AssetType.ImageBitmap; const assetType = (ext === 'svg') ? AssetType.ImageVector : AssetType.ImageBitmap;
const costumePromise = runtime.storage.load(assetType, md5, ext); const costumePromise = runtime.storage.load(assetType, md5, ext);
if (!costumePromise) {
log.error(`Couldn't fetch costume asset: ${md5ext}`);
return;
}
let textLayerPromise; let textLayerPromise;
if (costume.textLayerMD5) { if (costume.textLayerMD5) {
@ -357,7 +368,12 @@ const loadCostume = function (md5ext, costume, runtime, optVersion) {
} }
return Promise.all([costumePromise, textLayerPromise]).then(assetArray => { return Promise.all([costumePromise, textLayerPromise]).then(assetArray => {
costume.asset = assetArray[0]; if (assetArray[0]) {
costume.asset = assetArray[0];
} else {
return handleCostumeLoadError(costume, runtime);
}
if (assetArray[1]) { if (assetArray[1]) {
costume.textLayerAsset = assetArray[1]; costume.textLayerAsset = assetArray[1];
} }