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

Fix review comments

Browse source
This commit is contained in:
DD 2018-05-08 18:30:52 -04:00
parent 928245d5c9
commit b9ce26918d
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -31,11 +31,10 @@ const loadCostumeFromAsset = function (costume, costumeAsset, runtime) {
]; ];
} }
if (costumeAsset.assetType === AssetType.ImageVector) { if (costumeAsset.assetType === AssetType.ImageVector) {
// createSVGSkin does the right thing if rotationCenter isn't provided, so it's okay if it's
// undefined here
let svgString = costumeAsset.decodeText(); let svgString = costumeAsset.decodeText();
// SVG Renderer load fixes "quirks" associated with Scratch 2 projects
// Currently costume.version only exists for scratch 2 costumes
if (costume.version && costume.version === 2) { if (costume.version && costume.version === 2) {
// SVG Renderer load fixes "quirks" associated with Scratch 2 projects
const svgRenderer = new SvgRenderer(); const svgRenderer = new SvgRenderer();
svgRenderer.loadString(svgString); svgRenderer.loadString(svgString);
svgString = svgRenderer.toString(); svgString = svgRenderer.toString();
@ -49,7 +48,11 @@ const loadCostumeFromAsset = function (costume, costumeAsset, runtime) {
(new TextEncoder()).encode(svgString) (new TextEncoder()).encode(svgString)
); );
costume.md5 = `${costume.assetId}.${costume.dataFormat}`; costume.md5 = `${costume.assetId}.${costume.dataFormat}`;
} else {
delete costume.version;
} }
// createSVGSkin does the right thing if rotationCenter isn't provided, so it's okay if it's
// undefined here
costume.skinId = renderer.createSVGSkin(svgString, rotationCenter); costume.skinId = renderer.createSVGSkin(svgString, rotationCenter);
costume.size = renderer.getSkinSize(costume.skinId); costume.size = renderer.getSkinSize(costume.skinId);
// Now we should have a rotationCenter even if we didn't before // Now we should have a rotationCenter even if we didn't before
@ -61,6 +64,8 @@ const loadCostumeFromAsset = function (costume, costumeAsset, runtime) {
return costume; return costume;
} }
// Other image types do not need a compatibility step
delete costume.version;
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const imageElement = new Image(); const imageElement = new Image();