diff --git a/src/core/Stage.js b/src/core/Stage.js index 8d55472ef..37d41cb94 100644 --- a/src/core/Stage.js +++ b/src/core/Stage.js @@ -46,11 +46,11 @@ Phaser.Stage = function (game) { this.exists = true; /** - * @property {PIXI.Matrix} worldTransform - Current transform of the object based on world (parent) factors + * @property {Phaser.Matrix} worldTransform - Current transform of the object based on world (parent) factors * @private * @readOnly */ - this.worldTransform = new PIXI.Matrix(); + this.worldTransform = new Phaser.Matrix(); /** * @property {Phaser.Stage} stage - The stage reference (the Stage is its own stage) diff --git a/src/gameobjects/components/ScaleMinMax.js b/src/gameobjects/components/ScaleMinMax.js index 5a954177e..5e80c2579 100644 --- a/src/gameobjects/components/ScaleMinMax.js +++ b/src/gameobjects/components/ScaleMinMax.js @@ -50,7 +50,7 @@ Phaser.Component.ScaleMinMax.prototype = { * * @method * @private - * @param {PIXI.Matrix} wt - The updated worldTransform matrix. + * @param {Phaser.Matrix} wt - The updated worldTransform matrix. */ checkTransform: function (wt) { diff --git a/src/geom/Matrix.js b/src/geom/Matrix.js index 10c1f2e60..cdb08ce66 100644 --- a/src/geom/Matrix.js +++ b/src/geom/Matrix.js @@ -385,10 +385,4 @@ Phaser.Matrix.prototype = { }; Phaser.identityMatrix = new Phaser.Matrix(); - Phaser.tempMatrix = new Phaser.Matrix(); - -// Because PIXI uses its own type, we'll replace it with ours to avoid duplicating code or confusion. -PIXI.Matrix = Phaser.Matrix; -PIXI.identityMatrix = Phaser.identityMatrix; - diff --git a/src/pixi/display/DisplayObject.js b/src/pixi/display/DisplayObject.js index 13c004f1b..9669ee846 100644 --- a/src/pixi/display/DisplayObject.js +++ b/src/pixi/display/DisplayObject.js @@ -142,10 +142,10 @@ PIXI.DisplayObject = function () { * that happens this property will contain values based on the previous frame. Be mindful of this if * accessing this property outside of the normal game flow, i.e. from an asynchronous event callback. * - * @property {PIXI.Matrix} worldTransform + * @property {Phaser.Matrix} worldTransform * @readOnly */ - this.worldTransform = new PIXI.Matrix(); + this.worldTransform = new Phaser.Matrix(); /** * The coordinates, in pixels, of this DisplayObject within the world. diff --git a/src/pixi/display/DisplayObjectContainer.js b/src/pixi/display/DisplayObjectContainer.js index f90cdc5b3..8e92db944 100644 --- a/src/pixi/display/DisplayObjectContainer.js +++ b/src/pixi/display/DisplayObjectContainer.js @@ -308,7 +308,7 @@ PIXI.DisplayObjectContainer.prototype.getBounds = function (targetCoordinateSpac { var matrixCache = targetCoordinateSpace.worldTransform; - targetCoordinateSpace.worldTransform = PIXI.identityMatrix; + targetCoordinateSpace.worldTransform = Phaser.identityMatrix; for (i = 0; i < targetCoordinateSpace.children.length; i++) { diff --git a/src/pixi/display/Sprite.js b/src/pixi/display/Sprite.js index bdfb26a99..3d443f89d 100644 --- a/src/pixi/display/Sprite.js +++ b/src/pixi/display/Sprite.js @@ -322,7 +322,7 @@ PIXI.Sprite.prototype.getLocalBounds = function () { var matrixCache = this.worldTransform; - this.worldTransform = PIXI.identityMatrix; + this.worldTransform = Phaser.identityMatrix; for (var i = 0; i < this.children.length; i++) {