The P2.Body.onBeginContact arguments have changed. It now sends 5 arguments: The Phaser.P2.Body, the p2.Body, the p2 Shape from Body A, the p2 Shape from Body B and the contact equations array. Note that the Phaser.P2.Body may be null if you collide with a 'native' p2 body (such as the world bounds). However the p2.Body argument will always be populated.

The P2.Body.onEndContact arguments have changed. It now sends 4 arguments: The Phaser.P2.Body, the p2.Body, the p2 Shape from Body A and the p2 Shape from Body B. Note that the Phaser.P2.Body may be null if this is the end of a contact with a 'native' p2 body (such as the world bounds). However the p2.Body argument will always be populated.

Upgraded to p2.js 0.7.0

Author: photonstorm

README.md

@@ -245,6 +245,10 @@ Version 2.4 - "Katar" - in dev
 * Phaser.BitmapText no longer extends PIXI.BitmapText but replaces it entirely.
 * Phaser.Text no longer extends PIXI.Text but replaces it entirely. Phaser.Text now natively extends a Phaser Sprite, meaning it can be enabled for physics, damaged, etc.
 * Mouse.button and MSPointer.button have been removed. They never supported complex button events (such as holding down 2 buttons and releasing just one) or any buttons other than left and right. They have been replaced with the far more robust and accurate Pointer button properties such as `Pointer.leftButton`, `Pointer.rightButton` and so on.
+* The P2.Body.onBeginContact arguments have changed. It now sends 5 arguments: The Phaser.P2.Body, the p2.Body, the p2 Shape from Body A, the p2 Shape from Body B and the contact equations array. Note that the Phaser.P2.Body may be null if you collide with a 'native' p2 body (such as the world bounds). However the p2.Body argument will always be populated.
+* The P2.Body.onEndContact arguments have changed. It now sends 4 arguments: The Phaser.P2.Body, the p2.Body, the p2 Shape from Body A and the p2 Shape from Body B. Note that the Phaser.P2.Body may be null if this is the end of a contact with a 'native' p2 body (such as the world bounds). However the p2.Body argument will always be populated.
+
+### p2.js Upgraded to version 0.7
 
 ### New Features
 
@@ -513,7 +517,7 @@ The Phaser logo and characters are © 2015 Photon Storm Limited.
 
 All rights reserved.
 
