Added Matter collision events

Author: photonstorm

v3/src/physics/matter-js/World.js

@@ -3,9 +3,13 @@
 var Bodies = require('./lib/factory/Bodies');
 var Class = require('../../utils/Class');
 var Engine = require('./lib/core/Engine');
-var GetValue = require('../../utils/object/GetValue');
+var EventDispatcher = require('../../events/EventDispatcher');
 var GetFastValue = require('../../utils/object/GetFastValue');
+var GetValue = require('../../utils/object/GetValue');
+var MatterBody = require('./lib/body/Body');
+var MatterEvents = require('./lib/core/Events');
 var MatterWorld = require('./lib/body/World');
+var PhysicsEvent = require('./events/');
 
 var World = new Class({
 
@@ -19,8 +23,7 @@ var World = new Class({
 
         this.localWorld = this.engine.world;
 
-        //  Map to World events
-        this.events = scene.sys.events;
+        this.events = new EventDispatcher();
 
         var gravity = GetValue(config, 'gravity', null);
 
@@ -57,6 +60,31 @@ var World = new Class({
                 this.setBounds(x, y, width, height, thickness, left, right, top, bottom);
             }
         }
+
+        this.setEventsProxy();
+    },
+
+    setEventsProxy: function ()
+    {
+        var localEvents = this.events;
+
+        MatterEvents.on(this.engine, 'collisionStart', function (event) {
+
+            localEvents.dispatch(new PhysicsEvent.COLLISION_START(event.pairs));
+
+        });
+
+        MatterEvents.on(this.engine, 'collisionActive', function (event) {
+
+            localEvents.dispatch(new PhysicsEvent.COLLISION_ACTIVE(event));
+
+        });
+
+        MatterEvents.on(this.engine, 'collisionEnd', function (event) {
+
+            localEvents.dispatch(new PhysicsEvent.COLLISION_END(event));
+
+        });
     },
 
     /**
@@ -156,6 +184,16 @@ var World = new Class({
         return this;
     },
 
+    nextGroup: function (isNonColliding)
+    {
+        return Body.nextGroup(isNonColliding);
+    },
+
+    nextCategory: function ()
+    {
+        return MatterBody.nextCategory();
+    },
+
     update: function (time, delta)
     {
         var correction = 1;

v3/src/physics/matter-js/events/CollisionActiveEvent.js

@@ -0,0 +1,25 @@
+var Class = require('../../../utils/Class');
+var Event = require('../../../events/Event');
+
+var CollisionActiveEvent = new Class({
+
+    Extends: Event,
+
+    initialize:
+
+    function CollisionActiveEvent (pairs)
+    {
+        Event.call(this, 'COLLISION_ACTIVE_EVENT');
+
+        this.pairs = pairs;
+
+        if (pairs.length === 1)
+        {
+            this.bodyA = pairs[0].bodyA;
+            this.bodyB = pairs[0].bodyB;
+        }
+    }
+
+});
+
+module.exports = CollisionActiveEvent;

v3/src/physics/matter-js/events/CollisionEndEvent.js

@@ -0,0 +1,25 @@
+var Class = require('../../../utils/Class');
+var Event = require('../../../events/Event');
+
+var CollisionEndEvent = new Class({
+
+    Extends: Event,
+
+    initialize:
+
+    function CollisionEndEvent (pairs)
+    {
+        Event.call(this, 'COLLISION_END_EVENT');
+
+        this.pairs = pairs;
+
+        if (pairs.length === 1)
+        {
+            this.bodyA = pairs[0].bodyA;
+            this.bodyB = pairs[0].bodyB;
+        }
+    }
+
+});
+
+module.exports = CollisionEndEvent;

v3/src/physics/matter-js/events/CollisionStartEvent.js

@@ -0,0 +1,25 @@
+var Class = require('../../../utils/Class');
+var Event = require('../../../events/Event');
+
+var CollisionStartEvent = new Class({
+
+    Extends: Event,
+
+    initialize:
+
+    function CollisionStartEvent (pairs)
+    {
+        Event.call(this, 'COLLISION_START_EVENT');
+
+        this.pairs = pairs;
+
+        if (pairs.length === 1)
+        {
+            this.bodyA = pairs[0].bodyA;
+            this.bodyB = pairs[0].bodyB;
+        }
+    }
+
+});
+
+module.exports = CollisionStartEvent;

v3/src/physics/matter-js/events/index.js

@@ -0,0 +1,9 @@
+//  Phaser.Physics.Matter.Events
+
+module.exports = {
+
+    COLLISION_ACTIVE: require('./CollisionActiveEvent'),
+    COLLISION_END: require('./CollisionEndEvent'),
+    COLLISION_START: require('./CollisionStartEvent')
+
+};

v3/src/physics/matter-js/index.js

@@ -2,57 +2,4 @@
 
 var Matter = require('./lib/module/main');
 
-//  Add Phaser specific helpers to the Matter global
-
-// Matter.Phaser.
-
 module.exports = Matter;
-
-/*
-module.exports = {
-
-    Body: require('./Body'),
-    Factory: require('./Factory'),
-    // Group: require('./PhysicsGroup'),
-    // Image: require('./MatterImage'),
-    // Sprite: require('./MatterSprite'),
-    World: require('./World'),
-
-    Global: {
-
-        Body: require('./body/Body'),
-        Composite: require('./body/Composite'),
-        World: require('./body/World'),
-
-        Contact: require('./collision/Contact'),
-        Detector: require('./collision/Detector'),
-        Grid: require('./collision/Grid'),
-        Pairs: require('./collision/Pairs'),
-        Pair: require('./collision/Pair'),
-        Query: require('./collision/Query'),
-        Resolver: require('./collision/Resolver'),
-        SAT: require('./collision/SAT'),
-
-        Constraint: require('./constraint/Constraint'),
-        MouseConstraint: require('./constraint/MouseConstraint'),
-
-        Common: require('./core/Common'),
-        Engine: require('./core/Engine'),
-        Events: require('./core/Events'),
-        Mouse: require('./core/Mouse'),
-        Sleeping: require('./core/Sleeping'),
-        Plugin: require('./core/Plugin'),
-
-        Bodies: require('./factory/Bodies'),
-        Composites: require('./factory/Composites'),
-
-        Axes: require('./geometry/Axes'),
-        Bounds: require('./geometry/Bounds'),
-        Svg: require('./geometry/Svg'),
-        Vector: require('./geometry/Vector'),
-        Vertices: require('./geometry/Vertices')
-
-    }
-  
-};
-*/