scratchfoundation/scratch-render
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-render.git synced 2025-08-14 07:19:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions3

Keep skin until new one loads

Browse source
This commit is contained in:
Christopher Willis-Ford 2016-05-17 15:24:14 -07:00
parent f30629ebba
commit 06f7d46613
1 changed files with 33 additions and 11 deletions

44
src/Drawable.js
View file

@ -108,6 +108,7 @@ Drawable.prototype.getID = function () {
* @param {string} skin_md5ext The MD5 and file extension of the skin.
*/
Drawable.prototype.setSkin = function (skin_md5ext) {
// TODO: cache Skins instead of loading each time. Ref count them?
// TODO: share Skins across Drawables - see also destroy()
if (this._uniforms.u_texture) {
this._gl.deleteTexture(this._uniforms);
@ -117,18 +118,25 @@ Drawable.prototype.setSkin = function (skin_md5ext) {
'https://cdn.assets.scratch.mit.edu/internalapi/asset/' +
skin_md5ext +
'/get/';
var options = {
auto: true,
src: url
};
var instance = this;
this._uniforms.u_texture =
twgl.createTexture(this._gl, {
auto: true,
src: url
}, function (err, texture, source) {
if (!err) {
instance._dimensions[0] = source.width;
instance._dimensions[1] = source.height;
instance.setTransformDirty();
}
});
var callback = function (err, texture, source) {
if (!err) {
instance._uniforms.u_texture = texture;
instance._setDimensions(source.width, source.height);
}
};
// If we already have a texture, keep it until the new one loads.
if (this._uniforms.u_texture) {
twgl.createTexture(this._gl, options, callback);
}
else {
this._uniforms.u_texture =
twgl.createTexture(this._gl, options, callback);
}
}
else {
this._uniforms.u_texture = null;
@ -181,6 +189,20 @@ Drawable.prototype.setScale = function (scalePercent) {
}
};
/**
* Set the dimensions of this Drawable's skin.
* @param {int} width The width of the new skin.
* @param {int} height The height of the new skin.
* @private
*/
Drawable.prototype._setDimensions = function (width, height) {
if (this._dimensions[0] != width || this._dimensions[1] != height) {
this._dimensions[0] = width;
this._dimensions[1] = height;
this.setTransformDirty();
}
};
/**
* Calculate the transform to use when rendering this Drawable.
* @private