github/scratch-render
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

synchronously store SVGRenderer props used in SVGSkin

Browse Source 
Some APIs need SVGSkin to update some of its values immediately when changing
the SVG. Namely size needs to be synchronously set. However rotation center
doesn't need to be set at that time so we can leave it to update where it
currently is.
This commit is contained in:
Michael "Z" Goddard 2019-09-16 17:22:27 -04:00
parent 2a1d215e50
commit 110371b029
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/SVGSkin.js
View File

@ -116,15 +116,13 @@ class SVGSkin extends Skin {
setSVG (svgData, rotationCenter) { setSVG (svgData, rotationCenter) {
this._svgRenderer.loadString(svgData); this._svgRenderer.loadString(svgData);
// Size must be updated synchronously because the VM sets the costume's `size` immediately after calling this. // Size must be updated synchronously because the VM sets the costume's
// TODO: add either a callback to this function so the costume size can be set after this is done, // `size` immediately after calling this.
// or something in the VM to handle setting the costume size when Skin.Events.WasAltered is emitted.
this.size = this._svgRenderer.size; this.size = this._svgRenderer.size;
if (typeof rotationCenter === 'undefined') rotationCenter = this.calculateRotationCenter();
this._viewOffset = this._svgRenderer.viewOffset; this._viewOffset = this._svgRenderer.viewOffset;
// Reset rawRotationCenter when we update viewOffset. // Reset rawRotationCenter when we update viewOffset. The rotation
// center used to render will be updated later.
this._rawRotationCenter = [NaN, NaN]; this._rawRotationCenter = [NaN, NaN];
this.setRotationCenter(rotationCenter[0], rotationCenter[1]);
this._svgRenderer._draw(1, () => { this._svgRenderer._draw(1, () => {
const gl = this._renderer.gl; const gl = this._renderer.gl;
@ -159,6 +157,9 @@ class SVGSkin extends Skin {
this._maxTextureScale = testScale; this._maxTextureScale = testScale;
} }
if (typeof rotationCenter === 'undefined') rotationCenter = this.calculateRotationCenter();
this.setRotationCenter(rotationCenter[0], rotationCenter[1]);
this.emit(Skin.Events.WasAltered); this.emit(Skin.Events.WasAltered);
}); });
} }