diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 2b1f183..c601b7e 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -698,8 +698,8 @@ { this.geometry.drawShape( shape, - this._fillStyle.toJSON(), - this._lineStyle.toJSON(), + this._fillStyle.clone(), + this._lineStyle.clone(), this._matrix ); } diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 2b1f183..c601b7e 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -698,8 +698,8 @@ { this.geometry.drawShape( shape, - this._fillStyle.toJSON(), - this._lineStyle.toJSON(), + this._fillStyle.clone(), + this._lineStyle.clone(), this._matrix ); } diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 14cc66e..f8c31f7 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -13,19 +13,21 @@ } /** - * Convert the object to JSON + * Clones the object * - * @return {object} + * @return {PIXI.FillStyle} */ - toJSON() + clone() { - return { - color: this.color, - alpha: this.alpha, - texture: this.texture, - matrix: this.matrix, - visible: this.visible, - }; + const obj = new FillStyle(); + + obj.color = this.color; + obj.alpha = this.alpha; + obj.texture = this.texture; + obj.matrix = this.matrix; + obj.visible = this.visible; + + return obj; } /** diff --git a/packages/graphics/src/Graphics.js b/packages/graphics/src/Graphics.js index 2b1f183..c601b7e 100644 --- a/packages/graphics/src/Graphics.js +++ b/packages/graphics/src/Graphics.js @@ -698,8 +698,8 @@ { this.geometry.drawShape( shape, - this._fillStyle.toJSON(), - this._lineStyle.toJSON(), + this._fillStyle.clone(), + this._lineStyle.clone(), this._matrix ); } diff --git a/packages/graphics/src/styles/FillStyle.js b/packages/graphics/src/styles/FillStyle.js index 14cc66e..f8c31f7 100644 --- a/packages/graphics/src/styles/FillStyle.js +++ b/packages/graphics/src/styles/FillStyle.js @@ -13,19 +13,21 @@ } /** - * Convert the object to JSON + * Clones the object * - * @return {object} + * @return {PIXI.FillStyle} */ - toJSON() + clone() { - return { - color: this.color, - alpha: this.alpha, - texture: this.texture, - matrix: this.matrix, - visible: this.visible, - }; + const obj = new FillStyle(); + + obj.color = this.color; + obj.alpha = this.alpha; + obj.texture = this.texture; + obj.matrix = this.matrix; + obj.visible = this.visible; + + return obj; } /** diff --git a/packages/graphics/src/styles/LineStyle.js b/packages/graphics/src/styles/LineStyle.js index 32a36e7..b746069 100644 --- a/packages/graphics/src/styles/LineStyle.js +++ b/packages/graphics/src/styles/LineStyle.js @@ -9,24 +9,25 @@ export default class LineStyle extends FillStyle { /** - * Convert the object to JSON + * Clones the object * - * @return {object} + * @return {PIXI.LineStyle} */ - toJSON() + clone() { - return { - color: this.color, - alpha: this.alpha, - texture: this.texture, - matrix: this.matrix, - visible: this.visible, - width: this.width, - alignment: this.alignment, - native: this.native, - }; - } + const obj = new LineStyle(); + obj.color = this.color; + obj.alpha = this.alpha; + obj.texture = this.texture; + obj.matrix = this.matrix; + obj.visible = this.visible; + obj.width = this.width; + obj.alignment = this.alignment; + obj.native = this.native; + + return obj; + } /** * Reset the line style to default. */