mirror of
https://github.com/photonstorm/phaser
synced 2024-11-16 09:48:18 +00:00
More Pixi updates.
This commit is contained in:
parent
f4eff6359c
commit
fe9a9fcd63
2 changed files with 32 additions and 29 deletions
|
@ -494,7 +494,7 @@ PIXI.DisplayObjectContainer.prototype._renderCanvas = function(renderSession)
|
||||||
renderSession.maskManager.pushMask(this._mask, renderSession);
|
renderSession.maskManager.pushMask(this._mask, renderSession);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < this.children.length; i++)
|
for (var i = 0; i < this.children.length; i++)
|
||||||
{
|
{
|
||||||
this.children[i]._renderCanvas(renderSession);
|
this.children[i]._renderCanvas(renderSession);
|
||||||
}
|
}
|
||||||
|
|
|
@ -87,10 +87,6 @@ PIXI.Sprite = function(texture)
|
||||||
{
|
{
|
||||||
this.onTextureUpdate();
|
this.onTextureUpdate();
|
||||||
}
|
}
|
||||||
// else
|
|
||||||
// {
|
|
||||||
// this.texture.on( 'update', this.onTextureUpdate.bind(this) );
|
|
||||||
// }
|
|
||||||
|
|
||||||
this.renderable = true;
|
this.renderable = true;
|
||||||
|
|
||||||
|
@ -107,13 +103,16 @@ PIXI.Sprite.prototype.constructor = PIXI.Sprite;
|
||||||
* @type Number
|
* @type Number
|
||||||
*/
|
*/
|
||||||
Object.defineProperty(PIXI.Sprite.prototype, 'width', {
|
Object.defineProperty(PIXI.Sprite.prototype, 'width', {
|
||||||
|
|
||||||
get: function() {
|
get: function() {
|
||||||
return this.scale.x * this.texture.frame.width;
|
return this.scale.x * this.texture.frame.width;
|
||||||
},
|
},
|
||||||
|
|
||||||
set: function(value) {
|
set: function(value) {
|
||||||
this.scale.x = value / this.texture.frame.width;
|
this.scale.x = value / this.texture.frame.width;
|
||||||
this._width = value;
|
this._width = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -123,13 +122,16 @@ Object.defineProperty(PIXI.Sprite.prototype, 'width', {
|
||||||
* @type Number
|
* @type Number
|
||||||
*/
|
*/
|
||||||
Object.defineProperty(PIXI.Sprite.prototype, 'height', {
|
Object.defineProperty(PIXI.Sprite.prototype, 'height', {
|
||||||
|
|
||||||
get: function() {
|
get: function() {
|
||||||
return this.scale.y * this.texture.frame.height;
|
return this.scale.y * this.texture.frame.height;
|
||||||
},
|
},
|
||||||
|
|
||||||
set: function(value) {
|
set: function(value) {
|
||||||
this.scale.y = value / this.texture.frame.height;
|
this.scale.y = value / this.texture.frame.height;
|
||||||
this._height = value;
|
this._height = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -156,8 +158,6 @@ PIXI.Sprite.prototype.onTextureUpdate = function()
|
||||||
// so if _width is 0 then width was not set..
|
// so if _width is 0 then width was not set..
|
||||||
if (this._width) this.scale.x = this._width / this.texture.frame.width;
|
if (this._width) this.scale.x = this._width / this.texture.frame.width;
|
||||||
if (this._height) this.scale.y = this._height / this.texture.frame.height;
|
if (this._height) this.scale.y = this._height / this.texture.frame.height;
|
||||||
|
|
||||||
//this.updateFrame = true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -220,8 +220,6 @@ PIXI.Sprite.prototype.getBounds = function(matrix)
|
||||||
var x4 = a * w1 + c * h0 + tx;
|
var x4 = a * w1 + c * h0 + tx;
|
||||||
var y4 = d * h0 + b * w1 + ty;
|
var y4 = d * h0 + b * w1 + ty;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
minX = x1 < minX ? x1 : minX;
|
minX = x1 < minX ? x1 : minX;
|
||||||
minX = x2 < minX ? x2 : minX;
|
minX = x2 < minX ? x2 : minX;
|
||||||
minX = x3 < minX ? x3 : minX;
|
minX = x3 < minX ? x3 : minX;
|
||||||
|
@ -294,7 +292,7 @@ PIXI.Sprite.prototype._renderWebGL = function(renderSession)
|
||||||
spriteBatch.render(this);
|
spriteBatch.render(this);
|
||||||
|
|
||||||
// now loop through the children and make sure they get rendered
|
// now loop through the children and make sure they get rendered
|
||||||
for(i=0,j=this.children.length; i<j; i++)
|
for (i = 0; i < this.children.length; i++)
|
||||||
{
|
{
|
||||||
this.children[i]._renderWebGL(renderSession);
|
this.children[i]._renderWebGL(renderSession);
|
||||||
}
|
}
|
||||||
|
@ -312,7 +310,7 @@ PIXI.Sprite.prototype._renderWebGL = function(renderSession)
|
||||||
renderSession.spriteBatch.render(this);
|
renderSession.spriteBatch.render(this);
|
||||||
|
|
||||||
// simple render children!
|
// simple render children!
|
||||||
for(i=0,j=this.children.length; i<j; i++)
|
for (i = 0; i < this.children.length; i++)
|
||||||
{
|
{
|
||||||
this.children[i]._renderWebGL(renderSession);
|
this.children[i]._renderWebGL(renderSession);
|
||||||
}
|
}
|
||||||
|
@ -356,9 +354,11 @@ PIXI.Sprite.prototype._renderCanvas = function(renderSession)
|
||||||
renderSession.scaleMode = this.texture.baseTexture.scaleMode;
|
renderSession.scaleMode = this.texture.baseTexture.scaleMode;
|
||||||
renderSession.context[renderSession.smoothProperty] = (renderSession.scaleMode === PIXI.scaleModes.LINEAR);
|
renderSession.context[renderSession.smoothProperty] = (renderSession.scaleMode === PIXI.scaleModes.LINEAR);
|
||||||
}
|
}
|
||||||
|
|
||||||
// If the texture is trimmed we offset by the trim x/y, otherwise we use the frame dimensions
|
// If the texture is trimmed we offset by the trim x/y, otherwise we use the frame dimensions
|
||||||
var dx = (this.texture.trim) ? this.texture.trim.x - this.anchor.x * this.texture.trim.width : this.anchor.x * -this.texture.frame.width;
|
var dx = (this.texture.trim) ? this.texture.trim.x - this.anchor.x * this.texture.trim.width : this.anchor.x * -this.texture.frame.width;
|
||||||
var dy = (this.texture.trim) ? this.texture.trim.y - this.anchor.y * this.texture.trim.height : this.anchor.y * -this.texture.frame.height;
|
var dy = (this.texture.trim) ? this.texture.trim.y - this.anchor.y * this.texture.trim.height : this.anchor.y * -this.texture.frame.height;
|
||||||
|
|
||||||
// Allow for pixel rounding
|
// Allow for pixel rounding
|
||||||
if (renderSession.roundPixels)
|
if (renderSession.roundPixels)
|
||||||
{
|
{
|
||||||
|
@ -418,7 +418,7 @@ PIXI.Sprite.prototype._renderCanvas = function(renderSession)
|
||||||
}
|
}
|
||||||
|
|
||||||
// OVERWRITE
|
// OVERWRITE
|
||||||
for (var i = 0, j = this.children.length; i < j; i++)
|
for (var i = 0; i < this.children.length; i++)
|
||||||
{
|
{
|
||||||
this.children[i]._renderCanvas(renderSession);
|
this.children[i]._renderCanvas(renderSession);
|
||||||
}
|
}
|
||||||
|
@ -444,7 +444,9 @@ PIXI.Sprite.prototype._renderCanvas = function(renderSession)
|
||||||
PIXI.Sprite.fromFrame = function(frameId)
|
PIXI.Sprite.fromFrame = function(frameId)
|
||||||
{
|
{
|
||||||
var texture = PIXI.TextureCache[frameId];
|
var texture = PIXI.TextureCache[frameId];
|
||||||
|
|
||||||
if (!texture) throw new Error('The frameId "' + frameId + '" does not exist in the texture cache' + this);
|
if (!texture) throw new Error('The frameId "' + frameId + '" does not exist in the texture cache' + this);
|
||||||
|
|
||||||
return new PIXI.Sprite(texture);
|
return new PIXI.Sprite(texture);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -461,5 +463,6 @@ PIXI.Sprite.fromFrame = function(frameId)
|
||||||
PIXI.Sprite.fromImage = function(imageId, crossorigin, scaleMode)
|
PIXI.Sprite.fromImage = function(imageId, crossorigin, scaleMode)
|
||||||
{
|
{
|
||||||
var texture = PIXI.Texture.fromImage(imageId, crossorigin, scaleMode);
|
var texture = PIXI.Texture.fromImage(imageId, crossorigin, scaleMode);
|
||||||
|
|
||||||
return new PIXI.Sprite(texture);
|
return new PIXI.Sprite(texture);
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue