scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-25 07:22:33 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Pass a data uri

Browse source
This commit is contained in:
DD 2018-04-27 17:23:30 -04:00
parent b2aa87da77
commit 9f0f2fcd27
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/virtual-machine.js
View file

@ -541,10 +541,10 @@ class VirtualMachine extends EventEmitter {
} }
/** /**
* Get an SVG string from storage. * Get a string representation of the image from storage.
* @param {int} costumeIndex - the index of the costume to be got. * @param {int} costumeIndex - the index of the costume to be got.
* @return {string|HTMLImageElement} the costume's SVG string if it's SVG, * @return {string} the costume's SVG string if it's SVG,
* an HTMLImageElement if it's a PNG, or null if it couldn't be found or decoded. * a dataURI if it's a PNG or JPG, or null if it couldn't be found or decoded.
*/ */
getCostume (costumeIndex) { getCostume (costumeIndex) {
const id = this.editingTarget.getCostumes()[costumeIndex].assetId; const id = this.editingTarget.getCostumes()[costumeIndex].assetId;
@ -554,10 +554,7 @@ class VirtualMachine extends EventEmitter {
return this.runtime.storage.get(id).decodeText(); return this.runtime.storage.get(id).decodeText();
} else if (format === this.runtime.storage.DataFormat.PNG || } else if (format === this.runtime.storage.DataFormat.PNG ||
format === this.runtime.storage.DataFormat.JPG) { format === this.runtime.storage.DataFormat.JPG) {
const data = this.runtime.storage.get(id).encodeDataURI(); return this.runtime.storage.get(id).encodeDataURI('image/png');
const image = new Image();
image.src = data;
return image;
} }
log.error(`Unhandled format: ${this.runtime.storage.get(id).dataFormat}`); log.error(`Unhandled format: ${this.runtime.storage.get(id).dataFormat}`);
return null; return null;
@ -566,7 +563,7 @@ class VirtualMachine extends EventEmitter {
/** /**
* Update a costume with the given bitmap * Update a costume with the given bitmap
* @param {int} costumeIndex - the index of the costume to be updated. * @param {int} costumeIndex - the index of the costume to be updated.
* @param {HTMLCanvasElement} bitmap - new bitmap for the renderer. * @param {ImageData} bitmap - new bitmap for the renderer.
* @param {number} rotationCenterX x of point about which the costume rotates, relative to its upper left corner * @param {number} rotationCenterX x of point about which the costume rotates, relative to its upper left corner
* @param {number} rotationCenterY y of point about which the costume rotates, relative to its upper left corner * @param {number} rotationCenterY y of point about which the costume rotates, relative to its upper left corner
* @param {number} bitmapResolution 1 for bitmaps that have 1 pixel per unit of stage, * @param {number} bitmapResolution 1 for bitmaps that have 1 pixel per unit of stage,
@ -577,20 +574,28 @@ class VirtualMachine extends EventEmitter {
if (costume && this.runtime && this.runtime.renderer) { if (costume && this.runtime && this.runtime.renderer) {
costume.rotationCenterX = rotationCenterX; costume.rotationCenterX = rotationCenterX;
costume.rotationCenterY = rotationCenterY; costume.rotationCenterY = rotationCenterY;
// @todo: updateBitmapSkin does not take ImageData
const canvas = document.createElement('canvas');
canvas.width = bitmap.width;
canvas.height = bitmap.height;
const context = canvas.getContext('2d');
context.putImageData(bitmap, 0, 0);
this.runtime.renderer.updateBitmapSkin( this.runtime.renderer.updateBitmapSkin(
costume.skinId, bitmap, bitmapResolution, [rotationCenterX, rotationCenterY]); costume.skinId, canvas, bitmapResolution, [rotationCenterX, rotationCenterY]);
} }
const storage = this.runtime.storage; const storage = this.runtime.storage;
costume.assetId = storage.builtinHelper.cache( costume.assetId = storage.builtinHelper.cache(
storage.AssetType.ImageBitmap, storage.AssetType.ImageBitmap,
storage.DataFormat.PNG, storage.DataFormat.PNG,
bitmap.getContext('2d').getImageData(0, 0, bitmap.width, bitmap.height).data bitmap.data
); );
costume.dataFormat = storage.DataFormat.PNG; costume.dataFormat = storage.DataFormat.PNG;
costume.bitmapResolution = bitmapResolution; costume.bitmapResolution = bitmapResolution;
costume.size = [bitmap.width, bitmap.height]; // costume.size = [bitmap.width, bitmap.height];
costume.md5 = `${costume.assetId}.${costume.dataFormat}`; // costume.md5 = `${costume.assetId}.${costume.dataFormat}`;
this.emitTargetsUpdate(); this.emitTargetsUpdate();
} }