diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js index dd1acbd..23443cf 100644 --- a/bundles/pixi.js/src/deprecated.js +++ b/bundles/pixi.js/src/deprecated.js @@ -657,4 +657,52 @@ return BaseTexture.from(canvas, { scaleMode, resourceOptions }); }; + + /** + * @method PIXI.Point#copy + * @deprecated since 5.0.0 + * @see PIXI.Point#copyFrom + */ + PIXI.Point.prototype.copy = function copy(p) + { + warn('PIXI.Point.copy has been replaced with PIXI.Point#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.ObservablePoint#copy + * @deprecated since 5.0.0 + * @see PIXI.ObservablePoint#copyFrom + */ + PIXI.ObservablePoint.prototype.copy = function copy(p) + { + warn('PIXI.ObservablePoint.copy has been replaced with PIXI.ObservablePoint#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Rectangle#copy + * @deprecated since 5.0.0 + * @see PIXI.Rectangle#copyFrom + */ + PIXI.Rectangle.prototype.copy = function copy(p) + { + warn('PIXI.Rectangle.copy has been replaced with PIXI.Rectangle#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Matrix#copy + * @deprecated since 5.0.0 + * @see PIXI.Matrix#copyTo + */ + PIXI.Matrix.prototype.copy = function copy(p) + { + warn('PIXI.Matrix.copy has been replaced with PIXI.Matrix#copyTo'); + + return this.copyTo(p); + }; } diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js index dd1acbd..23443cf 100644 --- a/bundles/pixi.js/src/deprecated.js +++ b/bundles/pixi.js/src/deprecated.js @@ -657,4 +657,52 @@ return BaseTexture.from(canvas, { scaleMode, resourceOptions }); }; + + /** + * @method PIXI.Point#copy + * @deprecated since 5.0.0 + * @see PIXI.Point#copyFrom + */ + PIXI.Point.prototype.copy = function copy(p) + { + warn('PIXI.Point.copy has been replaced with PIXI.Point#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.ObservablePoint#copy + * @deprecated since 5.0.0 + * @see PIXI.ObservablePoint#copyFrom + */ + PIXI.ObservablePoint.prototype.copy = function copy(p) + { + warn('PIXI.ObservablePoint.copy has been replaced with PIXI.ObservablePoint#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Rectangle#copy + * @deprecated since 5.0.0 + * @see PIXI.Rectangle#copyFrom + */ + PIXI.Rectangle.prototype.copy = function copy(p) + { + warn('PIXI.Rectangle.copy has been replaced with PIXI.Rectangle#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Matrix#copy + * @deprecated since 5.0.0 + * @see PIXI.Matrix#copyTo + */ + PIXI.Matrix.prototype.copy = function copy(p) + { + warn('PIXI.Matrix.copy has been replaced with PIXI.Matrix#copyTo'); + + return this.copyTo(p); + }; } diff --git a/packages/canvas/canvas-graphics/src/Graphics.js b/packages/canvas/canvas-graphics/src/Graphics.js index 57f23bf..7a88896 100644 --- a/packages/canvas/canvas-graphics/src/Graphics.js +++ b/packages/canvas/canvas-graphics/src/Graphics.js @@ -26,7 +26,7 @@ } this.transform.updateLocalTransform(); - this.transform.localTransform.copy(tempMatrix); + this.transform.localTransform.copyTo(tempMatrix); tempMatrix.invert(); diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js index dd1acbd..23443cf 100644 --- a/bundles/pixi.js/src/deprecated.js +++ b/bundles/pixi.js/src/deprecated.js @@ -657,4 +657,52 @@ return BaseTexture.from(canvas, { scaleMode, resourceOptions }); }; + + /** + * @method PIXI.Point#copy + * @deprecated since 5.0.0 + * @see PIXI.Point#copyFrom + */ + PIXI.Point.prototype.copy = function copy(p) + { + warn('PIXI.Point.copy has been replaced with PIXI.Point#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.ObservablePoint#copy + * @deprecated since 5.0.0 + * @see PIXI.ObservablePoint#copyFrom + */ + PIXI.ObservablePoint.prototype.copy = function copy(p) + { + warn('PIXI.ObservablePoint.copy has been replaced with PIXI.ObservablePoint#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Rectangle#copy + * @deprecated since 5.0.0 + * @see PIXI.Rectangle#copyFrom + */ + PIXI.Rectangle.prototype.copy = function copy(p) + { + warn('PIXI.Rectangle.copy has been replaced with PIXI.Rectangle#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Matrix#copy + * @deprecated since 5.0.0 + * @see PIXI.Matrix#copyTo + */ + PIXI.Matrix.prototype.copy = function copy(p) + { + warn('PIXI.Matrix.copy has been replaced with PIXI.Matrix#copyTo'); + + return this.copyTo(p); + }; } diff --git a/packages/canvas/canvas-graphics/src/Graphics.js b/packages/canvas/canvas-graphics/src/Graphics.js index 57f23bf..7a88896 100644 --- a/packages/canvas/canvas-graphics/src/Graphics.js +++ b/packages/canvas/canvas-graphics/src/Graphics.js @@ -26,7 +26,7 @@ } this.transform.updateLocalTransform(); - this.transform.localTransform.copy(tempMatrix); + this.transform.localTransform.copyTo(tempMatrix); tempMatrix.invert(); diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index 95ddb2b..5672d78 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -183,7 +183,7 @@ if (transform) { - transform.copy(tempWt); + transform.copyTo(tempWt); // lets not forget to flag the parent transform as dirty... this._tempDisplayObjectParent.transform._worldID = -1; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js index dd1acbd..23443cf 100644 --- a/bundles/pixi.js/src/deprecated.js +++ b/bundles/pixi.js/src/deprecated.js @@ -657,4 +657,52 @@ return BaseTexture.from(canvas, { scaleMode, resourceOptions }); }; + + /** + * @method PIXI.Point#copy + * @deprecated since 5.0.0 + * @see PIXI.Point#copyFrom + */ + PIXI.Point.prototype.copy = function copy(p) + { + warn('PIXI.Point.copy has been replaced with PIXI.Point#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.ObservablePoint#copy + * @deprecated since 5.0.0 + * @see PIXI.ObservablePoint#copyFrom + */ + PIXI.ObservablePoint.prototype.copy = function copy(p) + { + warn('PIXI.ObservablePoint.copy has been replaced with PIXI.ObservablePoint#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Rectangle#copy + * @deprecated since 5.0.0 + * @see PIXI.Rectangle#copyFrom + */ + PIXI.Rectangle.prototype.copy = function copy(p) + { + warn('PIXI.Rectangle.copy has been replaced with PIXI.Rectangle#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Matrix#copy + * @deprecated since 5.0.0 + * @see PIXI.Matrix#copyTo + */ + PIXI.Matrix.prototype.copy = function copy(p) + { + warn('PIXI.Matrix.copy has been replaced with PIXI.Matrix#copyTo'); + + return this.copyTo(p); + }; } diff --git a/packages/canvas/canvas-graphics/src/Graphics.js b/packages/canvas/canvas-graphics/src/Graphics.js index 57f23bf..7a88896 100644 --- a/packages/canvas/canvas-graphics/src/Graphics.js +++ b/packages/canvas/canvas-graphics/src/Graphics.js @@ -26,7 +26,7 @@ } this.transform.updateLocalTransform(); - this.transform.localTransform.copy(tempMatrix); + this.transform.localTransform.copyTo(tempMatrix); tempMatrix.invert(); diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index 95ddb2b..5672d78 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -183,7 +183,7 @@ if (transform) { - transform.copy(tempWt); + transform.copyTo(tempWt); // lets not forget to flag the parent transform as dirty... this._tempDisplayObjectParent.transform._worldID = -1; diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index 476f562..04a4e91 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -85,7 +85,7 @@ if (texture.rotate) { - wt.copy(canvasRenderWorldTransform); + wt.copyTo(canvasRenderWorldTransform); wt = canvasRenderWorldTransform; GroupD8.matrixAppendRotationInv(wt, texture.rotate, dx, dy); // the anchor has already been applied above, so lets set it to zero diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js index dd1acbd..23443cf 100644 --- a/bundles/pixi.js/src/deprecated.js +++ b/bundles/pixi.js/src/deprecated.js @@ -657,4 +657,52 @@ return BaseTexture.from(canvas, { scaleMode, resourceOptions }); }; + + /** + * @method PIXI.Point#copy + * @deprecated since 5.0.0 + * @see PIXI.Point#copyFrom + */ + PIXI.Point.prototype.copy = function copy(p) + { + warn('PIXI.Point.copy has been replaced with PIXI.Point#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.ObservablePoint#copy + * @deprecated since 5.0.0 + * @see PIXI.ObservablePoint#copyFrom + */ + PIXI.ObservablePoint.prototype.copy = function copy(p) + { + warn('PIXI.ObservablePoint.copy has been replaced with PIXI.ObservablePoint#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Rectangle#copy + * @deprecated since 5.0.0 + * @see PIXI.Rectangle#copyFrom + */ + PIXI.Rectangle.prototype.copy = function copy(p) + { + warn('PIXI.Rectangle.copy has been replaced with PIXI.Rectangle#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Matrix#copy + * @deprecated since 5.0.0 + * @see PIXI.Matrix#copyTo + */ + PIXI.Matrix.prototype.copy = function copy(p) + { + warn('PIXI.Matrix.copy has been replaced with PIXI.Matrix#copyTo'); + + return this.copyTo(p); + }; } diff --git a/packages/canvas/canvas-graphics/src/Graphics.js b/packages/canvas/canvas-graphics/src/Graphics.js index 57f23bf..7a88896 100644 --- a/packages/canvas/canvas-graphics/src/Graphics.js +++ b/packages/canvas/canvas-graphics/src/Graphics.js @@ -26,7 +26,7 @@ } this.transform.updateLocalTransform(); - this.transform.localTransform.copy(tempMatrix); + this.transform.localTransform.copyTo(tempMatrix); tempMatrix.invert(); diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index 95ddb2b..5672d78 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -183,7 +183,7 @@ if (transform) { - transform.copy(tempWt); + transform.copyTo(tempWt); // lets not forget to flag the parent transform as dirty... this._tempDisplayObjectParent.transform._worldID = -1; diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index 476f562..04a4e91 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -85,7 +85,7 @@ if (texture.rotate) { - wt.copy(canvasRenderWorldTransform); + wt.copyTo(canvasRenderWorldTransform); wt = canvasRenderWorldTransform; GroupD8.matrixAppendRotationInv(wt, texture.rotate, dx, dy); // the anchor has already been applied above, so lets set it to zero diff --git a/packages/core/src/renderers/filters/filterTransforms.js b/packages/core/src/renderers/filters/filterTransforms.js index 8932bae..87a3cd6 100644 --- a/packages/core/src/renderers/filters/filterTransforms.js +++ b/packages/core/src/renderers/filters/filterTransforms.js @@ -7,13 +7,9 @@ * @param outputMatrix {Matrix} @alvin * @private */ -// TODO playing around here.. this is temporary - (will end up in the shader) // this returns a matrix that will normalise map filter cords in the filter to screen space export function calculateScreenSpaceMatrix(outputMatrix, filterArea, textureSize) { - // let worldTransform = sprite.worldTransform.copy(Matrix.TEMP_MATRIX), - // let texture = {width:1136, height:700};//sprite._texture.baseTexture; - // TODO unwrap? const mappedMatrix = outputMatrix.identity(); @@ -43,7 +39,7 @@ { const orig = sprite._texture.orig; const mappedMatrix = outputMatrix.set(textureSize.width, 0, 0, textureSize.height, filterArea.x, filterArea.y); - const worldTransform = sprite.worldTransform.copy(Matrix.TEMP_MATRIX); + const worldTransform = sprite.worldTransform.copyTo(Matrix.TEMP_MATRIX); worldTransform.invert(); mappedMatrix.prepend(worldTransform); diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js index dd1acbd..23443cf 100644 --- a/bundles/pixi.js/src/deprecated.js +++ b/bundles/pixi.js/src/deprecated.js @@ -657,4 +657,52 @@ return BaseTexture.from(canvas, { scaleMode, resourceOptions }); }; + + /** + * @method PIXI.Point#copy + * @deprecated since 5.0.0 + * @see PIXI.Point#copyFrom + */ + PIXI.Point.prototype.copy = function copy(p) + { + warn('PIXI.Point.copy has been replaced with PIXI.Point#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.ObservablePoint#copy + * @deprecated since 5.0.0 + * @see PIXI.ObservablePoint#copyFrom + */ + PIXI.ObservablePoint.prototype.copy = function copy(p) + { + warn('PIXI.ObservablePoint.copy has been replaced with PIXI.ObservablePoint#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Rectangle#copy + * @deprecated since 5.0.0 + * @see PIXI.Rectangle#copyFrom + */ + PIXI.Rectangle.prototype.copy = function copy(p) + { + warn('PIXI.Rectangle.copy has been replaced with PIXI.Rectangle#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Matrix#copy + * @deprecated since 5.0.0 + * @see PIXI.Matrix#copyTo + */ + PIXI.Matrix.prototype.copy = function copy(p) + { + warn('PIXI.Matrix.copy has been replaced with PIXI.Matrix#copyTo'); + + return this.copyTo(p); + }; } diff --git a/packages/canvas/canvas-graphics/src/Graphics.js b/packages/canvas/canvas-graphics/src/Graphics.js index 57f23bf..7a88896 100644 --- a/packages/canvas/canvas-graphics/src/Graphics.js +++ b/packages/canvas/canvas-graphics/src/Graphics.js @@ -26,7 +26,7 @@ } this.transform.updateLocalTransform(); - this.transform.localTransform.copy(tempMatrix); + this.transform.localTransform.copyTo(tempMatrix); tempMatrix.invert(); diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index 95ddb2b..5672d78 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -183,7 +183,7 @@ if (transform) { - transform.copy(tempWt); + transform.copyTo(tempWt); // lets not forget to flag the parent transform as dirty... this._tempDisplayObjectParent.transform._worldID = -1; diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index 476f562..04a4e91 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -85,7 +85,7 @@ if (texture.rotate) { - wt.copy(canvasRenderWorldTransform); + wt.copyTo(canvasRenderWorldTransform); wt = canvasRenderWorldTransform; GroupD8.matrixAppendRotationInv(wt, texture.rotate, dx, dy); // the anchor has already been applied above, so lets set it to zero diff --git a/packages/core/src/renderers/filters/filterTransforms.js b/packages/core/src/renderers/filters/filterTransforms.js index 8932bae..87a3cd6 100644 --- a/packages/core/src/renderers/filters/filterTransforms.js +++ b/packages/core/src/renderers/filters/filterTransforms.js @@ -7,13 +7,9 @@ * @param outputMatrix {Matrix} @alvin * @private */ -// TODO playing around here.. this is temporary - (will end up in the shader) // this returns a matrix that will normalise map filter cords in the filter to screen space export function calculateScreenSpaceMatrix(outputMatrix, filterArea, textureSize) { - // let worldTransform = sprite.worldTransform.copy(Matrix.TEMP_MATRIX), - // let texture = {width:1136, height:700};//sprite._texture.baseTexture; - // TODO unwrap? const mappedMatrix = outputMatrix.identity(); @@ -43,7 +39,7 @@ { const orig = sprite._texture.orig; const mappedMatrix = outputMatrix.set(textureSize.width, 0, 0, textureSize.height, filterArea.x, filterArea.y); - const worldTransform = sprite.worldTransform.copy(Matrix.TEMP_MATRIX); + const worldTransform = sprite.worldTransform.copyTo(Matrix.TEMP_MATRIX); worldTransform.invert(); mappedMatrix.prepend(worldTransform); diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index cbd35d4..087a8cb 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -480,7 +480,7 @@ set position(value) // eslint-disable-line require-jsdoc { - this.transform.position.copy(value); + this.transform.position.copyFrom(value); } /** @@ -496,7 +496,7 @@ set scale(value) // eslint-disable-line require-jsdoc { - this.transform.scale.copy(value); + this.transform.scale.copyFrom(value); } /** @@ -512,7 +512,7 @@ set pivot(value) // eslint-disable-line require-jsdoc { - this.transform.pivot.copy(value); + this.transform.pivot.copyFrom(value); } /** @@ -528,7 +528,7 @@ set skew(value) // eslint-disable-line require-jsdoc { - this.transform.skew.copy(value); + this.transform.skew.copyFrom(value); } /** diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js index dd1acbd..23443cf 100644 --- a/bundles/pixi.js/src/deprecated.js +++ b/bundles/pixi.js/src/deprecated.js @@ -657,4 +657,52 @@ return BaseTexture.from(canvas, { scaleMode, resourceOptions }); }; + + /** + * @method PIXI.Point#copy + * @deprecated since 5.0.0 + * @see PIXI.Point#copyFrom + */ + PIXI.Point.prototype.copy = function copy(p) + { + warn('PIXI.Point.copy has been replaced with PIXI.Point#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.ObservablePoint#copy + * @deprecated since 5.0.0 + * @see PIXI.ObservablePoint#copyFrom + */ + PIXI.ObservablePoint.prototype.copy = function copy(p) + { + warn('PIXI.ObservablePoint.copy has been replaced with PIXI.ObservablePoint#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Rectangle#copy + * @deprecated since 5.0.0 + * @see PIXI.Rectangle#copyFrom + */ + PIXI.Rectangle.prototype.copy = function copy(p) + { + warn('PIXI.Rectangle.copy has been replaced with PIXI.Rectangle#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Matrix#copy + * @deprecated since 5.0.0 + * @see PIXI.Matrix#copyTo + */ + PIXI.Matrix.prototype.copy = function copy(p) + { + warn('PIXI.Matrix.copy has been replaced with PIXI.Matrix#copyTo'); + + return this.copyTo(p); + }; } diff --git a/packages/canvas/canvas-graphics/src/Graphics.js b/packages/canvas/canvas-graphics/src/Graphics.js index 57f23bf..7a88896 100644 --- a/packages/canvas/canvas-graphics/src/Graphics.js +++ b/packages/canvas/canvas-graphics/src/Graphics.js @@ -26,7 +26,7 @@ } this.transform.updateLocalTransform(); - this.transform.localTransform.copy(tempMatrix); + this.transform.localTransform.copyTo(tempMatrix); tempMatrix.invert(); diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index 95ddb2b..5672d78 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -183,7 +183,7 @@ if (transform) { - transform.copy(tempWt); + transform.copyTo(tempWt); // lets not forget to flag the parent transform as dirty... this._tempDisplayObjectParent.transform._worldID = -1; diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index 476f562..04a4e91 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -85,7 +85,7 @@ if (texture.rotate) { - wt.copy(canvasRenderWorldTransform); + wt.copyTo(canvasRenderWorldTransform); wt = canvasRenderWorldTransform; GroupD8.matrixAppendRotationInv(wt, texture.rotate, dx, dy); // the anchor has already been applied above, so lets set it to zero diff --git a/packages/core/src/renderers/filters/filterTransforms.js b/packages/core/src/renderers/filters/filterTransforms.js index 8932bae..87a3cd6 100644 --- a/packages/core/src/renderers/filters/filterTransforms.js +++ b/packages/core/src/renderers/filters/filterTransforms.js @@ -7,13 +7,9 @@ * @param outputMatrix {Matrix} @alvin * @private */ -// TODO playing around here.. this is temporary - (will end up in the shader) // this returns a matrix that will normalise map filter cords in the filter to screen space export function calculateScreenSpaceMatrix(outputMatrix, filterArea, textureSize) { - // let worldTransform = sprite.worldTransform.copy(Matrix.TEMP_MATRIX), - // let texture = {width:1136, height:700};//sprite._texture.baseTexture; - // TODO unwrap? const mappedMatrix = outputMatrix.identity(); @@ -43,7 +39,7 @@ { const orig = sprite._texture.orig; const mappedMatrix = outputMatrix.set(textureSize.width, 0, 0, textureSize.height, filterArea.x, filterArea.y); - const worldTransform = sprite.worldTransform.copy(Matrix.TEMP_MATRIX); + const worldTransform = sprite.worldTransform.copyTo(Matrix.TEMP_MATRIX); worldTransform.invert(); mappedMatrix.prepend(worldTransform); diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index cbd35d4..087a8cb 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -480,7 +480,7 @@ set position(value) // eslint-disable-line require-jsdoc { - this.transform.position.copy(value); + this.transform.position.copyFrom(value); } /** @@ -496,7 +496,7 @@ set scale(value) // eslint-disable-line require-jsdoc { - this.transform.scale.copy(value); + this.transform.scale.copyFrom(value); } /** @@ -512,7 +512,7 @@ set pivot(value) // eslint-disable-line require-jsdoc { - this.transform.pivot.copy(value); + this.transform.pivot.copyFrom(value); } /** @@ -528,7 +528,7 @@ set skew(value) // eslint-disable-line require-jsdoc { - this.transform.skew.copy(value); + this.transform.skew.copyFrom(value); } /** diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 8c32e1a..ec14a67 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -454,10 +454,10 @@ /** * Changes the values of the given matrix to be the same as the ones in this matrix * - * @param {PIXI.Matrix} matrix - The matrix to copy from. + * @param {PIXI.Matrix} matrix - The matrix to copy to. * @return {PIXI.Matrix} The matrix given in parameter with its values updated. */ - copy(matrix) + copyTo(matrix) { matrix.a = this.a; matrix.b = this.b; @@ -470,6 +470,24 @@ } /** + * Changes the values of the matrix to be the same as the ones in given matrix + * + * @param {PIXI.Matrix} matrix - The matrix to copy from. + * @return {PIXI.Matrix} this + */ + copyFrom(matrix) + { + this.a = matrix.a; + this.b = matrix.b; + this.c = matrix.c; + this.d = matrix.d; + this.tx = matrix.tx; + this.ty = matrix.ty; + + return this; + } + + /** * A default (identity) matrix * * @static diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js index dd1acbd..23443cf 100644 --- a/bundles/pixi.js/src/deprecated.js +++ b/bundles/pixi.js/src/deprecated.js @@ -657,4 +657,52 @@ return BaseTexture.from(canvas, { scaleMode, resourceOptions }); }; + + /** + * @method PIXI.Point#copy + * @deprecated since 5.0.0 + * @see PIXI.Point#copyFrom + */ + PIXI.Point.prototype.copy = function copy(p) + { + warn('PIXI.Point.copy has been replaced with PIXI.Point#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.ObservablePoint#copy + * @deprecated since 5.0.0 + * @see PIXI.ObservablePoint#copyFrom + */ + PIXI.ObservablePoint.prototype.copy = function copy(p) + { + warn('PIXI.ObservablePoint.copy has been replaced with PIXI.ObservablePoint#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Rectangle#copy + * @deprecated since 5.0.0 + * @see PIXI.Rectangle#copyFrom + */ + PIXI.Rectangle.prototype.copy = function copy(p) + { + warn('PIXI.Rectangle.copy has been replaced with PIXI.Rectangle#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Matrix#copy + * @deprecated since 5.0.0 + * @see PIXI.Matrix#copyTo + */ + PIXI.Matrix.prototype.copy = function copy(p) + { + warn('PIXI.Matrix.copy has been replaced with PIXI.Matrix#copyTo'); + + return this.copyTo(p); + }; } diff --git a/packages/canvas/canvas-graphics/src/Graphics.js b/packages/canvas/canvas-graphics/src/Graphics.js index 57f23bf..7a88896 100644 --- a/packages/canvas/canvas-graphics/src/Graphics.js +++ b/packages/canvas/canvas-graphics/src/Graphics.js @@ -26,7 +26,7 @@ } this.transform.updateLocalTransform(); - this.transform.localTransform.copy(tempMatrix); + this.transform.localTransform.copyTo(tempMatrix); tempMatrix.invert(); diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index 95ddb2b..5672d78 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -183,7 +183,7 @@ if (transform) { - transform.copy(tempWt); + transform.copyTo(tempWt); // lets not forget to flag the parent transform as dirty... this._tempDisplayObjectParent.transform._worldID = -1; diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index 476f562..04a4e91 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -85,7 +85,7 @@ if (texture.rotate) { - wt.copy(canvasRenderWorldTransform); + wt.copyTo(canvasRenderWorldTransform); wt = canvasRenderWorldTransform; GroupD8.matrixAppendRotationInv(wt, texture.rotate, dx, dy); // the anchor has already been applied above, so lets set it to zero diff --git a/packages/core/src/renderers/filters/filterTransforms.js b/packages/core/src/renderers/filters/filterTransforms.js index 8932bae..87a3cd6 100644 --- a/packages/core/src/renderers/filters/filterTransforms.js +++ b/packages/core/src/renderers/filters/filterTransforms.js @@ -7,13 +7,9 @@ * @param outputMatrix {Matrix} @alvin * @private */ -// TODO playing around here.. this is temporary - (will end up in the shader) // this returns a matrix that will normalise map filter cords in the filter to screen space export function calculateScreenSpaceMatrix(outputMatrix, filterArea, textureSize) { - // let worldTransform = sprite.worldTransform.copy(Matrix.TEMP_MATRIX), - // let texture = {width:1136, height:700};//sprite._texture.baseTexture; - // TODO unwrap? const mappedMatrix = outputMatrix.identity(); @@ -43,7 +39,7 @@ { const orig = sprite._texture.orig; const mappedMatrix = outputMatrix.set(textureSize.width, 0, 0, textureSize.height, filterArea.x, filterArea.y); - const worldTransform = sprite.worldTransform.copy(Matrix.TEMP_MATRIX); + const worldTransform = sprite.worldTransform.copyTo(Matrix.TEMP_MATRIX); worldTransform.invert(); mappedMatrix.prepend(worldTransform); diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index cbd35d4..087a8cb 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -480,7 +480,7 @@ set position(value) // eslint-disable-line require-jsdoc { - this.transform.position.copy(value); + this.transform.position.copyFrom(value); } /** @@ -496,7 +496,7 @@ set scale(value) // eslint-disable-line require-jsdoc { - this.transform.scale.copy(value); + this.transform.scale.copyFrom(value); } /** @@ -512,7 +512,7 @@ set pivot(value) // eslint-disable-line require-jsdoc { - this.transform.pivot.copy(value); + this.transform.pivot.copyFrom(value); } /** @@ -528,7 +528,7 @@ set skew(value) // eslint-disable-line require-jsdoc { - this.transform.skew.copy(value); + this.transform.skew.copyFrom(value); } /** diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 8c32e1a..ec14a67 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -454,10 +454,10 @@ /** * Changes the values of the given matrix to be the same as the ones in this matrix * - * @param {PIXI.Matrix} matrix - The matrix to copy from. + * @param {PIXI.Matrix} matrix - The matrix to copy to. * @return {PIXI.Matrix} The matrix given in parameter with its values updated. */ - copy(matrix) + copyTo(matrix) { matrix.a = this.a; matrix.b = this.b; @@ -470,6 +470,24 @@ } /** + * Changes the values of the matrix to be the same as the ones in given matrix + * + * @param {PIXI.Matrix} matrix - The matrix to copy from. + * @return {PIXI.Matrix} this + */ + copyFrom(matrix) + { + this.a = matrix.a; + this.b = matrix.b; + this.c = matrix.c; + this.d = matrix.d; + this.tx = matrix.tx; + this.ty = matrix.ty; + + return this; + } + + /** * A default (identity) matrix * * @static diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index fd5622d..c772ae7 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -44,18 +44,34 @@ } /** - * Copies the data from another point + * Copies x and y from the given point * - * @param {PIXI.Point|PIXI.ObservablePoint} point - point to copy from + * @param {PIXI.Point} p - The point to copy from. + * @returns Returns itself. */ - copy(point) + copyFrom(p) { - if (this._x !== point.x || this._y !== point.y) + if (this._x !== p.x || this._y !== p.y) { - this._x = point.x; - this._y = point.y; + this._x = p.x; + this._y = p.y; this.cb.call(this.scope); } + + return this; + } + + /** + * Copies x and y into the given point + * + * @param {PIXI.Point} p - The point to copy. + * @returns Given point with values updated + */ + copyTo(p) + { + p.set(this._x, this._y); + + return p; } /** diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js index dd1acbd..23443cf 100644 --- a/bundles/pixi.js/src/deprecated.js +++ b/bundles/pixi.js/src/deprecated.js @@ -657,4 +657,52 @@ return BaseTexture.from(canvas, { scaleMode, resourceOptions }); }; + + /** + * @method PIXI.Point#copy + * @deprecated since 5.0.0 + * @see PIXI.Point#copyFrom + */ + PIXI.Point.prototype.copy = function copy(p) + { + warn('PIXI.Point.copy has been replaced with PIXI.Point#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.ObservablePoint#copy + * @deprecated since 5.0.0 + * @see PIXI.ObservablePoint#copyFrom + */ + PIXI.ObservablePoint.prototype.copy = function copy(p) + { + warn('PIXI.ObservablePoint.copy has been replaced with PIXI.ObservablePoint#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Rectangle#copy + * @deprecated since 5.0.0 + * @see PIXI.Rectangle#copyFrom + */ + PIXI.Rectangle.prototype.copy = function copy(p) + { + warn('PIXI.Rectangle.copy has been replaced with PIXI.Rectangle#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Matrix#copy + * @deprecated since 5.0.0 + * @see PIXI.Matrix#copyTo + */ + PIXI.Matrix.prototype.copy = function copy(p) + { + warn('PIXI.Matrix.copy has been replaced with PIXI.Matrix#copyTo'); + + return this.copyTo(p); + }; } diff --git a/packages/canvas/canvas-graphics/src/Graphics.js b/packages/canvas/canvas-graphics/src/Graphics.js index 57f23bf..7a88896 100644 --- a/packages/canvas/canvas-graphics/src/Graphics.js +++ b/packages/canvas/canvas-graphics/src/Graphics.js @@ -26,7 +26,7 @@ } this.transform.updateLocalTransform(); - this.transform.localTransform.copy(tempMatrix); + this.transform.localTransform.copyTo(tempMatrix); tempMatrix.invert(); diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index 95ddb2b..5672d78 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -183,7 +183,7 @@ if (transform) { - transform.copy(tempWt); + transform.copyTo(tempWt); // lets not forget to flag the parent transform as dirty... this._tempDisplayObjectParent.transform._worldID = -1; diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index 476f562..04a4e91 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -85,7 +85,7 @@ if (texture.rotate) { - wt.copy(canvasRenderWorldTransform); + wt.copyTo(canvasRenderWorldTransform); wt = canvasRenderWorldTransform; GroupD8.matrixAppendRotationInv(wt, texture.rotate, dx, dy); // the anchor has already been applied above, so lets set it to zero diff --git a/packages/core/src/renderers/filters/filterTransforms.js b/packages/core/src/renderers/filters/filterTransforms.js index 8932bae..87a3cd6 100644 --- a/packages/core/src/renderers/filters/filterTransforms.js +++ b/packages/core/src/renderers/filters/filterTransforms.js @@ -7,13 +7,9 @@ * @param outputMatrix {Matrix} @alvin * @private */ -// TODO playing around here.. this is temporary - (will end up in the shader) // this returns a matrix that will normalise map filter cords in the filter to screen space export function calculateScreenSpaceMatrix(outputMatrix, filterArea, textureSize) { - // let worldTransform = sprite.worldTransform.copy(Matrix.TEMP_MATRIX), - // let texture = {width:1136, height:700};//sprite._texture.baseTexture; - // TODO unwrap? const mappedMatrix = outputMatrix.identity(); @@ -43,7 +39,7 @@ { const orig = sprite._texture.orig; const mappedMatrix = outputMatrix.set(textureSize.width, 0, 0, textureSize.height, filterArea.x, filterArea.y); - const worldTransform = sprite.worldTransform.copy(Matrix.TEMP_MATRIX); + const worldTransform = sprite.worldTransform.copyTo(Matrix.TEMP_MATRIX); worldTransform.invert(); mappedMatrix.prepend(worldTransform); diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index cbd35d4..087a8cb 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -480,7 +480,7 @@ set position(value) // eslint-disable-line require-jsdoc { - this.transform.position.copy(value); + this.transform.position.copyFrom(value); } /** @@ -496,7 +496,7 @@ set scale(value) // eslint-disable-line require-jsdoc { - this.transform.scale.copy(value); + this.transform.scale.copyFrom(value); } /** @@ -512,7 +512,7 @@ set pivot(value) // eslint-disable-line require-jsdoc { - this.transform.pivot.copy(value); + this.transform.pivot.copyFrom(value); } /** @@ -528,7 +528,7 @@ set skew(value) // eslint-disable-line require-jsdoc { - this.transform.skew.copy(value); + this.transform.skew.copyFrom(value); } /** diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 8c32e1a..ec14a67 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -454,10 +454,10 @@ /** * Changes the values of the given matrix to be the same as the ones in this matrix * - * @param {PIXI.Matrix} matrix - The matrix to copy from. + * @param {PIXI.Matrix} matrix - The matrix to copy to. * @return {PIXI.Matrix} The matrix given in parameter with its values updated. */ - copy(matrix) + copyTo(matrix) { matrix.a = this.a; matrix.b = this.b; @@ -470,6 +470,24 @@ } /** + * Changes the values of the matrix to be the same as the ones in given matrix + * + * @param {PIXI.Matrix} matrix - The matrix to copy from. + * @return {PIXI.Matrix} this + */ + copyFrom(matrix) + { + this.a = matrix.a; + this.b = matrix.b; + this.c = matrix.c; + this.d = matrix.d; + this.tx = matrix.tx; + this.ty = matrix.ty; + + return this; + } + + /** * A default (identity) matrix * * @static diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index fd5622d..c772ae7 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -44,18 +44,34 @@ } /** - * Copies the data from another point + * Copies x and y from the given point * - * @param {PIXI.Point|PIXI.ObservablePoint} point - point to copy from + * @param {PIXI.Point} p - The point to copy from. + * @returns Returns itself. */ - copy(point) + copyFrom(p) { - if (this._x !== point.x || this._y !== point.y) + if (this._x !== p.x || this._y !== p.y) { - this._x = point.x; - this._y = point.y; + this._x = p.x; + this._y = p.y; this.cb.call(this.scope); } + + return this; + } + + /** + * Copies x and y into the given point + * + * @param {PIXI.Point} p - The point to copy. + * @returns Given point with values updated + */ + copyTo(p) + { + p.set(this._x, this._y); + + return p; } /** diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index dcf239e..e123f60 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -39,11 +39,27 @@ /** * Copies x and y from the given point * - * @param {PIXI.Point} p - The point to copy. + * @param {PIXI.Point} p - The point to copy from + * @returns Returns itself. */ - copy(p) + copyFrom(p) { this.set(p.x, p.y); + + return this; + } + + /** + * Copies x and y into the given point + * + * @param {PIXI.Point} p - The point to copy. + * @returns Given point with values updated + */ + copyTo(p) + { + p.set(this.x, this.y); + + return p; } /** diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js index dd1acbd..23443cf 100644 --- a/bundles/pixi.js/src/deprecated.js +++ b/bundles/pixi.js/src/deprecated.js @@ -657,4 +657,52 @@ return BaseTexture.from(canvas, { scaleMode, resourceOptions }); }; + + /** + * @method PIXI.Point#copy + * @deprecated since 5.0.0 + * @see PIXI.Point#copyFrom + */ + PIXI.Point.prototype.copy = function copy(p) + { + warn('PIXI.Point.copy has been replaced with PIXI.Point#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.ObservablePoint#copy + * @deprecated since 5.0.0 + * @see PIXI.ObservablePoint#copyFrom + */ + PIXI.ObservablePoint.prototype.copy = function copy(p) + { + warn('PIXI.ObservablePoint.copy has been replaced with PIXI.ObservablePoint#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Rectangle#copy + * @deprecated since 5.0.0 + * @see PIXI.Rectangle#copyFrom + */ + PIXI.Rectangle.prototype.copy = function copy(p) + { + warn('PIXI.Rectangle.copy has been replaced with PIXI.Rectangle#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Matrix#copy + * @deprecated since 5.0.0 + * @see PIXI.Matrix#copyTo + */ + PIXI.Matrix.prototype.copy = function copy(p) + { + warn('PIXI.Matrix.copy has been replaced with PIXI.Matrix#copyTo'); + + return this.copyTo(p); + }; } diff --git a/packages/canvas/canvas-graphics/src/Graphics.js b/packages/canvas/canvas-graphics/src/Graphics.js index 57f23bf..7a88896 100644 --- a/packages/canvas/canvas-graphics/src/Graphics.js +++ b/packages/canvas/canvas-graphics/src/Graphics.js @@ -26,7 +26,7 @@ } this.transform.updateLocalTransform(); - this.transform.localTransform.copy(tempMatrix); + this.transform.localTransform.copyTo(tempMatrix); tempMatrix.invert(); diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index 95ddb2b..5672d78 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -183,7 +183,7 @@ if (transform) { - transform.copy(tempWt); + transform.copyTo(tempWt); // lets not forget to flag the parent transform as dirty... this._tempDisplayObjectParent.transform._worldID = -1; diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index 476f562..04a4e91 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -85,7 +85,7 @@ if (texture.rotate) { - wt.copy(canvasRenderWorldTransform); + wt.copyTo(canvasRenderWorldTransform); wt = canvasRenderWorldTransform; GroupD8.matrixAppendRotationInv(wt, texture.rotate, dx, dy); // the anchor has already been applied above, so lets set it to zero diff --git a/packages/core/src/renderers/filters/filterTransforms.js b/packages/core/src/renderers/filters/filterTransforms.js index 8932bae..87a3cd6 100644 --- a/packages/core/src/renderers/filters/filterTransforms.js +++ b/packages/core/src/renderers/filters/filterTransforms.js @@ -7,13 +7,9 @@ * @param outputMatrix {Matrix} @alvin * @private */ -// TODO playing around here.. this is temporary - (will end up in the shader) // this returns a matrix that will normalise map filter cords in the filter to screen space export function calculateScreenSpaceMatrix(outputMatrix, filterArea, textureSize) { - // let worldTransform = sprite.worldTransform.copy(Matrix.TEMP_MATRIX), - // let texture = {width:1136, height:700};//sprite._texture.baseTexture; - // TODO unwrap? const mappedMatrix = outputMatrix.identity(); @@ -43,7 +39,7 @@ { const orig = sprite._texture.orig; const mappedMatrix = outputMatrix.set(textureSize.width, 0, 0, textureSize.height, filterArea.x, filterArea.y); - const worldTransform = sprite.worldTransform.copy(Matrix.TEMP_MATRIX); + const worldTransform = sprite.worldTransform.copyTo(Matrix.TEMP_MATRIX); worldTransform.invert(); mappedMatrix.prepend(worldTransform); diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index cbd35d4..087a8cb 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -480,7 +480,7 @@ set position(value) // eslint-disable-line require-jsdoc { - this.transform.position.copy(value); + this.transform.position.copyFrom(value); } /** @@ -496,7 +496,7 @@ set scale(value) // eslint-disable-line require-jsdoc { - this.transform.scale.copy(value); + this.transform.scale.copyFrom(value); } /** @@ -512,7 +512,7 @@ set pivot(value) // eslint-disable-line require-jsdoc { - this.transform.pivot.copy(value); + this.transform.pivot.copyFrom(value); } /** @@ -528,7 +528,7 @@ set skew(value) // eslint-disable-line require-jsdoc { - this.transform.skew.copy(value); + this.transform.skew.copyFrom(value); } /** diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 8c32e1a..ec14a67 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -454,10 +454,10 @@ /** * Changes the values of the given matrix to be the same as the ones in this matrix * - * @param {PIXI.Matrix} matrix - The matrix to copy from. + * @param {PIXI.Matrix} matrix - The matrix to copy to. * @return {PIXI.Matrix} The matrix given in parameter with its values updated. */ - copy(matrix) + copyTo(matrix) { matrix.a = this.a; matrix.b = this.b; @@ -470,6 +470,24 @@ } /** + * Changes the values of the matrix to be the same as the ones in given matrix + * + * @param {PIXI.Matrix} matrix - The matrix to copy from. + * @return {PIXI.Matrix} this + */ + copyFrom(matrix) + { + this.a = matrix.a; + this.b = matrix.b; + this.c = matrix.c; + this.d = matrix.d; + this.tx = matrix.tx; + this.ty = matrix.ty; + + return this; + } + + /** * A default (identity) matrix * * @static diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index fd5622d..c772ae7 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -44,18 +44,34 @@ } /** - * Copies the data from another point + * Copies x and y from the given point * - * @param {PIXI.Point|PIXI.ObservablePoint} point - point to copy from + * @param {PIXI.Point} p - The point to copy from. + * @returns Returns itself. */ - copy(point) + copyFrom(p) { - if (this._x !== point.x || this._y !== point.y) + if (this._x !== p.x || this._y !== p.y) { - this._x = point.x; - this._y = point.y; + this._x = p.x; + this._y = p.y; this.cb.call(this.scope); } + + return this; + } + + /** + * Copies x and y into the given point + * + * @param {PIXI.Point} p - The point to copy. + * @returns Given point with values updated + */ + copyTo(p) + { + p.set(this._x, this._y); + + return p; } /** diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index dcf239e..e123f60 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -39,11 +39,27 @@ /** * Copies x and y from the given point * - * @param {PIXI.Point} p - The point to copy. + * @param {PIXI.Point} p - The point to copy from + * @returns Returns itself. */ - copy(p) + copyFrom(p) { this.set(p.x, p.y); + + return this; + } + + /** + * Copies x and y into the given point + * + * @param {PIXI.Point} p - The point to copy. + * @returns Given point with values updated + */ + copyTo(p) + { + p.set(this.x, this.y); + + return p; } /** diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 9176834..7233a23 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -116,10 +116,10 @@ /** * Copies another rectangle to this one. * - * @param {PIXI.Rectangle} rectangle - The rectangle to copy. + * @param {PIXI.Rectangle} rectangle - The rectangle to copy from. * @return {PIXI.Rectangle} Returns itself. */ - copy(rectangle) + copyFrom(rectangle) { this.x = rectangle.x; this.y = rectangle.y; @@ -130,6 +130,22 @@ } /** + * Copies this rectangle to another one. + * + * @param {PIXI.Rectangle} rectangle - The rectangle to copy to. + * @return {PIXI.Rectangle} Returns given parameter. + */ + copyTo(rectangle) + { + rectangle.x = this.x; + rectangle.y = this.y; + rectangle.width = this.width; + rectangle.height = this.height; + + return rectangle; + } + + /** * Checks whether the x and y coordinates given are contained within this Rectangle * * @param {number} x - The X coordinate of the point to test diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js index dd1acbd..23443cf 100644 --- a/bundles/pixi.js/src/deprecated.js +++ b/bundles/pixi.js/src/deprecated.js @@ -657,4 +657,52 @@ return BaseTexture.from(canvas, { scaleMode, resourceOptions }); }; + + /** + * @method PIXI.Point#copy + * @deprecated since 5.0.0 + * @see PIXI.Point#copyFrom + */ + PIXI.Point.prototype.copy = function copy(p) + { + warn('PIXI.Point.copy has been replaced with PIXI.Point#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.ObservablePoint#copy + * @deprecated since 5.0.0 + * @see PIXI.ObservablePoint#copyFrom + */ + PIXI.ObservablePoint.prototype.copy = function copy(p) + { + warn('PIXI.ObservablePoint.copy has been replaced with PIXI.ObservablePoint#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Rectangle#copy + * @deprecated since 5.0.0 + * @see PIXI.Rectangle#copyFrom + */ + PIXI.Rectangle.prototype.copy = function copy(p) + { + warn('PIXI.Rectangle.copy has been replaced with PIXI.Rectangle#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Matrix#copy + * @deprecated since 5.0.0 + * @see PIXI.Matrix#copyTo + */ + PIXI.Matrix.prototype.copy = function copy(p) + { + warn('PIXI.Matrix.copy has been replaced with PIXI.Matrix#copyTo'); + + return this.copyTo(p); + }; } diff --git a/packages/canvas/canvas-graphics/src/Graphics.js b/packages/canvas/canvas-graphics/src/Graphics.js index 57f23bf..7a88896 100644 --- a/packages/canvas/canvas-graphics/src/Graphics.js +++ b/packages/canvas/canvas-graphics/src/Graphics.js @@ -26,7 +26,7 @@ } this.transform.updateLocalTransform(); - this.transform.localTransform.copy(tempMatrix); + this.transform.localTransform.copyTo(tempMatrix); tempMatrix.invert(); diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index 95ddb2b..5672d78 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -183,7 +183,7 @@ if (transform) { - transform.copy(tempWt); + transform.copyTo(tempWt); // lets not forget to flag the parent transform as dirty... this._tempDisplayObjectParent.transform._worldID = -1; diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index 476f562..04a4e91 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -85,7 +85,7 @@ if (texture.rotate) { - wt.copy(canvasRenderWorldTransform); + wt.copyTo(canvasRenderWorldTransform); wt = canvasRenderWorldTransform; GroupD8.matrixAppendRotationInv(wt, texture.rotate, dx, dy); // the anchor has already been applied above, so lets set it to zero diff --git a/packages/core/src/renderers/filters/filterTransforms.js b/packages/core/src/renderers/filters/filterTransforms.js index 8932bae..87a3cd6 100644 --- a/packages/core/src/renderers/filters/filterTransforms.js +++ b/packages/core/src/renderers/filters/filterTransforms.js @@ -7,13 +7,9 @@ * @param outputMatrix {Matrix} @alvin * @private */ -// TODO playing around here.. this is temporary - (will end up in the shader) // this returns a matrix that will normalise map filter cords in the filter to screen space export function calculateScreenSpaceMatrix(outputMatrix, filterArea, textureSize) { - // let worldTransform = sprite.worldTransform.copy(Matrix.TEMP_MATRIX), - // let texture = {width:1136, height:700};//sprite._texture.baseTexture; - // TODO unwrap? const mappedMatrix = outputMatrix.identity(); @@ -43,7 +39,7 @@ { const orig = sprite._texture.orig; const mappedMatrix = outputMatrix.set(textureSize.width, 0, 0, textureSize.height, filterArea.x, filterArea.y); - const worldTransform = sprite.worldTransform.copy(Matrix.TEMP_MATRIX); + const worldTransform = sprite.worldTransform.copyTo(Matrix.TEMP_MATRIX); worldTransform.invert(); mappedMatrix.prepend(worldTransform); diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index cbd35d4..087a8cb 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -480,7 +480,7 @@ set position(value) // eslint-disable-line require-jsdoc { - this.transform.position.copy(value); + this.transform.position.copyFrom(value); } /** @@ -496,7 +496,7 @@ set scale(value) // eslint-disable-line require-jsdoc { - this.transform.scale.copy(value); + this.transform.scale.copyFrom(value); } /** @@ -512,7 +512,7 @@ set pivot(value) // eslint-disable-line require-jsdoc { - this.transform.pivot.copy(value); + this.transform.pivot.copyFrom(value); } /** @@ -528,7 +528,7 @@ set skew(value) // eslint-disable-line require-jsdoc { - this.transform.skew.copy(value); + this.transform.skew.copyFrom(value); } /** diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 8c32e1a..ec14a67 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -454,10 +454,10 @@ /** * Changes the values of the given matrix to be the same as the ones in this matrix * - * @param {PIXI.Matrix} matrix - The matrix to copy from. + * @param {PIXI.Matrix} matrix - The matrix to copy to. * @return {PIXI.Matrix} The matrix given in parameter with its values updated. */ - copy(matrix) + copyTo(matrix) { matrix.a = this.a; matrix.b = this.b; @@ -470,6 +470,24 @@ } /** + * Changes the values of the matrix to be the same as the ones in given matrix + * + * @param {PIXI.Matrix} matrix - The matrix to copy from. + * @return {PIXI.Matrix} this + */ + copyFrom(matrix) + { + this.a = matrix.a; + this.b = matrix.b; + this.c = matrix.c; + this.d = matrix.d; + this.tx = matrix.tx; + this.ty = matrix.ty; + + return this; + } + + /** * A default (identity) matrix * * @static diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index fd5622d..c772ae7 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -44,18 +44,34 @@ } /** - * Copies the data from another point + * Copies x and y from the given point * - * @param {PIXI.Point|PIXI.ObservablePoint} point - point to copy from + * @param {PIXI.Point} p - The point to copy from. + * @returns Returns itself. */ - copy(point) + copyFrom(p) { - if (this._x !== point.x || this._y !== point.y) + if (this._x !== p.x || this._y !== p.y) { - this._x = point.x; - this._y = point.y; + this._x = p.x; + this._y = p.y; this.cb.call(this.scope); } + + return this; + } + + /** + * Copies x and y into the given point + * + * @param {PIXI.Point} p - The point to copy. + * @returns Given point with values updated + */ + copyTo(p) + { + p.set(this._x, this._y); + + return p; } /** diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index dcf239e..e123f60 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -39,11 +39,27 @@ /** * Copies x and y from the given point * - * @param {PIXI.Point} p - The point to copy. + * @param {PIXI.Point} p - The point to copy from + * @returns Returns itself. */ - copy(p) + copyFrom(p) { this.set(p.x, p.y); + + return this; + } + + /** + * Copies x and y into the given point + * + * @param {PIXI.Point} p - The point to copy. + * @returns Given point with values updated + */ + copyTo(p) + { + p.set(this.x, this.y); + + return p; } /** diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 9176834..7233a23 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -116,10 +116,10 @@ /** * Copies another rectangle to this one. * - * @param {PIXI.Rectangle} rectangle - The rectangle to copy. + * @param {PIXI.Rectangle} rectangle - The rectangle to copy from. * @return {PIXI.Rectangle} Returns itself. */ - copy(rectangle) + copyFrom(rectangle) { this.x = rectangle.x; this.y = rectangle.y; @@ -130,6 +130,22 @@ } /** + * Copies this rectangle to another one. + * + * @param {PIXI.Rectangle} rectangle - The rectangle to copy to. + * @return {PIXI.Rectangle} Returns given parameter. + */ + copyTo(rectangle) + { + rectangle.x = this.x; + rectangle.y = this.y; + rectangle.width = this.width; + rectangle.height = this.height; + + return rectangle; + } + + /** * Checks whether the x and y coordinates given are contained within this Rectangle * * @param {number} x - The X coordinate of the point to test diff --git a/packages/math/test/ObservablePoint.js b/packages/math/test/ObservablePoint.js index 0ec97c8..3b2d249 100644 --- a/packages/math/test/ObservablePoint.js +++ b/packages/math/test/ObservablePoint.js @@ -42,11 +42,11 @@ const p2 = new ObservablePoint(cb, this, 5, 2); const p3 = new ObservablePoint(cb, this, 5, 6); - p1.copy(p2); + p1.copyFrom(p2); expect(p1.x).to.equal(p2.x); expect(p1.y).to.equal(p2.y); - p1.copy(p3); + p1.copyFrom(p3); expect(p1.y).to.equal(p3.y); }); }); diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js index dd1acbd..23443cf 100644 --- a/bundles/pixi.js/src/deprecated.js +++ b/bundles/pixi.js/src/deprecated.js @@ -657,4 +657,52 @@ return BaseTexture.from(canvas, { scaleMode, resourceOptions }); }; + + /** + * @method PIXI.Point#copy + * @deprecated since 5.0.0 + * @see PIXI.Point#copyFrom + */ + PIXI.Point.prototype.copy = function copy(p) + { + warn('PIXI.Point.copy has been replaced with PIXI.Point#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.ObservablePoint#copy + * @deprecated since 5.0.0 + * @see PIXI.ObservablePoint#copyFrom + */ + PIXI.ObservablePoint.prototype.copy = function copy(p) + { + warn('PIXI.ObservablePoint.copy has been replaced with PIXI.ObservablePoint#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Rectangle#copy + * @deprecated since 5.0.0 + * @see PIXI.Rectangle#copyFrom + */ + PIXI.Rectangle.prototype.copy = function copy(p) + { + warn('PIXI.Rectangle.copy has been replaced with PIXI.Rectangle#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Matrix#copy + * @deprecated since 5.0.0 + * @see PIXI.Matrix#copyTo + */ + PIXI.Matrix.prototype.copy = function copy(p) + { + warn('PIXI.Matrix.copy has been replaced with PIXI.Matrix#copyTo'); + + return this.copyTo(p); + }; } diff --git a/packages/canvas/canvas-graphics/src/Graphics.js b/packages/canvas/canvas-graphics/src/Graphics.js index 57f23bf..7a88896 100644 --- a/packages/canvas/canvas-graphics/src/Graphics.js +++ b/packages/canvas/canvas-graphics/src/Graphics.js @@ -26,7 +26,7 @@ } this.transform.updateLocalTransform(); - this.transform.localTransform.copy(tempMatrix); + this.transform.localTransform.copyTo(tempMatrix); tempMatrix.invert(); diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index 95ddb2b..5672d78 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -183,7 +183,7 @@ if (transform) { - transform.copy(tempWt); + transform.copyTo(tempWt); // lets not forget to flag the parent transform as dirty... this._tempDisplayObjectParent.transform._worldID = -1; diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index 476f562..04a4e91 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -85,7 +85,7 @@ if (texture.rotate) { - wt.copy(canvasRenderWorldTransform); + wt.copyTo(canvasRenderWorldTransform); wt = canvasRenderWorldTransform; GroupD8.matrixAppendRotationInv(wt, texture.rotate, dx, dy); // the anchor has already been applied above, so lets set it to zero diff --git a/packages/core/src/renderers/filters/filterTransforms.js b/packages/core/src/renderers/filters/filterTransforms.js index 8932bae..87a3cd6 100644 --- a/packages/core/src/renderers/filters/filterTransforms.js +++ b/packages/core/src/renderers/filters/filterTransforms.js @@ -7,13 +7,9 @@ * @param outputMatrix {Matrix} @alvin * @private */ -// TODO playing around here.. this is temporary - (will end up in the shader) // this returns a matrix that will normalise map filter cords in the filter to screen space export function calculateScreenSpaceMatrix(outputMatrix, filterArea, textureSize) { - // let worldTransform = sprite.worldTransform.copy(Matrix.TEMP_MATRIX), - // let texture = {width:1136, height:700};//sprite._texture.baseTexture; - // TODO unwrap? const mappedMatrix = outputMatrix.identity(); @@ -43,7 +39,7 @@ { const orig = sprite._texture.orig; const mappedMatrix = outputMatrix.set(textureSize.width, 0, 0, textureSize.height, filterArea.x, filterArea.y); - const worldTransform = sprite.worldTransform.copy(Matrix.TEMP_MATRIX); + const worldTransform = sprite.worldTransform.copyTo(Matrix.TEMP_MATRIX); worldTransform.invert(); mappedMatrix.prepend(worldTransform); diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index cbd35d4..087a8cb 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -480,7 +480,7 @@ set position(value) // eslint-disable-line require-jsdoc { - this.transform.position.copy(value); + this.transform.position.copyFrom(value); } /** @@ -496,7 +496,7 @@ set scale(value) // eslint-disable-line require-jsdoc { - this.transform.scale.copy(value); + this.transform.scale.copyFrom(value); } /** @@ -512,7 +512,7 @@ set pivot(value) // eslint-disable-line require-jsdoc { - this.transform.pivot.copy(value); + this.transform.pivot.copyFrom(value); } /** @@ -528,7 +528,7 @@ set skew(value) // eslint-disable-line require-jsdoc { - this.transform.skew.copy(value); + this.transform.skew.copyFrom(value); } /** diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 8c32e1a..ec14a67 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -454,10 +454,10 @@ /** * Changes the values of the given matrix to be the same as the ones in this matrix * - * @param {PIXI.Matrix} matrix - The matrix to copy from. + * @param {PIXI.Matrix} matrix - The matrix to copy to. * @return {PIXI.Matrix} The matrix given in parameter with its values updated. */ - copy(matrix) + copyTo(matrix) { matrix.a = this.a; matrix.b = this.b; @@ -470,6 +470,24 @@ } /** + * Changes the values of the matrix to be the same as the ones in given matrix + * + * @param {PIXI.Matrix} matrix - The matrix to copy from. + * @return {PIXI.Matrix} this + */ + copyFrom(matrix) + { + this.a = matrix.a; + this.b = matrix.b; + this.c = matrix.c; + this.d = matrix.d; + this.tx = matrix.tx; + this.ty = matrix.ty; + + return this; + } + + /** * A default (identity) matrix * * @static diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index fd5622d..c772ae7 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -44,18 +44,34 @@ } /** - * Copies the data from another point + * Copies x and y from the given point * - * @param {PIXI.Point|PIXI.ObservablePoint} point - point to copy from + * @param {PIXI.Point} p - The point to copy from. + * @returns Returns itself. */ - copy(point) + copyFrom(p) { - if (this._x !== point.x || this._y !== point.y) + if (this._x !== p.x || this._y !== p.y) { - this._x = point.x; - this._y = point.y; + this._x = p.x; + this._y = p.y; this.cb.call(this.scope); } + + return this; + } + + /** + * Copies x and y into the given point + * + * @param {PIXI.Point} p - The point to copy. + * @returns Given point with values updated + */ + copyTo(p) + { + p.set(this._x, this._y); + + return p; } /** diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index dcf239e..e123f60 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -39,11 +39,27 @@ /** * Copies x and y from the given point * - * @param {PIXI.Point} p - The point to copy. + * @param {PIXI.Point} p - The point to copy from + * @returns Returns itself. */ - copy(p) + copyFrom(p) { this.set(p.x, p.y); + + return this; + } + + /** + * Copies x and y into the given point + * + * @param {PIXI.Point} p - The point to copy. + * @returns Given point with values updated + */ + copyTo(p) + { + p.set(this.x, this.y); + + return p; } /** diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 9176834..7233a23 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -116,10 +116,10 @@ /** * Copies another rectangle to this one. * - * @param {PIXI.Rectangle} rectangle - The rectangle to copy. + * @param {PIXI.Rectangle} rectangle - The rectangle to copy from. * @return {PIXI.Rectangle} Returns itself. */ - copy(rectangle) + copyFrom(rectangle) { this.x = rectangle.x; this.y = rectangle.y; @@ -130,6 +130,22 @@ } /** + * Copies this rectangle to another one. + * + * @param {PIXI.Rectangle} rectangle - The rectangle to copy to. + * @return {PIXI.Rectangle} Returns given parameter. + */ + copyTo(rectangle) + { + rectangle.x = this.x; + rectangle.y = this.y; + rectangle.width = this.width; + rectangle.height = this.height; + + return rectangle; + } + + /** * Checks whether the x and y coordinates given are contained within this Rectangle * * @param {number} x - The X coordinate of the point to test diff --git a/packages/math/test/ObservablePoint.js b/packages/math/test/ObservablePoint.js index 0ec97c8..3b2d249 100644 --- a/packages/math/test/ObservablePoint.js +++ b/packages/math/test/ObservablePoint.js @@ -42,11 +42,11 @@ const p2 = new ObservablePoint(cb, this, 5, 2); const p3 = new ObservablePoint(cb, this, 5, 6); - p1.copy(p2); + p1.copyFrom(p2); expect(p1.x).to.equal(p2.x); expect(p1.y).to.equal(p2.y); - p1.copy(p3); + p1.copyFrom(p3); expect(p1.y).to.equal(p3.y); }); }); diff --git a/packages/math/test/Point.js b/packages/math/test/Point.js index 8a7e8fa..cc9c7aa 100644 --- a/packages/math/test/Point.js +++ b/packages/math/test/Point.js @@ -30,7 +30,7 @@ const p1 = new Point(10, 20); const p2 = new Point(2, 5); - p1.copy(p2); + p1.copyFrom(p2); expect(p1.x).to.equal(2); expect(p1.y).to.equal(5); diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js index dd1acbd..23443cf 100644 --- a/bundles/pixi.js/src/deprecated.js +++ b/bundles/pixi.js/src/deprecated.js @@ -657,4 +657,52 @@ return BaseTexture.from(canvas, { scaleMode, resourceOptions }); }; + + /** + * @method PIXI.Point#copy + * @deprecated since 5.0.0 + * @see PIXI.Point#copyFrom + */ + PIXI.Point.prototype.copy = function copy(p) + { + warn('PIXI.Point.copy has been replaced with PIXI.Point#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.ObservablePoint#copy + * @deprecated since 5.0.0 + * @see PIXI.ObservablePoint#copyFrom + */ + PIXI.ObservablePoint.prototype.copy = function copy(p) + { + warn('PIXI.ObservablePoint.copy has been replaced with PIXI.ObservablePoint#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Rectangle#copy + * @deprecated since 5.0.0 + * @see PIXI.Rectangle#copyFrom + */ + PIXI.Rectangle.prototype.copy = function copy(p) + { + warn('PIXI.Rectangle.copy has been replaced with PIXI.Rectangle#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Matrix#copy + * @deprecated since 5.0.0 + * @see PIXI.Matrix#copyTo + */ + PIXI.Matrix.prototype.copy = function copy(p) + { + warn('PIXI.Matrix.copy has been replaced with PIXI.Matrix#copyTo'); + + return this.copyTo(p); + }; } diff --git a/packages/canvas/canvas-graphics/src/Graphics.js b/packages/canvas/canvas-graphics/src/Graphics.js index 57f23bf..7a88896 100644 --- a/packages/canvas/canvas-graphics/src/Graphics.js +++ b/packages/canvas/canvas-graphics/src/Graphics.js @@ -26,7 +26,7 @@ } this.transform.updateLocalTransform(); - this.transform.localTransform.copy(tempMatrix); + this.transform.localTransform.copyTo(tempMatrix); tempMatrix.invert(); diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index 95ddb2b..5672d78 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -183,7 +183,7 @@ if (transform) { - transform.copy(tempWt); + transform.copyTo(tempWt); // lets not forget to flag the parent transform as dirty... this._tempDisplayObjectParent.transform._worldID = -1; diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index 476f562..04a4e91 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -85,7 +85,7 @@ if (texture.rotate) { - wt.copy(canvasRenderWorldTransform); + wt.copyTo(canvasRenderWorldTransform); wt = canvasRenderWorldTransform; GroupD8.matrixAppendRotationInv(wt, texture.rotate, dx, dy); // the anchor has already been applied above, so lets set it to zero diff --git a/packages/core/src/renderers/filters/filterTransforms.js b/packages/core/src/renderers/filters/filterTransforms.js index 8932bae..87a3cd6 100644 --- a/packages/core/src/renderers/filters/filterTransforms.js +++ b/packages/core/src/renderers/filters/filterTransforms.js @@ -7,13 +7,9 @@ * @param outputMatrix {Matrix} @alvin * @private */ -// TODO playing around here.. this is temporary - (will end up in the shader) // this returns a matrix that will normalise map filter cords in the filter to screen space export function calculateScreenSpaceMatrix(outputMatrix, filterArea, textureSize) { - // let worldTransform = sprite.worldTransform.copy(Matrix.TEMP_MATRIX), - // let texture = {width:1136, height:700};//sprite._texture.baseTexture; - // TODO unwrap? const mappedMatrix = outputMatrix.identity(); @@ -43,7 +39,7 @@ { const orig = sprite._texture.orig; const mappedMatrix = outputMatrix.set(textureSize.width, 0, 0, textureSize.height, filterArea.x, filterArea.y); - const worldTransform = sprite.worldTransform.copy(Matrix.TEMP_MATRIX); + const worldTransform = sprite.worldTransform.copyTo(Matrix.TEMP_MATRIX); worldTransform.invert(); mappedMatrix.prepend(worldTransform); diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index cbd35d4..087a8cb 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -480,7 +480,7 @@ set position(value) // eslint-disable-line require-jsdoc { - this.transform.position.copy(value); + this.transform.position.copyFrom(value); } /** @@ -496,7 +496,7 @@ set scale(value) // eslint-disable-line require-jsdoc { - this.transform.scale.copy(value); + this.transform.scale.copyFrom(value); } /** @@ -512,7 +512,7 @@ set pivot(value) // eslint-disable-line require-jsdoc { - this.transform.pivot.copy(value); + this.transform.pivot.copyFrom(value); } /** @@ -528,7 +528,7 @@ set skew(value) // eslint-disable-line require-jsdoc { - this.transform.skew.copy(value); + this.transform.skew.copyFrom(value); } /** diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 8c32e1a..ec14a67 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -454,10 +454,10 @@ /** * Changes the values of the given matrix to be the same as the ones in this matrix * - * @param {PIXI.Matrix} matrix - The matrix to copy from. + * @param {PIXI.Matrix} matrix - The matrix to copy to. * @return {PIXI.Matrix} The matrix given in parameter with its values updated. */ - copy(matrix) + copyTo(matrix) { matrix.a = this.a; matrix.b = this.b; @@ -470,6 +470,24 @@ } /** + * Changes the values of the matrix to be the same as the ones in given matrix + * + * @param {PIXI.Matrix} matrix - The matrix to copy from. + * @return {PIXI.Matrix} this + */ + copyFrom(matrix) + { + this.a = matrix.a; + this.b = matrix.b; + this.c = matrix.c; + this.d = matrix.d; + this.tx = matrix.tx; + this.ty = matrix.ty; + + return this; + } + + /** * A default (identity) matrix * * @static diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index fd5622d..c772ae7 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -44,18 +44,34 @@ } /** - * Copies the data from another point + * Copies x and y from the given point * - * @param {PIXI.Point|PIXI.ObservablePoint} point - point to copy from + * @param {PIXI.Point} p - The point to copy from. + * @returns Returns itself. */ - copy(point) + copyFrom(p) { - if (this._x !== point.x || this._y !== point.y) + if (this._x !== p.x || this._y !== p.y) { - this._x = point.x; - this._y = point.y; + this._x = p.x; + this._y = p.y; this.cb.call(this.scope); } + + return this; + } + + /** + * Copies x and y into the given point + * + * @param {PIXI.Point} p - The point to copy. + * @returns Given point with values updated + */ + copyTo(p) + { + p.set(this._x, this._y); + + return p; } /** diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index dcf239e..e123f60 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -39,11 +39,27 @@ /** * Copies x and y from the given point * - * @param {PIXI.Point} p - The point to copy. + * @param {PIXI.Point} p - The point to copy from + * @returns Returns itself. */ - copy(p) + copyFrom(p) { this.set(p.x, p.y); + + return this; + } + + /** + * Copies x and y into the given point + * + * @param {PIXI.Point} p - The point to copy. + * @returns Given point with values updated + */ + copyTo(p) + { + p.set(this.x, this.y); + + return p; } /** diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 9176834..7233a23 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -116,10 +116,10 @@ /** * Copies another rectangle to this one. * - * @param {PIXI.Rectangle} rectangle - The rectangle to copy. + * @param {PIXI.Rectangle} rectangle - The rectangle to copy from. * @return {PIXI.Rectangle} Returns itself. */ - copy(rectangle) + copyFrom(rectangle) { this.x = rectangle.x; this.y = rectangle.y; @@ -130,6 +130,22 @@ } /** + * Copies this rectangle to another one. + * + * @param {PIXI.Rectangle} rectangle - The rectangle to copy to. + * @return {PIXI.Rectangle} Returns given parameter. + */ + copyTo(rectangle) + { + rectangle.x = this.x; + rectangle.y = this.y; + rectangle.width = this.width; + rectangle.height = this.height; + + return rectangle; + } + + /** * Checks whether the x and y coordinates given are contained within this Rectangle * * @param {number} x - The X coordinate of the point to test diff --git a/packages/math/test/ObservablePoint.js b/packages/math/test/ObservablePoint.js index 0ec97c8..3b2d249 100644 --- a/packages/math/test/ObservablePoint.js +++ b/packages/math/test/ObservablePoint.js @@ -42,11 +42,11 @@ const p2 = new ObservablePoint(cb, this, 5, 2); const p3 = new ObservablePoint(cb, this, 5, 6); - p1.copy(p2); + p1.copyFrom(p2); expect(p1.x).to.equal(p2.x); expect(p1.y).to.equal(p2.y); - p1.copy(p3); + p1.copyFrom(p3); expect(p1.y).to.equal(p3.y); }); }); diff --git a/packages/math/test/Point.js b/packages/math/test/Point.js index 8a7e8fa..cc9c7aa 100644 --- a/packages/math/test/Point.js +++ b/packages/math/test/Point.js @@ -30,7 +30,7 @@ const p1 = new Point(10, 20); const p2 = new Point(2, 5); - p1.copy(p2); + p1.copyFrom(p2); expect(p1.x).to.equal(2); expect(p1.y).to.equal(5); diff --git a/packages/math/test/Rectangle.js b/packages/math/test/Rectangle.js index aa586df..c96ebf9 100644 --- a/packages/math/test/Rectangle.js +++ b/packages/math/test/Rectangle.js @@ -45,7 +45,7 @@ const rect1 = new Rectangle(10, 10, 10, 10); const rect2 = new Rectangle(2, 2, 5, 5); - rect1.copy(rect2); + rect1.copyFrom(rect2); expect(rect1.x).to.equal(2); expect(rect1.y).to.equal(2); diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js index dd1acbd..23443cf 100644 --- a/bundles/pixi.js/src/deprecated.js +++ b/bundles/pixi.js/src/deprecated.js @@ -657,4 +657,52 @@ return BaseTexture.from(canvas, { scaleMode, resourceOptions }); }; + + /** + * @method PIXI.Point#copy + * @deprecated since 5.0.0 + * @see PIXI.Point#copyFrom + */ + PIXI.Point.prototype.copy = function copy(p) + { + warn('PIXI.Point.copy has been replaced with PIXI.Point#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.ObservablePoint#copy + * @deprecated since 5.0.0 + * @see PIXI.ObservablePoint#copyFrom + */ + PIXI.ObservablePoint.prototype.copy = function copy(p) + { + warn('PIXI.ObservablePoint.copy has been replaced with PIXI.ObservablePoint#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Rectangle#copy + * @deprecated since 5.0.0 + * @see PIXI.Rectangle#copyFrom + */ + PIXI.Rectangle.prototype.copy = function copy(p) + { + warn('PIXI.Rectangle.copy has been replaced with PIXI.Rectangle#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Matrix#copy + * @deprecated since 5.0.0 + * @see PIXI.Matrix#copyTo + */ + PIXI.Matrix.prototype.copy = function copy(p) + { + warn('PIXI.Matrix.copy has been replaced with PIXI.Matrix#copyTo'); + + return this.copyTo(p); + }; } diff --git a/packages/canvas/canvas-graphics/src/Graphics.js b/packages/canvas/canvas-graphics/src/Graphics.js index 57f23bf..7a88896 100644 --- a/packages/canvas/canvas-graphics/src/Graphics.js +++ b/packages/canvas/canvas-graphics/src/Graphics.js @@ -26,7 +26,7 @@ } this.transform.updateLocalTransform(); - this.transform.localTransform.copy(tempMatrix); + this.transform.localTransform.copyTo(tempMatrix); tempMatrix.invert(); diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index 95ddb2b..5672d78 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -183,7 +183,7 @@ if (transform) { - transform.copy(tempWt); + transform.copyTo(tempWt); // lets not forget to flag the parent transform as dirty... this._tempDisplayObjectParent.transform._worldID = -1; diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index 476f562..04a4e91 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -85,7 +85,7 @@ if (texture.rotate) { - wt.copy(canvasRenderWorldTransform); + wt.copyTo(canvasRenderWorldTransform); wt = canvasRenderWorldTransform; GroupD8.matrixAppendRotationInv(wt, texture.rotate, dx, dy); // the anchor has already been applied above, so lets set it to zero diff --git a/packages/core/src/renderers/filters/filterTransforms.js b/packages/core/src/renderers/filters/filterTransforms.js index 8932bae..87a3cd6 100644 --- a/packages/core/src/renderers/filters/filterTransforms.js +++ b/packages/core/src/renderers/filters/filterTransforms.js @@ -7,13 +7,9 @@ * @param outputMatrix {Matrix} @alvin * @private */ -// TODO playing around here.. this is temporary - (will end up in the shader) // this returns a matrix that will normalise map filter cords in the filter to screen space export function calculateScreenSpaceMatrix(outputMatrix, filterArea, textureSize) { - // let worldTransform = sprite.worldTransform.copy(Matrix.TEMP_MATRIX), - // let texture = {width:1136, height:700};//sprite._texture.baseTexture; - // TODO unwrap? const mappedMatrix = outputMatrix.identity(); @@ -43,7 +39,7 @@ { const orig = sprite._texture.orig; const mappedMatrix = outputMatrix.set(textureSize.width, 0, 0, textureSize.height, filterArea.x, filterArea.y); - const worldTransform = sprite.worldTransform.copy(Matrix.TEMP_MATRIX); + const worldTransform = sprite.worldTransform.copyTo(Matrix.TEMP_MATRIX); worldTransform.invert(); mappedMatrix.prepend(worldTransform); diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index cbd35d4..087a8cb 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -480,7 +480,7 @@ set position(value) // eslint-disable-line require-jsdoc { - this.transform.position.copy(value); + this.transform.position.copyFrom(value); } /** @@ -496,7 +496,7 @@ set scale(value) // eslint-disable-line require-jsdoc { - this.transform.scale.copy(value); + this.transform.scale.copyFrom(value); } /** @@ -512,7 +512,7 @@ set pivot(value) // eslint-disable-line require-jsdoc { - this.transform.pivot.copy(value); + this.transform.pivot.copyFrom(value); } /** @@ -528,7 +528,7 @@ set skew(value) // eslint-disable-line require-jsdoc { - this.transform.skew.copy(value); + this.transform.skew.copyFrom(value); } /** diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 8c32e1a..ec14a67 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -454,10 +454,10 @@ /** * Changes the values of the given matrix to be the same as the ones in this matrix * - * @param {PIXI.Matrix} matrix - The matrix to copy from. + * @param {PIXI.Matrix} matrix - The matrix to copy to. * @return {PIXI.Matrix} The matrix given in parameter with its values updated. */ - copy(matrix) + copyTo(matrix) { matrix.a = this.a; matrix.b = this.b; @@ -470,6 +470,24 @@ } /** + * Changes the values of the matrix to be the same as the ones in given matrix + * + * @param {PIXI.Matrix} matrix - The matrix to copy from. + * @return {PIXI.Matrix} this + */ + copyFrom(matrix) + { + this.a = matrix.a; + this.b = matrix.b; + this.c = matrix.c; + this.d = matrix.d; + this.tx = matrix.tx; + this.ty = matrix.ty; + + return this; + } + + /** * A default (identity) matrix * * @static diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index fd5622d..c772ae7 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -44,18 +44,34 @@ } /** - * Copies the data from another point + * Copies x and y from the given point * - * @param {PIXI.Point|PIXI.ObservablePoint} point - point to copy from + * @param {PIXI.Point} p - The point to copy from. + * @returns Returns itself. */ - copy(point) + copyFrom(p) { - if (this._x !== point.x || this._y !== point.y) + if (this._x !== p.x || this._y !== p.y) { - this._x = point.x; - this._y = point.y; + this._x = p.x; + this._y = p.y; this.cb.call(this.scope); } + + return this; + } + + /** + * Copies x and y into the given point + * + * @param {PIXI.Point} p - The point to copy. + * @returns Given point with values updated + */ + copyTo(p) + { + p.set(this._x, this._y); + + return p; } /** diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index dcf239e..e123f60 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -39,11 +39,27 @@ /** * Copies x and y from the given point * - * @param {PIXI.Point} p - The point to copy. + * @param {PIXI.Point} p - The point to copy from + * @returns Returns itself. */ - copy(p) + copyFrom(p) { this.set(p.x, p.y); + + return this; + } + + /** + * Copies x and y into the given point + * + * @param {PIXI.Point} p - The point to copy. + * @returns Given point with values updated + */ + copyTo(p) + { + p.set(this.x, this.y); + + return p; } /** diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 9176834..7233a23 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -116,10 +116,10 @@ /** * Copies another rectangle to this one. * - * @param {PIXI.Rectangle} rectangle - The rectangle to copy. + * @param {PIXI.Rectangle} rectangle - The rectangle to copy from. * @return {PIXI.Rectangle} Returns itself. */ - copy(rectangle) + copyFrom(rectangle) { this.x = rectangle.x; this.y = rectangle.y; @@ -130,6 +130,22 @@ } /** + * Copies this rectangle to another one. + * + * @param {PIXI.Rectangle} rectangle - The rectangle to copy to. + * @return {PIXI.Rectangle} Returns given parameter. + */ + copyTo(rectangle) + { + rectangle.x = this.x; + rectangle.y = this.y; + rectangle.width = this.width; + rectangle.height = this.height; + + return rectangle; + } + + /** * Checks whether the x and y coordinates given are contained within this Rectangle * * @param {number} x - The X coordinate of the point to test diff --git a/packages/math/test/ObservablePoint.js b/packages/math/test/ObservablePoint.js index 0ec97c8..3b2d249 100644 --- a/packages/math/test/ObservablePoint.js +++ b/packages/math/test/ObservablePoint.js @@ -42,11 +42,11 @@ const p2 = new ObservablePoint(cb, this, 5, 2); const p3 = new ObservablePoint(cb, this, 5, 6); - p1.copy(p2); + p1.copyFrom(p2); expect(p1.x).to.equal(p2.x); expect(p1.y).to.equal(p2.y); - p1.copy(p3); + p1.copyFrom(p3); expect(p1.y).to.equal(p3.y); }); }); diff --git a/packages/math/test/Point.js b/packages/math/test/Point.js index 8a7e8fa..cc9c7aa 100644 --- a/packages/math/test/Point.js +++ b/packages/math/test/Point.js @@ -30,7 +30,7 @@ const p1 = new Point(10, 20); const p2 = new Point(2, 5); - p1.copy(p2); + p1.copyFrom(p2); expect(p1.x).to.equal(2); expect(p1.y).to.equal(5); diff --git a/packages/math/test/Rectangle.js b/packages/math/test/Rectangle.js index aa586df..c96ebf9 100644 --- a/packages/math/test/Rectangle.js +++ b/packages/math/test/Rectangle.js @@ -45,7 +45,7 @@ const rect1 = new Rectangle(10, 10, 10, 10); const rect2 = new Rectangle(2, 2, 5, 5); - rect1.copy(rect2); + rect1.copyFrom(rect2); expect(rect1.x).to.equal(2); expect(rect1.y).to.equal(2); diff --git a/packages/mixin-cache-as-bitmap/src/index.js b/packages/mixin-cache-as-bitmap/src/index.js index 7fee376..18bcbbe 100644 --- a/packages/mixin-cache-as-bitmap/src/index.js +++ b/packages/mixin-cache-as-bitmap/src/index.js @@ -311,7 +311,7 @@ // need to set // const m = _tempMatrix; - this.transform.localTransform.copy(m); + this.transform.localTransform.copyTo(m); m.invert(); m.tx -= bounds.x; diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js index dd1acbd..23443cf 100644 --- a/bundles/pixi.js/src/deprecated.js +++ b/bundles/pixi.js/src/deprecated.js @@ -657,4 +657,52 @@ return BaseTexture.from(canvas, { scaleMode, resourceOptions }); }; + + /** + * @method PIXI.Point#copy + * @deprecated since 5.0.0 + * @see PIXI.Point#copyFrom + */ + PIXI.Point.prototype.copy = function copy(p) + { + warn('PIXI.Point.copy has been replaced with PIXI.Point#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.ObservablePoint#copy + * @deprecated since 5.0.0 + * @see PIXI.ObservablePoint#copyFrom + */ + PIXI.ObservablePoint.prototype.copy = function copy(p) + { + warn('PIXI.ObservablePoint.copy has been replaced with PIXI.ObservablePoint#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Rectangle#copy + * @deprecated since 5.0.0 + * @see PIXI.Rectangle#copyFrom + */ + PIXI.Rectangle.prototype.copy = function copy(p) + { + warn('PIXI.Rectangle.copy has been replaced with PIXI.Rectangle#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Matrix#copy + * @deprecated since 5.0.0 + * @see PIXI.Matrix#copyTo + */ + PIXI.Matrix.prototype.copy = function copy(p) + { + warn('PIXI.Matrix.copy has been replaced with PIXI.Matrix#copyTo'); + + return this.copyTo(p); + }; } diff --git a/packages/canvas/canvas-graphics/src/Graphics.js b/packages/canvas/canvas-graphics/src/Graphics.js index 57f23bf..7a88896 100644 --- a/packages/canvas/canvas-graphics/src/Graphics.js +++ b/packages/canvas/canvas-graphics/src/Graphics.js @@ -26,7 +26,7 @@ } this.transform.updateLocalTransform(); - this.transform.localTransform.copy(tempMatrix); + this.transform.localTransform.copyTo(tempMatrix); tempMatrix.invert(); diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index 95ddb2b..5672d78 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -183,7 +183,7 @@ if (transform) { - transform.copy(tempWt); + transform.copyTo(tempWt); // lets not forget to flag the parent transform as dirty... this._tempDisplayObjectParent.transform._worldID = -1; diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index 476f562..04a4e91 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -85,7 +85,7 @@ if (texture.rotate) { - wt.copy(canvasRenderWorldTransform); + wt.copyTo(canvasRenderWorldTransform); wt = canvasRenderWorldTransform; GroupD8.matrixAppendRotationInv(wt, texture.rotate, dx, dy); // the anchor has already been applied above, so lets set it to zero diff --git a/packages/core/src/renderers/filters/filterTransforms.js b/packages/core/src/renderers/filters/filterTransforms.js index 8932bae..87a3cd6 100644 --- a/packages/core/src/renderers/filters/filterTransforms.js +++ b/packages/core/src/renderers/filters/filterTransforms.js @@ -7,13 +7,9 @@ * @param outputMatrix {Matrix} @alvin * @private */ -// TODO playing around here.. this is temporary - (will end up in the shader) // this returns a matrix that will normalise map filter cords in the filter to screen space export function calculateScreenSpaceMatrix(outputMatrix, filterArea, textureSize) { - // let worldTransform = sprite.worldTransform.copy(Matrix.TEMP_MATRIX), - // let texture = {width:1136, height:700};//sprite._texture.baseTexture; - // TODO unwrap? const mappedMatrix = outputMatrix.identity(); @@ -43,7 +39,7 @@ { const orig = sprite._texture.orig; const mappedMatrix = outputMatrix.set(textureSize.width, 0, 0, textureSize.height, filterArea.x, filterArea.y); - const worldTransform = sprite.worldTransform.copy(Matrix.TEMP_MATRIX); + const worldTransform = sprite.worldTransform.copyTo(Matrix.TEMP_MATRIX); worldTransform.invert(); mappedMatrix.prepend(worldTransform); diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index cbd35d4..087a8cb 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -480,7 +480,7 @@ set position(value) // eslint-disable-line require-jsdoc { - this.transform.position.copy(value); + this.transform.position.copyFrom(value); } /** @@ -496,7 +496,7 @@ set scale(value) // eslint-disable-line require-jsdoc { - this.transform.scale.copy(value); + this.transform.scale.copyFrom(value); } /** @@ -512,7 +512,7 @@ set pivot(value) // eslint-disable-line require-jsdoc { - this.transform.pivot.copy(value); + this.transform.pivot.copyFrom(value); } /** @@ -528,7 +528,7 @@ set skew(value) // eslint-disable-line require-jsdoc { - this.transform.skew.copy(value); + this.transform.skew.copyFrom(value); } /** diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 8c32e1a..ec14a67 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -454,10 +454,10 @@ /** * Changes the values of the given matrix to be the same as the ones in this matrix * - * @param {PIXI.Matrix} matrix - The matrix to copy from. + * @param {PIXI.Matrix} matrix - The matrix to copy to. * @return {PIXI.Matrix} The matrix given in parameter with its values updated. */ - copy(matrix) + copyTo(matrix) { matrix.a = this.a; matrix.b = this.b; @@ -470,6 +470,24 @@ } /** + * Changes the values of the matrix to be the same as the ones in given matrix + * + * @param {PIXI.Matrix} matrix - The matrix to copy from. + * @return {PIXI.Matrix} this + */ + copyFrom(matrix) + { + this.a = matrix.a; + this.b = matrix.b; + this.c = matrix.c; + this.d = matrix.d; + this.tx = matrix.tx; + this.ty = matrix.ty; + + return this; + } + + /** * A default (identity) matrix * * @static diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index fd5622d..c772ae7 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -44,18 +44,34 @@ } /** - * Copies the data from another point + * Copies x and y from the given point * - * @param {PIXI.Point|PIXI.ObservablePoint} point - point to copy from + * @param {PIXI.Point} p - The point to copy from. + * @returns Returns itself. */ - copy(point) + copyFrom(p) { - if (this._x !== point.x || this._y !== point.y) + if (this._x !== p.x || this._y !== p.y) { - this._x = point.x; - this._y = point.y; + this._x = p.x; + this._y = p.y; this.cb.call(this.scope); } + + return this; + } + + /** + * Copies x and y into the given point + * + * @param {PIXI.Point} p - The point to copy. + * @returns Given point with values updated + */ + copyTo(p) + { + p.set(this._x, this._y); + + return p; } /** diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index dcf239e..e123f60 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -39,11 +39,27 @@ /** * Copies x and y from the given point * - * @param {PIXI.Point} p - The point to copy. + * @param {PIXI.Point} p - The point to copy from + * @returns Returns itself. */ - copy(p) + copyFrom(p) { this.set(p.x, p.y); + + return this; + } + + /** + * Copies x and y into the given point + * + * @param {PIXI.Point} p - The point to copy. + * @returns Given point with values updated + */ + copyTo(p) + { + p.set(this.x, this.y); + + return p; } /** diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 9176834..7233a23 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -116,10 +116,10 @@ /** * Copies another rectangle to this one. * - * @param {PIXI.Rectangle} rectangle - The rectangle to copy. + * @param {PIXI.Rectangle} rectangle - The rectangle to copy from. * @return {PIXI.Rectangle} Returns itself. */ - copy(rectangle) + copyFrom(rectangle) { this.x = rectangle.x; this.y = rectangle.y; @@ -130,6 +130,22 @@ } /** + * Copies this rectangle to another one. + * + * @param {PIXI.Rectangle} rectangle - The rectangle to copy to. + * @return {PIXI.Rectangle} Returns given parameter. + */ + copyTo(rectangle) + { + rectangle.x = this.x; + rectangle.y = this.y; + rectangle.width = this.width; + rectangle.height = this.height; + + return rectangle; + } + + /** * Checks whether the x and y coordinates given are contained within this Rectangle * * @param {number} x - The X coordinate of the point to test diff --git a/packages/math/test/ObservablePoint.js b/packages/math/test/ObservablePoint.js index 0ec97c8..3b2d249 100644 --- a/packages/math/test/ObservablePoint.js +++ b/packages/math/test/ObservablePoint.js @@ -42,11 +42,11 @@ const p2 = new ObservablePoint(cb, this, 5, 2); const p3 = new ObservablePoint(cb, this, 5, 6); - p1.copy(p2); + p1.copyFrom(p2); expect(p1.x).to.equal(p2.x); expect(p1.y).to.equal(p2.y); - p1.copy(p3); + p1.copyFrom(p3); expect(p1.y).to.equal(p3.y); }); }); diff --git a/packages/math/test/Point.js b/packages/math/test/Point.js index 8a7e8fa..cc9c7aa 100644 --- a/packages/math/test/Point.js +++ b/packages/math/test/Point.js @@ -30,7 +30,7 @@ const p1 = new Point(10, 20); const p2 = new Point(2, 5); - p1.copy(p2); + p1.copyFrom(p2); expect(p1.x).to.equal(2); expect(p1.y).to.equal(5); diff --git a/packages/math/test/Rectangle.js b/packages/math/test/Rectangle.js index aa586df..c96ebf9 100644 --- a/packages/math/test/Rectangle.js +++ b/packages/math/test/Rectangle.js @@ -45,7 +45,7 @@ const rect1 = new Rectangle(10, 10, 10, 10); const rect2 = new Rectangle(2, 2, 5, 5); - rect1.copy(rect2); + rect1.copyFrom(rect2); expect(rect1.x).to.equal(2); expect(rect1.y).to.equal(2); diff --git a/packages/mixin-cache-as-bitmap/src/index.js b/packages/mixin-cache-as-bitmap/src/index.js index 7fee376..18bcbbe 100644 --- a/packages/mixin-cache-as-bitmap/src/index.js +++ b/packages/mixin-cache-as-bitmap/src/index.js @@ -311,7 +311,7 @@ // need to set // const m = _tempMatrix; - this.transform.localTransform.copy(m); + this.transform.localTransform.copyTo(m); m.invert(); m.tx -= bounds.x; diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index 48a547d..a2ceaee 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -151,7 +151,7 @@ const gl = renderer.gl; - const m = container.worldTransform.copy(this.tempMatrix); + const m = container.worldTransform.copyTo(this.tempMatrix); m.prepend(renderer._activeRenderTarget.projectionMatrix); diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js index dd1acbd..23443cf 100644 --- a/bundles/pixi.js/src/deprecated.js +++ b/bundles/pixi.js/src/deprecated.js @@ -657,4 +657,52 @@ return BaseTexture.from(canvas, { scaleMode, resourceOptions }); }; + + /** + * @method PIXI.Point#copy + * @deprecated since 5.0.0 + * @see PIXI.Point#copyFrom + */ + PIXI.Point.prototype.copy = function copy(p) + { + warn('PIXI.Point.copy has been replaced with PIXI.Point#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.ObservablePoint#copy + * @deprecated since 5.0.0 + * @see PIXI.ObservablePoint#copyFrom + */ + PIXI.ObservablePoint.prototype.copy = function copy(p) + { + warn('PIXI.ObservablePoint.copy has been replaced with PIXI.ObservablePoint#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Rectangle#copy + * @deprecated since 5.0.0 + * @see PIXI.Rectangle#copyFrom + */ + PIXI.Rectangle.prototype.copy = function copy(p) + { + warn('PIXI.Rectangle.copy has been replaced with PIXI.Rectangle#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Matrix#copy + * @deprecated since 5.0.0 + * @see PIXI.Matrix#copyTo + */ + PIXI.Matrix.prototype.copy = function copy(p) + { + warn('PIXI.Matrix.copy has been replaced with PIXI.Matrix#copyTo'); + + return this.copyTo(p); + }; } diff --git a/packages/canvas/canvas-graphics/src/Graphics.js b/packages/canvas/canvas-graphics/src/Graphics.js index 57f23bf..7a88896 100644 --- a/packages/canvas/canvas-graphics/src/Graphics.js +++ b/packages/canvas/canvas-graphics/src/Graphics.js @@ -26,7 +26,7 @@ } this.transform.updateLocalTransform(); - this.transform.localTransform.copy(tempMatrix); + this.transform.localTransform.copyTo(tempMatrix); tempMatrix.invert(); diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index 95ddb2b..5672d78 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -183,7 +183,7 @@ if (transform) { - transform.copy(tempWt); + transform.copyTo(tempWt); // lets not forget to flag the parent transform as dirty... this._tempDisplayObjectParent.transform._worldID = -1; diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index 476f562..04a4e91 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -85,7 +85,7 @@ if (texture.rotate) { - wt.copy(canvasRenderWorldTransform); + wt.copyTo(canvasRenderWorldTransform); wt = canvasRenderWorldTransform; GroupD8.matrixAppendRotationInv(wt, texture.rotate, dx, dy); // the anchor has already been applied above, so lets set it to zero diff --git a/packages/core/src/renderers/filters/filterTransforms.js b/packages/core/src/renderers/filters/filterTransforms.js index 8932bae..87a3cd6 100644 --- a/packages/core/src/renderers/filters/filterTransforms.js +++ b/packages/core/src/renderers/filters/filterTransforms.js @@ -7,13 +7,9 @@ * @param outputMatrix {Matrix} @alvin * @private */ -// TODO playing around here.. this is temporary - (will end up in the shader) // this returns a matrix that will normalise map filter cords in the filter to screen space export function calculateScreenSpaceMatrix(outputMatrix, filterArea, textureSize) { - // let worldTransform = sprite.worldTransform.copy(Matrix.TEMP_MATRIX), - // let texture = {width:1136, height:700};//sprite._texture.baseTexture; - // TODO unwrap? const mappedMatrix = outputMatrix.identity(); @@ -43,7 +39,7 @@ { const orig = sprite._texture.orig; const mappedMatrix = outputMatrix.set(textureSize.width, 0, 0, textureSize.height, filterArea.x, filterArea.y); - const worldTransform = sprite.worldTransform.copy(Matrix.TEMP_MATRIX); + const worldTransform = sprite.worldTransform.copyTo(Matrix.TEMP_MATRIX); worldTransform.invert(); mappedMatrix.prepend(worldTransform); diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index cbd35d4..087a8cb 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -480,7 +480,7 @@ set position(value) // eslint-disable-line require-jsdoc { - this.transform.position.copy(value); + this.transform.position.copyFrom(value); } /** @@ -496,7 +496,7 @@ set scale(value) // eslint-disable-line require-jsdoc { - this.transform.scale.copy(value); + this.transform.scale.copyFrom(value); } /** @@ -512,7 +512,7 @@ set pivot(value) // eslint-disable-line require-jsdoc { - this.transform.pivot.copy(value); + this.transform.pivot.copyFrom(value); } /** @@ -528,7 +528,7 @@ set skew(value) // eslint-disable-line require-jsdoc { - this.transform.skew.copy(value); + this.transform.skew.copyFrom(value); } /** diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 8c32e1a..ec14a67 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -454,10 +454,10 @@ /** * Changes the values of the given matrix to be the same as the ones in this matrix * - * @param {PIXI.Matrix} matrix - The matrix to copy from. + * @param {PIXI.Matrix} matrix - The matrix to copy to. * @return {PIXI.Matrix} The matrix given in parameter with its values updated. */ - copy(matrix) + copyTo(matrix) { matrix.a = this.a; matrix.b = this.b; @@ -470,6 +470,24 @@ } /** + * Changes the values of the matrix to be the same as the ones in given matrix + * + * @param {PIXI.Matrix} matrix - The matrix to copy from. + * @return {PIXI.Matrix} this + */ + copyFrom(matrix) + { + this.a = matrix.a; + this.b = matrix.b; + this.c = matrix.c; + this.d = matrix.d; + this.tx = matrix.tx; + this.ty = matrix.ty; + + return this; + } + + /** * A default (identity) matrix * * @static diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index fd5622d..c772ae7 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -44,18 +44,34 @@ } /** - * Copies the data from another point + * Copies x and y from the given point * - * @param {PIXI.Point|PIXI.ObservablePoint} point - point to copy from + * @param {PIXI.Point} p - The point to copy from. + * @returns Returns itself. */ - copy(point) + copyFrom(p) { - if (this._x !== point.x || this._y !== point.y) + if (this._x !== p.x || this._y !== p.y) { - this._x = point.x; - this._y = point.y; + this._x = p.x; + this._y = p.y; this.cb.call(this.scope); } + + return this; + } + + /** + * Copies x and y into the given point + * + * @param {PIXI.Point} p - The point to copy. + * @returns Given point with values updated + */ + copyTo(p) + { + p.set(this._x, this._y); + + return p; } /** diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index dcf239e..e123f60 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -39,11 +39,27 @@ /** * Copies x and y from the given point * - * @param {PIXI.Point} p - The point to copy. + * @param {PIXI.Point} p - The point to copy from + * @returns Returns itself. */ - copy(p) + copyFrom(p) { this.set(p.x, p.y); + + return this; + } + + /** + * Copies x and y into the given point + * + * @param {PIXI.Point} p - The point to copy. + * @returns Given point with values updated + */ + copyTo(p) + { + p.set(this.x, this.y); + + return p; } /** diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 9176834..7233a23 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -116,10 +116,10 @@ /** * Copies another rectangle to this one. * - * @param {PIXI.Rectangle} rectangle - The rectangle to copy. + * @param {PIXI.Rectangle} rectangle - The rectangle to copy from. * @return {PIXI.Rectangle} Returns itself. */ - copy(rectangle) + copyFrom(rectangle) { this.x = rectangle.x; this.y = rectangle.y; @@ -130,6 +130,22 @@ } /** + * Copies this rectangle to another one. + * + * @param {PIXI.Rectangle} rectangle - The rectangle to copy to. + * @return {PIXI.Rectangle} Returns given parameter. + */ + copyTo(rectangle) + { + rectangle.x = this.x; + rectangle.y = this.y; + rectangle.width = this.width; + rectangle.height = this.height; + + return rectangle; + } + + /** * Checks whether the x and y coordinates given are contained within this Rectangle * * @param {number} x - The X coordinate of the point to test diff --git a/packages/math/test/ObservablePoint.js b/packages/math/test/ObservablePoint.js index 0ec97c8..3b2d249 100644 --- a/packages/math/test/ObservablePoint.js +++ b/packages/math/test/ObservablePoint.js @@ -42,11 +42,11 @@ const p2 = new ObservablePoint(cb, this, 5, 2); const p3 = new ObservablePoint(cb, this, 5, 6); - p1.copy(p2); + p1.copyFrom(p2); expect(p1.x).to.equal(p2.x); expect(p1.y).to.equal(p2.y); - p1.copy(p3); + p1.copyFrom(p3); expect(p1.y).to.equal(p3.y); }); }); diff --git a/packages/math/test/Point.js b/packages/math/test/Point.js index 8a7e8fa..cc9c7aa 100644 --- a/packages/math/test/Point.js +++ b/packages/math/test/Point.js @@ -30,7 +30,7 @@ const p1 = new Point(10, 20); const p2 = new Point(2, 5); - p1.copy(p2); + p1.copyFrom(p2); expect(p1.x).to.equal(2); expect(p1.y).to.equal(5); diff --git a/packages/math/test/Rectangle.js b/packages/math/test/Rectangle.js index aa586df..c96ebf9 100644 --- a/packages/math/test/Rectangle.js +++ b/packages/math/test/Rectangle.js @@ -45,7 +45,7 @@ const rect1 = new Rectangle(10, 10, 10, 10); const rect2 = new Rectangle(2, 2, 5, 5); - rect1.copy(rect2); + rect1.copyFrom(rect2); expect(rect1.x).to.equal(2); expect(rect1.y).to.equal(2); diff --git a/packages/mixin-cache-as-bitmap/src/index.js b/packages/mixin-cache-as-bitmap/src/index.js index 7fee376..18bcbbe 100644 --- a/packages/mixin-cache-as-bitmap/src/index.js +++ b/packages/mixin-cache-as-bitmap/src/index.js @@ -311,7 +311,7 @@ // need to set // const m = _tempMatrix; - this.transform.localTransform.copy(m); + this.transform.localTransform.copyTo(m); m.invert(); m.tx -= bounds.x; diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index 48a547d..a2ceaee 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -151,7 +151,7 @@ const gl = renderer.gl; - const m = container.worldTransform.copy(this.tempMatrix); + const m = container.worldTransform.copyTo(this.tempMatrix); m.prepend(renderer._activeRenderTarget.projectionMatrix); diff --git a/packages/sprite-tiling/src/TilingSprite.js b/packages/sprite-tiling/src/TilingSprite.js index d2f26c0..dc8dab6 100644 --- a/packages/sprite-tiling/src/TilingSprite.js +++ b/packages/sprite-tiling/src/TilingSprite.js @@ -110,7 +110,7 @@ set tileScale(value) // eslint-disable-line require-jsdoc { - this.tileTransform.scale.copy(value); + this.tileTransform.scale.copyFrom(value); } /** @@ -125,7 +125,7 @@ set tilePosition(value) // eslint-disable-line require-jsdoc { - this.tileTransform.position.copy(value); + this.tileTransform.position.copyFrom(value); } /** diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js index dd1acbd..23443cf 100644 --- a/bundles/pixi.js/src/deprecated.js +++ b/bundles/pixi.js/src/deprecated.js @@ -657,4 +657,52 @@ return BaseTexture.from(canvas, { scaleMode, resourceOptions }); }; + + /** + * @method PIXI.Point#copy + * @deprecated since 5.0.0 + * @see PIXI.Point#copyFrom + */ + PIXI.Point.prototype.copy = function copy(p) + { + warn('PIXI.Point.copy has been replaced with PIXI.Point#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.ObservablePoint#copy + * @deprecated since 5.0.0 + * @see PIXI.ObservablePoint#copyFrom + */ + PIXI.ObservablePoint.prototype.copy = function copy(p) + { + warn('PIXI.ObservablePoint.copy has been replaced with PIXI.ObservablePoint#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Rectangle#copy + * @deprecated since 5.0.0 + * @see PIXI.Rectangle#copyFrom + */ + PIXI.Rectangle.prototype.copy = function copy(p) + { + warn('PIXI.Rectangle.copy has been replaced with PIXI.Rectangle#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Matrix#copy + * @deprecated since 5.0.0 + * @see PIXI.Matrix#copyTo + */ + PIXI.Matrix.prototype.copy = function copy(p) + { + warn('PIXI.Matrix.copy has been replaced with PIXI.Matrix#copyTo'); + + return this.copyTo(p); + }; } diff --git a/packages/canvas/canvas-graphics/src/Graphics.js b/packages/canvas/canvas-graphics/src/Graphics.js index 57f23bf..7a88896 100644 --- a/packages/canvas/canvas-graphics/src/Graphics.js +++ b/packages/canvas/canvas-graphics/src/Graphics.js @@ -26,7 +26,7 @@ } this.transform.updateLocalTransform(); - this.transform.localTransform.copy(tempMatrix); + this.transform.localTransform.copyTo(tempMatrix); tempMatrix.invert(); diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index 95ddb2b..5672d78 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -183,7 +183,7 @@ if (transform) { - transform.copy(tempWt); + transform.copyTo(tempWt); // lets not forget to flag the parent transform as dirty... this._tempDisplayObjectParent.transform._worldID = -1; diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index 476f562..04a4e91 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -85,7 +85,7 @@ if (texture.rotate) { - wt.copy(canvasRenderWorldTransform); + wt.copyTo(canvasRenderWorldTransform); wt = canvasRenderWorldTransform; GroupD8.matrixAppendRotationInv(wt, texture.rotate, dx, dy); // the anchor has already been applied above, so lets set it to zero diff --git a/packages/core/src/renderers/filters/filterTransforms.js b/packages/core/src/renderers/filters/filterTransforms.js index 8932bae..87a3cd6 100644 --- a/packages/core/src/renderers/filters/filterTransforms.js +++ b/packages/core/src/renderers/filters/filterTransforms.js @@ -7,13 +7,9 @@ * @param outputMatrix {Matrix} @alvin * @private */ -// TODO playing around here.. this is temporary - (will end up in the shader) // this returns a matrix that will normalise map filter cords in the filter to screen space export function calculateScreenSpaceMatrix(outputMatrix, filterArea, textureSize) { - // let worldTransform = sprite.worldTransform.copy(Matrix.TEMP_MATRIX), - // let texture = {width:1136, height:700};//sprite._texture.baseTexture; - // TODO unwrap? const mappedMatrix = outputMatrix.identity(); @@ -43,7 +39,7 @@ { const orig = sprite._texture.orig; const mappedMatrix = outputMatrix.set(textureSize.width, 0, 0, textureSize.height, filterArea.x, filterArea.y); - const worldTransform = sprite.worldTransform.copy(Matrix.TEMP_MATRIX); + const worldTransform = sprite.worldTransform.copyTo(Matrix.TEMP_MATRIX); worldTransform.invert(); mappedMatrix.prepend(worldTransform); diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index cbd35d4..087a8cb 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -480,7 +480,7 @@ set position(value) // eslint-disable-line require-jsdoc { - this.transform.position.copy(value); + this.transform.position.copyFrom(value); } /** @@ -496,7 +496,7 @@ set scale(value) // eslint-disable-line require-jsdoc { - this.transform.scale.copy(value); + this.transform.scale.copyFrom(value); } /** @@ -512,7 +512,7 @@ set pivot(value) // eslint-disable-line require-jsdoc { - this.transform.pivot.copy(value); + this.transform.pivot.copyFrom(value); } /** @@ -528,7 +528,7 @@ set skew(value) // eslint-disable-line require-jsdoc { - this.transform.skew.copy(value); + this.transform.skew.copyFrom(value); } /** diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 8c32e1a..ec14a67 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -454,10 +454,10 @@ /** * Changes the values of the given matrix to be the same as the ones in this matrix * - * @param {PIXI.Matrix} matrix - The matrix to copy from. + * @param {PIXI.Matrix} matrix - The matrix to copy to. * @return {PIXI.Matrix} The matrix given in parameter with its values updated. */ - copy(matrix) + copyTo(matrix) { matrix.a = this.a; matrix.b = this.b; @@ -470,6 +470,24 @@ } /** + * Changes the values of the matrix to be the same as the ones in given matrix + * + * @param {PIXI.Matrix} matrix - The matrix to copy from. + * @return {PIXI.Matrix} this + */ + copyFrom(matrix) + { + this.a = matrix.a; + this.b = matrix.b; + this.c = matrix.c; + this.d = matrix.d; + this.tx = matrix.tx; + this.ty = matrix.ty; + + return this; + } + + /** * A default (identity) matrix * * @static diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index fd5622d..c772ae7 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -44,18 +44,34 @@ } /** - * Copies the data from another point + * Copies x and y from the given point * - * @param {PIXI.Point|PIXI.ObservablePoint} point - point to copy from + * @param {PIXI.Point} p - The point to copy from. + * @returns Returns itself. */ - copy(point) + copyFrom(p) { - if (this._x !== point.x || this._y !== point.y) + if (this._x !== p.x || this._y !== p.y) { - this._x = point.x; - this._y = point.y; + this._x = p.x; + this._y = p.y; this.cb.call(this.scope); } + + return this; + } + + /** + * Copies x and y into the given point + * + * @param {PIXI.Point} p - The point to copy. + * @returns Given point with values updated + */ + copyTo(p) + { + p.set(this._x, this._y); + + return p; } /** diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index dcf239e..e123f60 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -39,11 +39,27 @@ /** * Copies x and y from the given point * - * @param {PIXI.Point} p - The point to copy. + * @param {PIXI.Point} p - The point to copy from + * @returns Returns itself. */ - copy(p) + copyFrom(p) { this.set(p.x, p.y); + + return this; + } + + /** + * Copies x and y into the given point + * + * @param {PIXI.Point} p - The point to copy. + * @returns Given point with values updated + */ + copyTo(p) + { + p.set(this.x, this.y); + + return p; } /** diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 9176834..7233a23 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -116,10 +116,10 @@ /** * Copies another rectangle to this one. * - * @param {PIXI.Rectangle} rectangle - The rectangle to copy. + * @param {PIXI.Rectangle} rectangle - The rectangle to copy from. * @return {PIXI.Rectangle} Returns itself. */ - copy(rectangle) + copyFrom(rectangle) { this.x = rectangle.x; this.y = rectangle.y; @@ -130,6 +130,22 @@ } /** + * Copies this rectangle to another one. + * + * @param {PIXI.Rectangle} rectangle - The rectangle to copy to. + * @return {PIXI.Rectangle} Returns given parameter. + */ + copyTo(rectangle) + { + rectangle.x = this.x; + rectangle.y = this.y; + rectangle.width = this.width; + rectangle.height = this.height; + + return rectangle; + } + + /** * Checks whether the x and y coordinates given are contained within this Rectangle * * @param {number} x - The X coordinate of the point to test diff --git a/packages/math/test/ObservablePoint.js b/packages/math/test/ObservablePoint.js index 0ec97c8..3b2d249 100644 --- a/packages/math/test/ObservablePoint.js +++ b/packages/math/test/ObservablePoint.js @@ -42,11 +42,11 @@ const p2 = new ObservablePoint(cb, this, 5, 2); const p3 = new ObservablePoint(cb, this, 5, 6); - p1.copy(p2); + p1.copyFrom(p2); expect(p1.x).to.equal(p2.x); expect(p1.y).to.equal(p2.y); - p1.copy(p3); + p1.copyFrom(p3); expect(p1.y).to.equal(p3.y); }); }); diff --git a/packages/math/test/Point.js b/packages/math/test/Point.js index 8a7e8fa..cc9c7aa 100644 --- a/packages/math/test/Point.js +++ b/packages/math/test/Point.js @@ -30,7 +30,7 @@ const p1 = new Point(10, 20); const p2 = new Point(2, 5); - p1.copy(p2); + p1.copyFrom(p2); expect(p1.x).to.equal(2); expect(p1.y).to.equal(5); diff --git a/packages/math/test/Rectangle.js b/packages/math/test/Rectangle.js index aa586df..c96ebf9 100644 --- a/packages/math/test/Rectangle.js +++ b/packages/math/test/Rectangle.js @@ -45,7 +45,7 @@ const rect1 = new Rectangle(10, 10, 10, 10); const rect2 = new Rectangle(2, 2, 5, 5); - rect1.copy(rect2); + rect1.copyFrom(rect2); expect(rect1.x).to.equal(2); expect(rect1.y).to.equal(2); diff --git a/packages/mixin-cache-as-bitmap/src/index.js b/packages/mixin-cache-as-bitmap/src/index.js index 7fee376..18bcbbe 100644 --- a/packages/mixin-cache-as-bitmap/src/index.js +++ b/packages/mixin-cache-as-bitmap/src/index.js @@ -311,7 +311,7 @@ // need to set // const m = _tempMatrix; - this.transform.localTransform.copy(m); + this.transform.localTransform.copyTo(m); m.invert(); m.tx -= bounds.x; diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index 48a547d..a2ceaee 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -151,7 +151,7 @@ const gl = renderer.gl; - const m = container.worldTransform.copy(this.tempMatrix); + const m = container.worldTransform.copyTo(this.tempMatrix); m.prepend(renderer._activeRenderTarget.projectionMatrix); diff --git a/packages/sprite-tiling/src/TilingSprite.js b/packages/sprite-tiling/src/TilingSprite.js index d2f26c0..dc8dab6 100644 --- a/packages/sprite-tiling/src/TilingSprite.js +++ b/packages/sprite-tiling/src/TilingSprite.js @@ -110,7 +110,7 @@ set tileScale(value) // eslint-disable-line require-jsdoc { - this.tileTransform.scale.copy(value); + this.tileTransform.scale.copyFrom(value); } /** @@ -125,7 +125,7 @@ set tilePosition(value) // eslint-disable-line require-jsdoc { - this.tileTransform.position.copy(value); + this.tileTransform.position.copyFrom(value); } /** diff --git a/packages/sprite/src/Sprite.js b/packages/sprite/src/Sprite.js index ed53a42..d9b6dbc 100644 --- a/packages/sprite/src/Sprite.js +++ b/packages/sprite/src/Sprite.js @@ -532,7 +532,7 @@ set anchor(value) // eslint-disable-line require-jsdoc { - this._anchor.copy(value); + this._anchor.copyFrom(value); } /** diff --git a/bundles/pixi.js/src/deprecated.js b/bundles/pixi.js/src/deprecated.js index dd1acbd..23443cf 100644 --- a/bundles/pixi.js/src/deprecated.js +++ b/bundles/pixi.js/src/deprecated.js @@ -657,4 +657,52 @@ return BaseTexture.from(canvas, { scaleMode, resourceOptions }); }; + + /** + * @method PIXI.Point#copy + * @deprecated since 5.0.0 + * @see PIXI.Point#copyFrom + */ + PIXI.Point.prototype.copy = function copy(p) + { + warn('PIXI.Point.copy has been replaced with PIXI.Point#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.ObservablePoint#copy + * @deprecated since 5.0.0 + * @see PIXI.ObservablePoint#copyFrom + */ + PIXI.ObservablePoint.prototype.copy = function copy(p) + { + warn('PIXI.ObservablePoint.copy has been replaced with PIXI.ObservablePoint#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Rectangle#copy + * @deprecated since 5.0.0 + * @see PIXI.Rectangle#copyFrom + */ + PIXI.Rectangle.prototype.copy = function copy(p) + { + warn('PIXI.Rectangle.copy has been replaced with PIXI.Rectangle#copyFrom'); + + return this.copyFrom(p); + }; + + /** + * @method PIXI.Matrix#copy + * @deprecated since 5.0.0 + * @see PIXI.Matrix#copyTo + */ + PIXI.Matrix.prototype.copy = function copy(p) + { + warn('PIXI.Matrix.copy has been replaced with PIXI.Matrix#copyTo'); + + return this.copyTo(p); + }; } diff --git a/packages/canvas/canvas-graphics/src/Graphics.js b/packages/canvas/canvas-graphics/src/Graphics.js index 57f23bf..7a88896 100644 --- a/packages/canvas/canvas-graphics/src/Graphics.js +++ b/packages/canvas/canvas-graphics/src/Graphics.js @@ -26,7 +26,7 @@ } this.transform.updateLocalTransform(); - this.transform.localTransform.copy(tempMatrix); + this.transform.localTransform.copyTo(tempMatrix); tempMatrix.invert(); diff --git a/packages/canvas/canvas-renderer/src/CanvasRenderer.js b/packages/canvas/canvas-renderer/src/CanvasRenderer.js index 95ddb2b..5672d78 100644 --- a/packages/canvas/canvas-renderer/src/CanvasRenderer.js +++ b/packages/canvas/canvas-renderer/src/CanvasRenderer.js @@ -183,7 +183,7 @@ if (transform) { - transform.copy(tempWt); + transform.copyTo(tempWt); // lets not forget to flag the parent transform as dirty... this._tempDisplayObjectParent.transform._worldID = -1; diff --git a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js index 476f562..04a4e91 100644 --- a/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js +++ b/packages/canvas/canvas-sprite/src/CanvasSpriteRenderer.js @@ -85,7 +85,7 @@ if (texture.rotate) { - wt.copy(canvasRenderWorldTransform); + wt.copyTo(canvasRenderWorldTransform); wt = canvasRenderWorldTransform; GroupD8.matrixAppendRotationInv(wt, texture.rotate, dx, dy); // the anchor has already been applied above, so lets set it to zero diff --git a/packages/core/src/renderers/filters/filterTransforms.js b/packages/core/src/renderers/filters/filterTransforms.js index 8932bae..87a3cd6 100644 --- a/packages/core/src/renderers/filters/filterTransforms.js +++ b/packages/core/src/renderers/filters/filterTransforms.js @@ -7,13 +7,9 @@ * @param outputMatrix {Matrix} @alvin * @private */ -// TODO playing around here.. this is temporary - (will end up in the shader) // this returns a matrix that will normalise map filter cords in the filter to screen space export function calculateScreenSpaceMatrix(outputMatrix, filterArea, textureSize) { - // let worldTransform = sprite.worldTransform.copy(Matrix.TEMP_MATRIX), - // let texture = {width:1136, height:700};//sprite._texture.baseTexture; - // TODO unwrap? const mappedMatrix = outputMatrix.identity(); @@ -43,7 +39,7 @@ { const orig = sprite._texture.orig; const mappedMatrix = outputMatrix.set(textureSize.width, 0, 0, textureSize.height, filterArea.x, filterArea.y); - const worldTransform = sprite.worldTransform.copy(Matrix.TEMP_MATRIX); + const worldTransform = sprite.worldTransform.copyTo(Matrix.TEMP_MATRIX); worldTransform.invert(); mappedMatrix.prepend(worldTransform); diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index cbd35d4..087a8cb 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -480,7 +480,7 @@ set position(value) // eslint-disable-line require-jsdoc { - this.transform.position.copy(value); + this.transform.position.copyFrom(value); } /** @@ -496,7 +496,7 @@ set scale(value) // eslint-disable-line require-jsdoc { - this.transform.scale.copy(value); + this.transform.scale.copyFrom(value); } /** @@ -512,7 +512,7 @@ set pivot(value) // eslint-disable-line require-jsdoc { - this.transform.pivot.copy(value); + this.transform.pivot.copyFrom(value); } /** @@ -528,7 +528,7 @@ set skew(value) // eslint-disable-line require-jsdoc { - this.transform.skew.copy(value); + this.transform.skew.copyFrom(value); } /** diff --git a/packages/math/src/Matrix.js b/packages/math/src/Matrix.js index 8c32e1a..ec14a67 100644 --- a/packages/math/src/Matrix.js +++ b/packages/math/src/Matrix.js @@ -454,10 +454,10 @@ /** * Changes the values of the given matrix to be the same as the ones in this matrix * - * @param {PIXI.Matrix} matrix - The matrix to copy from. + * @param {PIXI.Matrix} matrix - The matrix to copy to. * @return {PIXI.Matrix} The matrix given in parameter with its values updated. */ - copy(matrix) + copyTo(matrix) { matrix.a = this.a; matrix.b = this.b; @@ -470,6 +470,24 @@ } /** + * Changes the values of the matrix to be the same as the ones in given matrix + * + * @param {PIXI.Matrix} matrix - The matrix to copy from. + * @return {PIXI.Matrix} this + */ + copyFrom(matrix) + { + this.a = matrix.a; + this.b = matrix.b; + this.c = matrix.c; + this.d = matrix.d; + this.tx = matrix.tx; + this.ty = matrix.ty; + + return this; + } + + /** * A default (identity) matrix * * @static diff --git a/packages/math/src/ObservablePoint.js b/packages/math/src/ObservablePoint.js index fd5622d..c772ae7 100644 --- a/packages/math/src/ObservablePoint.js +++ b/packages/math/src/ObservablePoint.js @@ -44,18 +44,34 @@ } /** - * Copies the data from another point + * Copies x and y from the given point * - * @param {PIXI.Point|PIXI.ObservablePoint} point - point to copy from + * @param {PIXI.Point} p - The point to copy from. + * @returns Returns itself. */ - copy(point) + copyFrom(p) { - if (this._x !== point.x || this._y !== point.y) + if (this._x !== p.x || this._y !== p.y) { - this._x = point.x; - this._y = point.y; + this._x = p.x; + this._y = p.y; this.cb.call(this.scope); } + + return this; + } + + /** + * Copies x and y into the given point + * + * @param {PIXI.Point} p - The point to copy. + * @returns Given point with values updated + */ + copyTo(p) + { + p.set(this._x, this._y); + + return p; } /** diff --git a/packages/math/src/Point.js b/packages/math/src/Point.js index dcf239e..e123f60 100644 --- a/packages/math/src/Point.js +++ b/packages/math/src/Point.js @@ -39,11 +39,27 @@ /** * Copies x and y from the given point * - * @param {PIXI.Point} p - The point to copy. + * @param {PIXI.Point} p - The point to copy from + * @returns Returns itself. */ - copy(p) + copyFrom(p) { this.set(p.x, p.y); + + return this; + } + + /** + * Copies x and y into the given point + * + * @param {PIXI.Point} p - The point to copy. + * @returns Given point with values updated + */ + copyTo(p) + { + p.set(this.x, this.y); + + return p; } /** diff --git a/packages/math/src/shapes/Rectangle.js b/packages/math/src/shapes/Rectangle.js index 9176834..7233a23 100644 --- a/packages/math/src/shapes/Rectangle.js +++ b/packages/math/src/shapes/Rectangle.js @@ -116,10 +116,10 @@ /** * Copies another rectangle to this one. * - * @param {PIXI.Rectangle} rectangle - The rectangle to copy. + * @param {PIXI.Rectangle} rectangle - The rectangle to copy from. * @return {PIXI.Rectangle} Returns itself. */ - copy(rectangle) + copyFrom(rectangle) { this.x = rectangle.x; this.y = rectangle.y; @@ -130,6 +130,22 @@ } /** + * Copies this rectangle to another one. + * + * @param {PIXI.Rectangle} rectangle - The rectangle to copy to. + * @return {PIXI.Rectangle} Returns given parameter. + */ + copyTo(rectangle) + { + rectangle.x = this.x; + rectangle.y = this.y; + rectangle.width = this.width; + rectangle.height = this.height; + + return rectangle; + } + + /** * Checks whether the x and y coordinates given are contained within this Rectangle * * @param {number} x - The X coordinate of the point to test diff --git a/packages/math/test/ObservablePoint.js b/packages/math/test/ObservablePoint.js index 0ec97c8..3b2d249 100644 --- a/packages/math/test/ObservablePoint.js +++ b/packages/math/test/ObservablePoint.js @@ -42,11 +42,11 @@ const p2 = new ObservablePoint(cb, this, 5, 2); const p3 = new ObservablePoint(cb, this, 5, 6); - p1.copy(p2); + p1.copyFrom(p2); expect(p1.x).to.equal(p2.x); expect(p1.y).to.equal(p2.y); - p1.copy(p3); + p1.copyFrom(p3); expect(p1.y).to.equal(p3.y); }); }); diff --git a/packages/math/test/Point.js b/packages/math/test/Point.js index 8a7e8fa..cc9c7aa 100644 --- a/packages/math/test/Point.js +++ b/packages/math/test/Point.js @@ -30,7 +30,7 @@ const p1 = new Point(10, 20); const p2 = new Point(2, 5); - p1.copy(p2); + p1.copyFrom(p2); expect(p1.x).to.equal(2); expect(p1.y).to.equal(5); diff --git a/packages/math/test/Rectangle.js b/packages/math/test/Rectangle.js index aa586df..c96ebf9 100644 --- a/packages/math/test/Rectangle.js +++ b/packages/math/test/Rectangle.js @@ -45,7 +45,7 @@ const rect1 = new Rectangle(10, 10, 10, 10); const rect2 = new Rectangle(2, 2, 5, 5); - rect1.copy(rect2); + rect1.copyFrom(rect2); expect(rect1.x).to.equal(2); expect(rect1.y).to.equal(2); diff --git a/packages/mixin-cache-as-bitmap/src/index.js b/packages/mixin-cache-as-bitmap/src/index.js index 7fee376..18bcbbe 100644 --- a/packages/mixin-cache-as-bitmap/src/index.js +++ b/packages/mixin-cache-as-bitmap/src/index.js @@ -311,7 +311,7 @@ // need to set // const m = _tempMatrix; - this.transform.localTransform.copy(m); + this.transform.localTransform.copyTo(m); m.invert(); m.tx -= bounds.x; diff --git a/packages/particles/src/ParticleRenderer.js b/packages/particles/src/ParticleRenderer.js index 48a547d..a2ceaee 100644 --- a/packages/particles/src/ParticleRenderer.js +++ b/packages/particles/src/ParticleRenderer.js @@ -151,7 +151,7 @@ const gl = renderer.gl; - const m = container.worldTransform.copy(this.tempMatrix); + const m = container.worldTransform.copyTo(this.tempMatrix); m.prepend(renderer._activeRenderTarget.projectionMatrix); diff --git a/packages/sprite-tiling/src/TilingSprite.js b/packages/sprite-tiling/src/TilingSprite.js index d2f26c0..dc8dab6 100644 --- a/packages/sprite-tiling/src/TilingSprite.js +++ b/packages/sprite-tiling/src/TilingSprite.js @@ -110,7 +110,7 @@ set tileScale(value) // eslint-disable-line require-jsdoc { - this.tileTransform.scale.copy(value); + this.tileTransform.scale.copyFrom(value); } /** @@ -125,7 +125,7 @@ set tilePosition(value) // eslint-disable-line require-jsdoc { - this.tileTransform.position.copy(value); + this.tileTransform.position.copyFrom(value); } /** diff --git a/packages/sprite/src/Sprite.js b/packages/sprite/src/Sprite.js index ed53a42..d9b6dbc 100644 --- a/packages/sprite/src/Sprite.js +++ b/packages/sprite/src/Sprite.js @@ -532,7 +532,7 @@ set anchor(value) // eslint-disable-line require-jsdoc { - this._anchor.copy(value); + this._anchor.copyFrom(value); } /** diff --git a/packages/text-bitmap/src/BitmapText.js b/packages/text-bitmap/src/BitmapText.js index 0a6ab32..20fa06f 100644 --- a/packages/text-bitmap/src/BitmapText.js +++ b/packages/text-bitmap/src/BitmapText.js @@ -378,7 +378,7 @@ } else { - this._anchor.copy(value); + this._anchor.copyFrom(value); } }