-"The art challenges the technology, and the technology inspires the art." - John Lasseter
+"Above all, video games are meant to be just one thing: fun. Fun for everyone." - Satoru Iwata
 
 [![Analytics](https://ga-beacon.appspot.com/UA-44006568-2/phaser/index)](https://github.com/igrigorik/ga-beacon)
 

src/physics/p2/Body.js

@@ -76,15 +76,32 @@ Phaser.Physics.P2.Body = function (game, sprite, x, y, mass) {
     this.gravity = new Phaser.Point();
 
     /**
-    * Dispatched when a first contact is created between shapes in two bodies. This event is fired during the step, so collision has already taken place.
-    * The event will be sent 4 parameters: The body it is in contact with, the shape from this body that caused the contact, the shape from the contact body and the contact equation data array.
+    * Dispatched when a first contact is created between shapes in two bodies. 
+    * This event is fired during the step, so collision has already taken place.
+    * 
+    * The event will be sent 5 arguments in this order:
+    * 
+    * The Phaser.Physics.P2.Body it is in contact with. *This might be null* if the Body was created directly in the p2 world.
+    * The p2.Body this Body is in contact with.
+    * The Shape from this body that caused the contact.
+    * The Shape from the contact body.
+    * The Contact Equation data array.
+    * 
     * @property {Phaser.Signal} onBeginContact
     */
     this.onBeginContact = new Phaser.Signal();
 
     /**
-    * Dispatched when contact ends between shapes in two bodies. This event is fired during the step, so collision has already taken place.
-    * The event will be sent 3 parameters: The body it is in contact with, the shape from this body that caused the contact and the shape from the contact body.
+    * Dispatched when contact ends between shapes in two bodies.
+    * This event is fired during the step, so collision has already taken place.
+    * 
+    * The event will be sent 4 arguments in this order:
+    * 
+    * The Phaser.Physics.P2.Body it is in contact with. *This might be null* if the Body was created directly in the p2 world.
+    * The p2.Body this Body has ended contact with.
+    * The Shape from this body that caused the original contact.
+    * The Shape from the contact body.
+    * 
     * @property {Phaser.Signal} onEndContact
     */
     this.onEndContact = new Phaser.Signal();
@@ -861,7 +878,7 @@ Phaser.Physics.P2.Body.prototype = {
     */
     addCircle: function (radius, offsetX, offsetY, rotation) {
 
-        var shape = new p2.Circle(this.world.pxm(radius));
+        var shape = new p2.Circle({ radius: this.world.pxm(radius) });
 
         return this.addShape(shape, offsetX, offsetY, rotation);
 
@@ -876,11 +893,11 @@ Phaser.Physics.P2.Body.prototype = {
     * @param {number} [offsetX=0] - Local horizontal offset of the shape relative to the body center of mass.
     * @param {number} [offsetY=0] - Local vertical offset of the shape relative to the body center of mass.
     * @param {number} [rotation=0] - Local rotation of the shape relative to the body center of mass, specified in radians.
-    * @return {p2.Rectangle} The Rectangle shape that was added to the Body.
+    * @return {p2.Box} The shape that was added to the Body.
     */
     addRectangle: function (width, height, offsetX, offsetY, rotation) {
 
-        var shape = new p2.Rectangle(this.world.pxm(width), this.world.pxm(height));
+        var shape = new p2.Box({ width: this.world.pxm(width), height: this.world.pxm(height)});
 
         return this.addShape(shape, offsetX, offsetY, rotation);
 
@@ -934,7 +951,7 @@ Phaser.Physics.P2.Body.prototype = {
     */
     addLine: function (length, offsetX, offsetY, rotation) {
 
-        var shape = new p2.Line(this.world.pxm(length));
+        var shape = new p2.Line({ length: this.world.pxm(length)});
 
         return this.addShape(shape, offsetX, offsetY, rotation);
 
@@ -954,7 +971,7 @@ Phaser.Physics.P2.Body.prototype = {
     */
     addCapsule: function (length, radius, offsetX, offsetY, rotation) {
 
-        var shape = new p2.Capsule(this.world.pxm(length), this.world.pxm(radius));
+        var shape = new p2.Capsule({ length: this.world.pxm(length), radius: this.world.pxm(radius) });
 
         return this.addShape(shape, offsetX, offsetY, rotation);
 
@@ -1192,7 +1209,7 @@ Phaser.Physics.P2.Body.prototype = {
 
         if (fixtureData.circle)
         {
-            var shape = new p2.Circle(this.world.pxm(fixtureData.circle.radius));
+            var shape = new p2.Circle({ radius: this.world.pxm(fixtureData.circle.radius) });
             shape.collisionGroup = fixtureData.filter.categoryBits;
             shape.collisionMask = fixtureData.filter.maskBits;
             shape.sensor = fixtureData.isSensor;
@@ -1219,7 +1236,7 @@ Phaser.Physics.P2.Body.prototype = {
                     vertices.push([ this.world.pxmi(shapes[s]), this.world.pxmi(shapes[s + 1]) ]);
                 }
 
-                var shape = new p2.Convex(vertices);
+                var shape = new p2.Convex({ vertices: vertices });
 
                 //  Move all vertices so its center of mass is in the local center of the convex
                 for (var j = 0; j !== shape.vertices.length; j++)
@@ -1289,7 +1306,7 @@ Phaser.Physics.P2.Body.prototype = {
                 vertices.push([ this.world.pxmi(data[i].shape[s]), this.world.pxmi(data[i].shape[s + 1]) ]);
             }
 
-            var c = new p2.Convex(vertices);
+            var c = new p2.Convex({ vertices: vertices });
 
             // Move all vertices so its center of mass is in the local center of the convex
             for (var j = 0; j !== c.vertices.length; j++)

src/physics/p2/World.js

@@ -507,16 +507,19 @@ Phaser.Physics.P2.prototype = {
     */
     beginContactHandler: function (event) {
 
-        this.onBeginContact.dispatch(event.bodyA, event.bodyB, event.shapeA, event.shapeB, event.contactEquations);
-
-        if (event.bodyA.parent)
+        if (event.bodyA && event.bodyB)
         {
-            event.bodyA.parent.onBeginContact.dispatch(event.bodyB.parent, event.shapeA, event.shapeB, event.contactEquations);
-        }
+            this.onBeginContact.dispatch(event.bodyA, event.bodyB, event.shapeA, event.shapeB, event.contactEquations);
 
-        if (event.bodyB.parent)
-        {
-            event.bodyB.parent.onBeginContact.dispatch(event.bodyA.parent, event.shapeB, event.shapeA, event.contactEquations);
+            if (event.bodyA.parent)
+            {
+                event.bodyA.parent.onBeginContact.dispatch(event.bodyB.parent, event.bodyB, event.shapeA, event.shapeB, event.contactEquations);
+            }
+
+            if (event.bodyB.parent)
+            {
+                event.bodyB.parent.onBeginContact.dispatch(event.bodyA.parent, event.bodyA, event.shapeB, event.shapeA, event.contactEquations);
+            }
         }
 
     },
@@ -529,16 +532,19 @@ Phaser.Physics.P2.prototype = {
     */
     endContactHandler: function (event) {
 
-        this.onEndContact.dispatch(event.bodyA, event.bodyB, event.shapeA, event.shapeB);
-
-        if (event.bodyA.parent)
+        if (event.bodyA && event.bodyB)
         {
-            event.bodyA.parent.onEndContact.dispatch(event.bodyB.parent, event.shapeA, event.shapeB);
-        }
+            this.onEndContact.dispatch(event.bodyA, event.bodyB, event.shapeA, event.shapeB);
 
-        if (event.bodyB.parent)
-        {
-            event.bodyB.parent.onEndContact.dispatch(event.bodyA.parent, event.shapeB, event.shapeA);
+            if (event.bodyA.parent)
+            {
+                event.bodyA.parent.onEndContact.dispatch(event.bodyB.parent, event.bodyB, event.shapeA, event.shapeB);
+            }
+
+            if (event.bodyB.parent)
+            {
+                event.bodyB.parent.onEndContact.dispatch(event.bodyA.parent, event.bodyA, event.shapeB, event.shapeA);
+            }
         }
 
     },