Removed Pixi globals, and moved constructors above the prototype.

Author: photonstorm

src/gameobjects/Rope.js

@@ -754,7 +754,7 @@ Phaser.Rope.prototype.getBounds = function (matrix) {
 
     if (minX === -Infinity || maxY === Infinity)
     {
-        return PIXI.EmptyRectangle;
+        return Phaser.EmptyRectangle;
     }
 
     var bounds = this._bounds;

src/geom/Circle.js

@@ -55,6 +55,8 @@ Phaser.Circle = function (x, y, diameter) {
 
 };
 
+Phaser.Circle.prototype.constructor = Phaser.Circle;
+
 Phaser.Circle.prototype = {
 
     /**
@@ -253,8 +255,6 @@ Phaser.Circle.prototype = {
 
 };
 
-Phaser.Circle.prototype.constructor = Phaser.Circle;
-
 /**
 * The largest distance between any two points on the circle. The same as the radius * 2.
 * 
@@ -572,6 +572,3 @@ Phaser.Circle.intersectsRectangle = function (c, r) {
     return xCornerDistSq + yCornerDistSq <= maxCornerDistSq;
 
 };
-
-//   Because PIXI uses its own Circle, we'll replace it with ours to avoid duplicating code or confusion.
-PIXI.Circle = Phaser.Circle;

src/geom/Ellipse.js

@@ -50,6 +50,8 @@ Phaser.Ellipse = function (x, y, width, height) {
 
 };
 
+Phaser.Ellipse.prototype.constructor = Phaser.Ellipse;
+
 Phaser.Ellipse.prototype = {
 
     /**
@@ -185,8 +187,6 @@ Phaser.Ellipse.prototype = {
 
 };
 
-Phaser.Ellipse.prototype.constructor = Phaser.Ellipse;
-
 /**
 * The left coordinate of the Ellipse. The same as the X coordinate.
 * @name Phaser.Ellipse#left
@@ -321,6 +321,3 @@ Phaser.Ellipse.contains = function (a, x, y) {
     return (normx + normy < 0.25);
 
 };
-
-//   Because PIXI uses its own Ellipse, we'll replace it with ours to avoid duplicating code or confusion.
-PIXI.Ellipse = Phaser.Ellipse;

src/geom/Line.js

@@ -39,6 +39,8 @@ Phaser.Line = function (x1, y1, x2, y2) {
 
 };
 
+Phaser.Line.prototype.constructor = Phaser.Line;
+
 Phaser.Line.prototype = {
 
     /**

src/geom/Matrix.js

@@ -76,6 +76,8 @@ Phaser.Matrix = function (a, b, c, d, tx, ty) {
 
 };
 
+Phaser.Matrix.prototype.constructor = Phaser.Matrix;
+
 Phaser.Matrix.prototype = {
 
     /**

src/geom/Point.js

@@ -38,6 +38,8 @@ Phaser.Point = function (x, y) {
 
 };
 
+Phaser.Point.prototype.constructor = Phaser.Point;
+
 Phaser.Point.prototype = {
 
     /**
@@ -486,8 +488,6 @@ Phaser.Point.prototype = {
 
 };
 
-Phaser.Point.prototype.constructor = Phaser.Point;
-
 /**
 * Adds the coordinates of two points together to create a new point.
 *
@@ -901,6 +901,3 @@ Phaser.Point.parse = function(obj, xProp, yProp) {
     return point;
 
 };
-
-//   Because PIXI uses its own Point, we'll replace it with ours to avoid duplicating code or confusion.
-PIXI.Point = Phaser.Point;

src/geom/Polygon.js

@@ -56,6 +56,8 @@ Phaser.Polygon = function () {
 
 };
 
+Phaser.Polygon.prototype.constructor = Phaser.Polygon;
+
 Phaser.Polygon.prototype = {
 
     /**
@@ -222,16 +224,16 @@ Phaser.Polygon.prototype = {
             {
                 if (typeof points[i] === 'number')
                 {
-                    var p = new PIXI.Point(points[i], points[i + 1]);
+                    var p = new Phaser.Point(points[i], points[i + 1]);
                     i++;
                 }
                 else if (Array.isArray(points[i]))
                 {
-                    var p = new PIXI.Point(points[i][0], points[i][1]);
+                    var p = new Phaser.Point(points[i][0], points[i][1]);
                 }
                 else
                 {
-                    var p = new PIXI.Point(points[i].x, points[i].y);
+                    var p = new Phaser.Point(points[i].x, points[i].y);
                 }
 
                 this._points.push(p);
@@ -289,8 +291,6 @@ Phaser.Polygon.prototype = {
 
 };
 
-Phaser.Polygon.prototype.constructor = Phaser.Polygon;
-
 /**
 * Sets and modifies the points of this polygon.
 *
@@ -321,6 +321,3 @@ Object.defineProperty(Phaser.Polygon.prototype, 'points', {
     }
 
 });
-
-//  Because PIXI uses its own type, we'll replace it with ours to avoid duplicating code or confusion.
-PIXI.Polygon = Phaser.Polygon;

src/geom/Rectangle.js

@@ -50,6 +50,8 @@ Phaser.Rectangle = function (x, y, width, height) {
 
 };
 
+Phaser.Rectangle.prototype.constructor = Phaser.Rectangle;
+
 Phaser.Rectangle.prototype = {
 
     /**
@@ -756,8 +758,6 @@ Object.defineProperty(Phaser.Rectangle.prototype, "empty", {
 
 });
 
-Phaser.Rectangle.prototype.constructor = Phaser.Rectangle;
-
 /**
 * Increases the size of the Rectangle object by the specified amounts. The center point of the Rectangle object stays the same, and its size increases to the left and right by the dx value, and to the top and the bottom by the dy value.
 * @method Phaser.Rectangle.inflate
@@ -1053,7 +1053,3 @@ Phaser.Rectangle.aabb = function(points, out) {
 
     return out;
 };
-
-//   Because PIXI uses its own Rectangle, we'll replace it with ours to avoid duplicating code or confusion.
-PIXI.Rectangle = Phaser.Rectangle;
-PIXI.EmptyRectangle = new Phaser.Rectangle(0, 0, 0, 0);

src/geom/RoundedRectangle.js

@@ -57,6 +57,8 @@ Phaser.RoundedRectangle = function(x, y, width, height, radius)
     this.type = Phaser.ROUNDEDRECTANGLE;
 };
 
+Phaser.RoundedRectangle.prototype.constructor = Phaser.RoundedRectangle;
+
 Phaser.RoundedRectangle.prototype = {
 
     /**
@@ -104,8 +106,3 @@ Phaser.RoundedRectangle.prototype = {
     }
 
 };
-
-Phaser.RoundedRectangle.prototype.constructor = Phaser.RoundedRectangle;
-
-//  Because PIXI uses its own type, we'll replace it with ours to avoid duplicating code or confusion.
-PIXI.RoundedRectangle = Phaser.RoundedRectangle;

src/pixi/display/DisplayObject.js

@@ -26,7 +26,7 @@ PIXI.DisplayObject = function () {
     * @property {PIXI.Point} position
     * @default
     */
-    this.position = new PIXI.Point(0, 0);
+    this.position = new Phaser.Point(0, 0);
 
     /**
     * The scale of this DisplayObject. A scale of 1:1 represents the DisplayObject
@@ -38,15 +38,15 @@ PIXI.DisplayObject = function () {
     * @property {PIXI.Point} scale
     * @default
     */
-    this.scale = new PIXI.Point(1, 1);
+    this.scale = new Phaser.Point(1, 1);
 
     /**
     * The pivot point of this DisplayObject that it rotates around. The values are expressed
     * in pixel values.
     * @property {PIXI.Point} pivot
     * @default
     */
-    this.pivot = new PIXI.Point(0, 0);
+    this.pivot = new Phaser.Point(0, 0);
 
     /**
     * The rotation of this DisplayObject. The value is given, and expressed, in radians, and is based on
@@ -160,7 +160,7 @@ PIXI.DisplayObject = function () {
     * @property {PIXI.Point} worldPosition
     * @readOnly
     */
-    this.worldPosition = new PIXI.Point(0, 0);
+    this.worldPosition = new Phaser.Point(0, 0);
 
     /**
     * The global scale of this DisplayObject.
@@ -175,7 +175,7 @@ PIXI.DisplayObject = function () {
     * @property {PIXI.Point} worldScale
     * @readOnly
     */
-    this.worldScale = new PIXI.Point(1, 1);
+    this.worldScale = new Phaser.Point(1, 1);
 
     /**
     * The rotation, in radians, of this DisplayObject.
@@ -217,7 +217,7 @@ PIXI.DisplayObject = function () {
     * @property {PIXI.Rectangle} _bounds - The cached bounds of this object.
     * @private
     */
-    this._bounds = new PIXI.Rectangle(0, 0, 0, 0);
+    this._bounds = new Phaser.Rectangle(0, 0, 0, 0);
 
     /**
     * @property {PIXI.Rectangle} _currentBounds - The most recently calculated bounds of this object.