Rename variables to be not homonyms

This commit is contained in:
DD Liu 2021-03-16 16:36:14 -04:00
parent a4b6e05f92
commit bb9c318561

View file

@ -4,22 +4,22 @@ const {loadSvgString, serializeSvgToString} = require('scratch-svg-renderer');
const loadVector_ = function (costume, runtime, rotationCenter, optVersion) { const loadVector_ = function (costume, runtime, rotationCenter, optVersion) {
return new Promise(resolve => { return new Promise(resolve => {
let svgString = costume.asset.decodeText(); const svgString = costume.asset.decodeText();
// scratch-svg-renderer fixes syntax that causes loading issues, // scratch-svg-renderer fixes syntax that causes loading issues,
// and if optVersion is 2, fixes "quirks" associated with Scratch 2 SVGs, // and if optVersion is 2, fixes "quirks" associated with Scratch 2 SVGs,
const svgText = serializeSvgToString(loadSvgString(svgString, optVersion === 2/* fromVersion2 */)); const fixedSvgString = serializeSvgToString(loadSvgString(svgString, optVersion === 2/* fromVersion2 */));
// If the string changed, put back into storage // If the string changed, put back into storage
if (svgString !== svgText) { if (svgString !== fixedSvgString) {
const storage = runtime.storage; const storage = runtime.storage;
costume.asset.encodeTextData(svgText, storage.DataFormat.SVG, true); costume.asset.encodeTextData(fixedSvgString, storage.DataFormat.SVG, true);
costume.assetId = costume.asset.assetId; costume.assetId = costume.asset.assetId;
costume.md5 = `${costume.assetId}.${costume.dataFormat}`; costume.md5 = `${costume.assetId}.${costume.dataFormat}`;
} }
// createSVGSkin does the right thing if rotationCenter isn't provided, so it's okay if it's // createSVGSkin does the right thing if rotationCenter isn't provided, so it's okay if it's
// undefined here // undefined here
costume.skinId = runtime.renderer.createSVGSkin(svgString, rotationCenter); costume.skinId = runtime.renderer.createSVGSkin(fixedSvgString, rotationCenter);
costume.size = runtime.renderer.getSkinSize(costume.skinId); costume.size = runtime.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
if (!rotationCenter) { if (!rotationCenter) {