Kalakoi/GDevelop
1
0
Fork 0
mirror of https://github.com/4ian/GDevelop.git synced 2025-10-15 10:19:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix setting initial sprite size and animation in HTML5

Browse Source
This commit is contained in:
Lizard-13
2015-06-06 19:15:25 -03:00
parent 6173af8574
commit 61fe1a2a2d
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
GDJS/Runtime/spriteruntimeobject.js
View File

@@ -201,10 +201,6 @@ gdjs.SpriteRuntimeObject.thisIsARuntimeObjectConstructor = "Sprite"; //Notify gd
* Initialize the extra parameters that could be set for an instance. * Initialize the extra parameters that could be set for an instance.
*/ */
gdjs.SpriteRuntimeObject.prototype.extraInitializationFromInitialInstance = function(initialInstanceData) { gdjs.SpriteRuntimeObject.prototype.extraInitializationFromInitialInstance = function(initialInstanceData) {
if ( initialInstanceData.customSize ) {
this.setWidth(initialInstanceData.width);
this.setHeight(initialInstanceData.height);
}
if ( initialInstanceData.numberProperties ) { if ( initialInstanceData.numberProperties ) {
var that = this; var that = this;
gdjs.iterateOverArray(initialInstanceData.numberProperties, function(extraData) { gdjs.iterateOverArray(initialInstanceData.numberProperties, function(extraData) {
@@ -212,6 +208,10 @@ gdjs.SpriteRuntimeObject.prototype.extraInitializationFromInitialInstance = func
that.setAnimation(extraData.value); that.setAnimation(extraData.value);
}); });
} }
if ( initialInstanceData.customSize ) {
this.setWidth(initialInstanceData.width);
this.setHeight(initialInstanceData.height);
}
}; };
/** /**
@@ -704,12 +704,14 @@ gdjs.SpriteRuntimeObject.prototype.getHeight = function() {
}; };
gdjs.SpriteRuntimeObject.prototype.setWidth = function(newWidth) { gdjs.SpriteRuntimeObject.prototype.setWidth = function(newWidth) {
if ( this._textureDirty ) this._updatePIXITexture();
if ( this._spriteDirty ) this._updatePIXISprite(); if ( this._spriteDirty ) this._updatePIXISprite();
var newScaleX = newWidth/this._sprite.texture.frame.width; var newScaleX = newWidth/this._sprite.texture.frame.width;
this.setScaleX(newScaleX); this.setScaleX(newScaleX);
}; };
gdjs.SpriteRuntimeObject.prototype.setHeight = function(newHeight) { gdjs.SpriteRuntimeObject.prototype.setHeight = function(newHeight) {
if ( this._textureDirty ) this._updatePIXITexture();
if ( this._spriteDirty ) this._updatePIXISprite(); if ( this._spriteDirty ) this._updatePIXISprite();
var newScaleY = newHeight/this._sprite.texture.frame.height; var newScaleY = newHeight/this._sprite.texture.frame.height;
this.setScaleY(newScaleY); this.setScaleY(newScaleY);