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

Merge pull request #1719 from rschamp/hotfix/sprite-upload-from-image

Browse source 
Handle images uploaded as sprites
This commit is contained in:
Karishma Chadha 2018-11-01 18:18:52 -04:00 committed by GitHub
commit d64322a110
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -71,7 +71,19 @@ const deserializeCostume = function (costume, runtime, zip, assetFileName) {
return Promise.resolve(null); return Promise.resolve(null);
} }
if (!zip) { // Zip will not be provided if loading project json from server if (costume.asset) {
// When uploading a sprite from an image file, the asset data will be provided
// @todo Cache the asset data somewhere and pull it out here
return Promise.resolve(storage.createAsset(
costume.asset.assetType,
costume.asset.dataFormat,
new Uint8Array(Object.keys(costume.asset.data).map(key => costume.asset.data[key])),
costume.asset.assetId
));
}
if (!zip) {
// Zip will not be provided if loading project json from server
return Promise.resolve(null); return Promise.resolve(null);
} }

3
src/serialization/sb3.js
View file

@ -823,6 +823,9 @@ const parseScratchObject = function (object, runtime, extensions, zip) {
const costumePromises = (object.costumes || []).map(costumeSource => { const costumePromises = (object.costumes || []).map(costumeSource => {
// @todo: Make sure all the relevant metadata is being pulled out. // @todo: Make sure all the relevant metadata is being pulled out.
const costume = { const costume = {
// costumeSource only has an asset if an image is being uploaded as
// a sprite
asset: costumeSource.asset,
assetId: costumeSource.assetId, assetId: costumeSource.assetId,
skinId: null, skinId: null,
name: costumeSource.name, name: costumeSource.name,