mirror of
https://github.com/photonstorm/phaser
synced 2024-12-02 17:41:06 +00:00
BitmapDatas when used as Game Object textures in WebGL now update themselves properly.
Timer.ms now correctly reports the ms time even if the Timer has been paused (thanks Nambew, fix #624)
This commit is contained in:
parent
0fa54b0b24
commit
21c0be4d02
6 changed files with 14 additions and 5 deletions
|
@ -94,6 +94,8 @@ Bug Fixes
|
||||||
* p2 revolute pivots were wrongly signed (thanks georgiee, fix #621)
|
* p2 revolute pivots were wrongly signed (thanks georgiee, fix #621)
|
||||||
* P2.Body.loadPolygon no longer modifies the Cache array (fix #613)
|
* P2.Body.loadPolygon no longer modifies the Cache array (fix #613)
|
||||||
* The volume given in Sound.play now over-rides that set in Sound.addMarker if specified (fix #623)
|
* The volume given in Sound.play now over-rides that set in Sound.addMarker if specified (fix #623)
|
||||||
|
* BitmapDatas when used as Game Object textures in WebGL now update themselves properly.
|
||||||
|
* Timer.ms now correctly reports the ms time even if the Timer has been paused (thanks Nambew, fix #624)
|
||||||
|
|
||||||
|
|
||||||
Updated
|
Updated
|
||||||
|
|
|
@ -364,7 +364,6 @@ Phaser.BitmapData.prototype = {
|
||||||
*/
|
*/
|
||||||
render: function () {
|
render: function () {
|
||||||
|
|
||||||
console.log('bmd dity');
|
|
||||||
if (this.game.renderType === Phaser.WEBGL && this.dirty)
|
if (this.game.renderType === Phaser.WEBGL && this.dirty)
|
||||||
{
|
{
|
||||||
// Only needed if running in WebGL, otherwise this array will never get cleared down
|
// Only needed if running in WebGL, otherwise this array will never get cleared down
|
||||||
|
|
|
@ -225,7 +225,7 @@ Phaser.Image.prototype.loadTexture = function (key, frame) {
|
||||||
}
|
}
|
||||||
else if (key instanceof Phaser.BitmapData)
|
else if (key instanceof Phaser.BitmapData)
|
||||||
{
|
{
|
||||||
this.key = key.key;
|
this.key = key;
|
||||||
this.setTexture(key.texture);
|
this.setTexture(key.texture);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -354,7 +354,7 @@ Phaser.Sprite.prototype.loadTexture = function (key, frame) {
|
||||||
}
|
}
|
||||||
else if (key instanceof Phaser.BitmapData)
|
else if (key instanceof Phaser.BitmapData)
|
||||||
{
|
{
|
||||||
this.key = key.key;
|
this.key = key;
|
||||||
this.setTexture(key.texture);
|
this.setTexture(key.texture);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -341,7 +341,7 @@ Phaser.TileSprite.prototype.loadTexture = function (key, frame) {
|
||||||
}
|
}
|
||||||
else if (key instanceof Phaser.BitmapData)
|
else if (key instanceof Phaser.BitmapData)
|
||||||
{
|
{
|
||||||
this.key = key.key;
|
this.key = key;
|
||||||
this.setTexture(key.texture);
|
this.setTexture(key.texture);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -85,6 +85,12 @@ Phaser.Timer = function (game, autoDestroy) {
|
||||||
*/
|
*/
|
||||||
this._pauseStarted = 0;
|
this._pauseStarted = 0;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @property {number} _pauseTotal - Total paused time.
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
this._pauseTotal = 0;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @property {number} _now - The current start-time adjusted time.
|
* @property {number} _now - The current start-time adjusted time.
|
||||||
* @private
|
* @private
|
||||||
|
@ -450,6 +456,8 @@ Phaser.Timer.prototype = {
|
||||||
{
|
{
|
||||||
var pauseDuration = this.game.time.now - this._pauseStarted;
|
var pauseDuration = this.game.time.now - this._pauseStarted;
|
||||||
|
|
||||||
|
this._pauseTotal += pauseDuration;
|
||||||
|
|
||||||
for (var i = 0; i < this.events.length; i++)
|
for (var i = 0; i < this.events.length; i++)
|
||||||
{
|
{
|
||||||
this.events[i].tick += pauseDuration;
|
this.events[i].tick += pauseDuration;
|
||||||
|
@ -570,7 +578,7 @@ Object.defineProperty(Phaser.Timer.prototype, "length", {
|
||||||
Object.defineProperty(Phaser.Timer.prototype, "ms", {
|
Object.defineProperty(Phaser.Timer.prototype, "ms", {
|
||||||
|
|
||||||
get: function () {
|
get: function () {
|
||||||
return this._now - this._started;
|
return this._now - this._started - this._pauseTotal;
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in a new issue