Renamed data to geom to avoid DataManager clash. Added preDestroy.

Author: photonstorm

src/gameobjects/shape/Shape.js

@@ -72,7 +72,7 @@ var Shape = new Class({
          * @readonly
          * @since 3.13.0
          */
-        this.data = data;
+        this.geom = data;
 
         /**
          * Holds the polygon path data for filled rendering.
@@ -272,6 +272,21 @@ var Shape = new Class({
         this.closePath = value;
 
         return this;
+    },
+
+    /**
+     * Internal destroy handler, called as part of the destroy process.
+     *
+     * @method Phaser.GameObjects.Shape#preDestroy
+     * @protected
+     * @since 3.13.0
+     */
+    preDestroy: function ()
+    {
+        this.geom = null;
+        this._tempLine = null;
+        this.pathData = [];
+        this.pathIndexes = [];
     }
 
 });

src/gameobjects/shape/arc/Arc.js

@@ -94,7 +94,7 @@ var Arc = new Class({
         this._iterations = 0.01;
 
         this.setPosition(x, y);
-        this.setSize(this.data.radius, this.data.radius);
+        this.setSize(this.geom.radius, this.geom.radius);
 
         if (fillColor !== undefined)
         {
@@ -142,12 +142,12 @@ var Arc = new Class({
 
         get: function ()
         {
-            return this.data.radius;
+            return this.geom.radius;
         },
 
         set: function (value)
         {
-            this.data.radius = value;
+            this.geom.radius = value;
 
             this.updateData();
         }
@@ -323,7 +323,7 @@ var Arc = new Class({
         var step = this._iterations;
         var iteration = step;
 
-        var radius = this.data.radius;
+        var radius = this.geom.radius;
         var startAngle = DegToRad(this._startAngle);
         var endAngle = DegToRad(this._endAngle);
         var anticlockwise = this._anticlockwise;

src/gameobjects/shape/curve/Curve.js

@@ -136,13 +136,13 @@ var Curve = new Class({
         var smoothness = this._smoothness;
 
         //  Update the bounds in case the underlying data has changed
-        this.data.getBounds(bounds, smoothness);
+        this.geom.getBounds(bounds, smoothness);
 
         this.setSize(bounds.width, bounds.height);
         this.updateDisplayOrigin();
 
         var path = [];
-        var points = this.data.getPoints(smoothness);
+        var points = this.geom.getPoints(smoothness);
 
         for (var i = 0; i < points.length; i++)
         {

src/gameobjects/shape/ellipse/Ellipse.js

@@ -108,7 +108,7 @@ var Ellipse = new Class({
      */
     setSize: function (width, height)
     {
-        this.data.setSize(width, height);
+        this.geom.setSize(width, height);
 
         return this.updateData();
     },
@@ -144,7 +144,7 @@ var Ellipse = new Class({
     updateData: function ()
     {
         var path = [];
-        var points = this.data.getPoints(this._smoothness);
+        var points = this.geom.getPoints(this._smoothness);
 
         for (var i = 0; i < points.length; i++)
         {

src/gameobjects/shape/line/Line.js

@@ -49,8 +49,8 @@ var Line = new Class({
 
         Shape.call(this, scene, 'Line', new GeomLine(x1, y1, x2, y2));
 
-        var width = this.data.right - this.data.left;
-        var height = this.data.bottom - this.data.top;
+        var width = this.geom.right - this.geom.left;
+        var height = this.geom.bottom - this.geom.top;
 
         /**
          * Private internal value. Holds the start width of the line.
@@ -126,7 +126,7 @@ var Line = new Class({
      */
     setTo: function (x1, y1, x2, y2)
     {
-        this.data.setTo(x1, y1, x2, y2);
+        this.geom.setTo(x1, y1, x2, y2);
 
         return this;
     }

src/gameobjects/shape/polygon/Polygon.js

@@ -45,7 +45,7 @@ var Polygon = new Class({
 
         Shape.call(this, scene, 'Polygon', new GeomPolygon(points));
 
-        var bounds = GetAABB(this.data);
+        var bounds = GetAABB(this.geom);
 
         this.setPosition(x, y);
         this.setSize(bounds.width, bounds.height);
@@ -77,7 +77,7 @@ var Polygon = new Class({
 
         for (var i = 0; i < iterations; i++)
         {
-            Smooth(this.data);
+            Smooth(this.geom);
         }
 
         return this.updateData();
@@ -95,7 +95,7 @@ var Polygon = new Class({
     updateData: function ()
     {
         var path = [];
-        var points = this.data.points;
+        var points = this.geom.points;
 
         for (var i = 0; i < points.length; i++)
         {

src/gameobjects/shape/rectangle/Rectangle.js

@@ -69,7 +69,7 @@ var Rectangle = new Class({
     updateData: function ()
     {
         var path = [];
-        var rect = this.data;
+        var rect = this.geom;
         var line = this._tempLine;
 
         rect.getLineA(line);

src/gameobjects/shape/triangle/Triangle.js

@@ -53,8 +53,8 @@ var Triangle = new Class({
 
         Shape.call(this, scene, 'Triangle', new GeomTriangle(x1, y1, x2, y2, x3, y3));
 
-        var width = this.data.right - this.data.left;
-        var height = this.data.bottom - this.data.top;
+        var width = this.geom.right - this.geom.left;
+        var height = this.geom.bottom - this.geom.top;
 
         this.setPosition(x, y);
         this.setSize(width, height);
@@ -85,7 +85,7 @@ var Triangle = new Class({
      */
     setTo: function (x1, y1, x2, y2, x3, y3)
     {
-        this.data.setTo(x1, y1, x2, y2, x3, y3);
+        this.geom.setTo(x1, y1, x2, y2, x3, y3);
 
         return this.updateData();
     },
@@ -102,7 +102,7 @@ var Triangle = new Class({
     updateData: function ()
     {
         var path = [];
-        var rect = this.data;
+        var rect = this.geom;
         var line = this._tempLine;
 
         rect.getLineA(line);