Updated Phaser geometry classes so they over-ride the PIXI native ones, means we can do away with a whole bunch of over-rides and object changes in Sprite, etc.

Author: photonstorm

build/config.php

@@ -38,6 +38,12 @@
     <script src="$path/src/pixi/extras/Spine.js"></script>
 
     <script src="$path/src/pixi/utils/Utils.js"></script>
+
+    <script src="$path/src/pixi/core/Point.js"></script>
+    <script src="$path/src/pixi/core/Rectangle.js"></script>
+    <script src="$path/src/pixi/core/Circle.js"></script>
+
+    <script src="$path/src/pixi/utils/Detector.js"></script>
     
 */
 
@@ -48,11 +54,13 @@
     <script src="$path/src/Phaser.js"></script>
     <script src="$path/src/utils/Utils.js"></script>
 
+    <script src="$path/src/geom/Circle.js"></script>
+    <script src="$path/src/geom/Point.js"></script>
+    <script src="$path/src/geom/Rectangle.js"></script>
+    <script src="$path/src/geom/Line.js"></script>
+
     <script src="$path/src/pixi/Pixi.js"></script>
-    <script src="$path/src/pixi/core/Point.js"></script>
-    <script src="$path/src/pixi/core/Rectangle.js"></script>
     <script src="$path/src/pixi/core/Polygon.js"></script>
-    <script src="$path/src/pixi/core/Circle.js"></script>
     <script src="$path/src/pixi/core/Ellipse.js"></script>
     <script src="$path/src/pixi/core/Matrix.js"></script>
     <script src="$path/src/pixi/display/DisplayObject.js"></script>
@@ -65,7 +73,6 @@
     <script src="$path/src/pixi/text/BitmapText.js"></script>
     <script src="$path/src/pixi/display/Stage.js"></script>
     <script src="$path/src/pixi/utils/EventTarget.js"></script>
-    <script src="$path/src/pixi/utils/Detector.js"></script>
     <script src="$path/src/pixi/utils/Polyk.js"></script>
     <script src="$path/src/pixi/renderers/webgl/utils/WebGLShaderUtils.js"></script>
     <script src="$path/src/pixi/renderers/webgl/shaders/PixiShader.js"></script>
@@ -138,10 +145,6 @@
     <script src="$path/src/math/Math.js"></script>
     <script src="$path/src/math/QuadTree.js"></script>
 
-    <script src="$path/src/geom/Circle.js"></script>
-    <script src="$path/src/geom/Point.js"></script>
-    <script src="$path/src/geom/Rectangle.js"></script>
-    <script src="$path/src/geom/Line.js"></script>
 
     <script src="$path/src/net/Net.js"></script>
 

examples/wip/pixi1.js

@@ -10,6 +10,7 @@ function preload() {
 var sprite;
 var sprite2;
 var g;
+var p;
 
 function create() {
 
@@ -28,6 +29,8 @@ function create() {
 
 	game.add.tween(sprite).to({y: 500}, 3000, Phaser.Easing.Linear.None, true);
 
+	p = new PIXI.Point(43, 45);
+
 }
 
 function tint() {

src/Phaser.js

@@ -44,7 +44,7 @@ var Phaser = Phaser || {
 	CANVAS_PX_ROUND: false,
 	CANVAS_CLEAR_RECT: true
 
- };
+};
 
 PIXI.InteractionManager = function (dummy) {
 	//	We don't need this in Pixi, so we've removed it to save space

src/geom/Circle.js

@@ -132,9 +132,16 @@ Phaser.Circle.prototype = {
     */
     clone: function(out) {
 
-        if (typeof out === "undefined") { out = new Phaser.Circle(); }
+        if (typeof out === "undefined")
+        {
+            out = new Phaser.Circle(this.x, this.y, this.diameter);
+        }
+        else
+        {
+            out.setTo(this.x, this.y, this.diameter);
+        }
 
-        return out.setTo(this.x, this.y, this.diameter);
+        return out;
 
     },
 
@@ -377,14 +384,18 @@ Object.defineProperty(Phaser.Circle.prototype, "empty", {
 */
 Phaser.Circle.contains = function (a, x, y) {
 
-    //  Check if x/y are within the bounds first
-    if (x >= a.left && x <= a.right && y >= a.top && y <= a.bottom) {
+    if (a.radius <= 0)
+    {
+        return false;
+    }
 
+    //  Check if x/y are within the bounds first
+    if (x >= a.left && x <= a.right && y >= a.top && y <= a.bottom)
+    {
         var dx = (a.x - x) * (a.x - x);
         var dy = (a.y - y) * (a.y - y);
 
         return (dx + dy) <= (a.radius * a.radius);
-
     }
 
     return false;
@@ -475,3 +486,6 @@ 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/Point.js

@@ -59,8 +59,25 @@ Phaser.Point.prototype = {
     */
     setTo: function (x, y) {
 
-        this.x = x;
-        this.y = y;
+        this.x = x || 0;
+        this.y = y || ( (y !== 0) ? this.x : 0 );
+
+        return this;
+        
+    },
+
+    /**
+    * Sets the x and y values of this Point object to the given coordinates.
+    * @method Phaser.Point#set
+    * @param {number} x - The horizontal position of this point.
+    * @param {number} y - The vertical position of this point.
+    * @return {Point} This Point object. Useful for chaining method calls.
+    */
+    set: function (x, y) {
+
+        this.x = x || 0;
+        this.y = y || ( (y !== 0) ? this.x : 0 );
+
         return this;
 
     },
@@ -176,9 +193,16 @@ Phaser.Point.prototype = {
     */
     clone: function (output) {
 
-        if (typeof output === "undefined") { output = new Phaser.Point(); }
+        if (typeof output === "undefined")
+        {
+            output = new Phaser.Point(this.x, this.y);
+        }
+        else
+        {
+            output.setTo(this.x, this.y);
+        }
 
-        return output.setTo(this.x, this.y);
+        return output;
 
     },
 
@@ -430,3 +454,6 @@ Phaser.Point.rotate = function (a, x, y, angle, asDegrees, distance) {
     return a.setTo(x + distance * Math.cos(angle), y + distance * Math.sin(angle));
 
 };
+
+//   Because PIXI uses its own Point, we'll replace it with ours to avoid duplicating code or confusion.
+PIXI.Point = Phaser.Point;