Matter updated to 0.14.2. Fix phaserjs#3929

Author: photonstorm

CHANGELOG.md

@@ -99,6 +99,23 @@ The four draw orders are:
 * ParseJSONTiled now extracts the `renderorder` property from the Tiled JSON.
 * MapData has a new `renderOrder` property, which is populated by the Tiled Parser.
 
+### Matter.js Updates
+
+The version of Matter.js used by Phaser has been updated from 0.13.1 to 0.14.2. To clarify why we don't include Matter via npm, it's because we use a customized version of Matter that includes extra features and optimizations not yet found in the official library.
+
+Most of the updates were about documentation and module namespacing, however those relevant to Phaser are listed below. You can also view the full [Matter Change Log](https://github.com/liabru/matter-js/blob/master/CHANGELOG.md).
+
+* fix Composite.bounds global issue, closes #627, closes #544 ([f7f77b4](https://github.com/liabru/matter-js/commit/f7f77b4)), closes [#627](https://github.com/liabru/matter-js/issues/627) [#544](https://github.com/liabru/matter-js/issues/544)
+* updated pathseg library, closes #548, closes #602, closes #424 ([1e5758f](https://github.com/liabru/matter-js/commit/1e5758f)), closes [#548](https://github.com/liabru/matter-js/issues/548) [#602](https://github.com/liabru/matter-js/issues/602) [#424](https://github.com/liabru/matter-js/issues/424)
+* fix Common.isElement on node, closes #535 ([ec38eeb](https://github.com/liabru/matter-js/commit/ec38eeb)), closes [#535](https://github.com/liabru/matter-js/issues/535)
+* added Query.collides, closes #478 ([6593a72](https://github.com/liabru/matter-js/commit/6593a72)), closes [#478](https://github.com/liabru/matter-js/issues/478)
+* fix `point` argument of Body.scale, closes #428 ([894c1ef](https://github.com/liabru/matter-js/commit/894c1ef)), closes [#428](https://github.com/liabru/matter-js/issues/428)
+* fix Body.scale for compound bodies ([50a89d0](https://github.com/liabru/matter-js/commit/50a89d0))
+* fix centroid for static compound bodies, closes #483 ([ece66e6](https://github.com/liabru/matter-js/commit/ece66e6)), closes [#483](https://github.com/liabru/matter-js/issues/483)
+* fix Common.isElement, closes #501, closes #507, closes #459, closes #468, closes #517 ([18a0845](https://github.com/liabru/matter-js/commit/18a0845)), closes [#501](https://github.com/liabru/matter-js/issues/501) [#507](https://github.com/liabru/matter-js/issues/507) [#459](https://github.com/liabru/matter-js/issues/459) [#468](https://github.com/liabru/matter-js/issues/468) [#517](https://github.com/liabru/matter-js/issues/517)
+* fix inertia change in Body.setMass, closes #378 ([f7d1877](https://github.com/liabru/matter-js/commit/f7d1877)), closes [#378](https://github.com/liabru/matter-js/issues/378)
+* fix Vertices.chamfer radius argument, closes #467 ([3bceef4](https://github.com/liabru/matter-js/commit/3bceef4)), closes [#467](https://github.com/liabru/matter-js/issues/467)
+
 ### New Features
 
 * `Camera.resolution` is a new read-only property that holds the current game config resolution that the camera is using. This is used internally for viewport calculations.

src/physics/matter-js/lib/body/Body.js

@@ -184,11 +184,11 @@ var Axes = require('../geometry/Axes');
      * Prefer to use the actual setter functions in performance critical situations.
      * @method set
      * @param {body} body
-     * @param {object} settings A map of properties and values to set on the body.
+     * @param {} settings A property name (or map of properties and values) to set on the body.
+     * @param {} value The value to set if `settings` is a single property name.
      */
-    Body.set = function(body, settings) {
-        var property,
-            value;
+    Body.set = function(body, settings, value) {
+        var property;
 
         if (typeof settings === 'string') {
             property = settings;
@@ -417,7 +417,7 @@ var Axes = require('../geometry/Axes');
         }
 
         // sum the properties of all compound parts of the parent body
-        var total = _totalProperties(body);
+        var total = Body._totalProperties(body);
 
         body.area = total.area;
         body.parent = body;
@@ -543,35 +543,50 @@ var Axes = require('../geometry/Axes');
      * @param {vector} [point]
      */
     Body.scale = function(body, scaleX, scaleY, point) {
+        var totalArea = 0,
+            totalInertia = 0;
+
         point = point || body.position;
 
         for (var i = 0; i < body.parts.length; i++) {
             var part = body.parts[i];
 
-            // scale position
-            part.position.x = point.x + (part.position.x - point.x) * scaleX;
-            part.position.y = point.y + (part.position.y - point.y) * scaleY;
-
             // scale vertices
             Vertices.scale(part.vertices, scaleX, scaleY, point);
 
             // update properties
             part.axes = Axes.fromVertices(part.vertices);
+            part.area = Vertices.area(part.vertices);
+            Body.setMass(part, body.density * part.area);
 
-            if (!body.isStatic) {
-                part.area = Vertices.area(part.vertices);
-                Body.setMass(part, body.density * part.area);
+            // update inertia (requires vertices to be at origin)
+            Vertices.translate(part.vertices, { x: -part.position.x, y: -part.position.y });
+            Body.setInertia(part, Body._inertiaScale * Vertices.inertia(part.vertices, part.mass));
+            Vertices.translate(part.vertices, { x: part.position.x, y: part.position.y });
 
-                // update inertia (requires vertices to be at origin)
-                Vertices.translate(part.vertices, { x: -part.position.x, y: -part.position.y });
-                Body.setInertia(part, Vertices.inertia(part.vertices, part.mass));
-                Vertices.translate(part.vertices, { x: part.position.x, y: part.position.y });
+            if (i > 0) {
+                totalArea += part.area;
+                totalInertia += part.inertia;
             }
 
+            // scale position
+            part.position.x = point.x + (part.position.x - point.x) * scaleX;
+            part.position.y = point.y + (part.position.y - point.y) * scaleY;
+
             // update bounds
             Bounds.update(part.bounds, part.vertices, body.velocity);
         }
 
+        // handle parent body
+        if (body.parts.length > 1) {
+            body.area = totalArea;
+
+            if (!body.isStatic) {
+                Body.setMass(body, body.density * totalArea);
+                Body.setInertia(body, totalInertia);
+            }
+        }
+
         // handle circles
         if (body.circleRadius) { 
             if (scaleX === scaleY) {
@@ -581,13 +596,6 @@ var Axes = require('../geometry/Axes');
                 body.circleRadius = null;
             }
         }
-
-        if (!body.isStatic) {
-            var total = _totalProperties(body);
-            body.area = total.area;
-            Body.setMass(body, total.mass);
-            Body.setInertia(body, total.inertia);
-        }
     };
 
     /**
@@ -668,7 +676,7 @@ var Axes = require('../geometry/Axes');
      * @param {body} body
      * @return {}
      */
-    var _totalProperties = function(body) {
+    Body._totalProperties = function(body) {
         // from equations at:
         // https://ecourses.ou.edu/cgi-bin/ebook.cgi?doc=&topic=st&chap_sec=07.2&page=theory
         // http://output.to/sideway/default.asp?qno=121100087
@@ -685,7 +693,7 @@ var Axes = require('../geometry/Axes');
             var part = body.parts[i],
                 mass = part.mass !== Infinity ? part.mass : 1;
 
-            properties.mass += part.mass;
+            properties.mass += mass;
             properties.area += part.area;
             properties.inertia += part.inertia;
             properties.centre = Vector.add(properties.centre, Vector.mult(part.position, mass));

src/physics/matter-js/lib/body/Composite.js

@@ -15,6 +15,7 @@ module.exports = Composite;
 
 var Events = require('../core/Events');
 var Common = require('../core/Common');
+var Bounds = require('../geometry/Bounds');
 var Body = require('./Body');
 
 (function() {
@@ -539,15 +540,15 @@ var Body = require('./Body');
      * @returns {bounds} The composite bounds.
      */
     Composite.bounds = function(composite) {
-        var bodies = Matter.Composite.allBodies(composite),
+        var bodies = Composite.allBodies(composite),
             vertices = [];
 
         for (var i = 0; i < bodies.length; i += 1) {
             var body = bodies[i];
             vertices.push(body.bounds.min, body.bounds.max);
         }
 
-        return Matter.Bounds.create(vertices);
+        return Bounds.create(vertices);
     };
 
     /*

src/physics/matter-js/lib/body/World.js

@@ -96,6 +96,23 @@ var Common = require('../core/Common');
     // World is a Composite body
     // see src/module/Outro.js for these aliases:
 
+    /**
+     * An alias for Composite.add
+     * @method add
+     * @param {world} world
+     * @param {} object
+     * @return {composite} The original world with the objects added
+     */
+
+    /**
+     * An alias for Composite.remove
+     * @method remove
+     * @param {world} world
+     * @param {} object
+     * @param {boolean} [deep=false]
+     * @return {composite} The original world with the objects removed
+     */
+
     /**
      * An alias for Composite.clear
      * @method clear
@@ -104,7 +121,7 @@ var Common = require('../core/Common');
      */
 
     /**
-     * An alias for Composite.add
+     * An alias for Composite.addComposite
      * @method addComposite
      * @param {world} world
      * @param {composite} composite

src/physics/matter-js/lib/collision/Grid.js

@@ -82,7 +82,7 @@ var Common = require('../core/Common');
                 || body.bounds.max.y < world.bounds.min.y || body.bounds.min.y > world.bounds.max.y)
                 continue;
 
-            var newRegion = _getRegion(grid, body);
+            var newRegion = Grid._getRegion(grid, body);
 
             // if the body has changed grid region
             if (!body.region || newRegion.id !== body.region.id || forceUpdate) {
@@ -94,13 +94,13 @@ var Common = require('../core/Common');
                 if (!body.region || forceUpdate)
                     body.region = newRegion;
 
-                var union = _regionUnion(newRegion, body.region);
+                var union = Grid._regionUnion(newRegion, body.region);
 
                 // update grid buckets affected by region change
                 // iterate over the union of both regions
                 for (col = union.startCol; col <= union.endCol; col++) {
                     for (row = union.startRow; row <= union.endRow; row++) {
-                        bucketId = _getBucketId(col, row);
+                        bucketId = Grid._getBucketId(col, row);
                         bucket = buckets[bucketId];
 
                         var isInsideNewRegion = (col >= newRegion.startCol && col <= newRegion.endCol
@@ -113,15 +113,15 @@ var Common = require('../core/Common');
                         if (!isInsideNewRegion && isInsideOldRegion) {
                             if (isInsideOldRegion) {
                                 if (bucket)
-                                    _bucketRemoveBody(grid, bucket, body);
+                                    Grid._bucketRemoveBody(grid, bucket, body);
                             }
                         }
 
                         // add to new region buckets
                         if (body.region === newRegion || (isInsideNewRegion && !isInsideOldRegion) || forceUpdate) {
                             if (!bucket)
-                                bucket = _createBucket(buckets, bucketId);
-                            _bucketAddBody(grid, bucket, body);
+                                bucket = Grid._createBucket(buckets, bucketId);
+                            Grid._bucketAddBody(grid, bucket, body);
                         }
                     }
                 }
@@ -136,7 +136,7 @@ var Common = require('../core/Common');
 
         // update pairs list only if pairs changed (i.e. a body changed region)
         if (gridChanged)
-            grid.pairsList = _createActivePairsList(grid);
+            grid.pairsList = Grid._createActivePairsList(grid);
     };
 
     /**
@@ -158,13 +158,13 @@ var Common = require('../core/Common');
      * @param {} regionB
      * @return {} region
      */
-    var _regionUnion = function(regionA, regionB) {
+    Grid._regionUnion = function(regionA, regionB) {
         var startCol = Math.min(regionA.startCol, regionB.startCol),
             endCol = Math.max(regionA.endCol, regionB.endCol),
             startRow = Math.min(regionA.startRow, regionB.startRow),
             endRow = Math.max(regionA.endRow, regionB.endRow);
 
-        return _createRegion(startCol, endCol, startRow, endRow);
+        return Grid._createRegion(startCol, endCol, startRow, endRow);
     };
 
     /**
@@ -175,14 +175,14 @@ var Common = require('../core/Common');
      * @param {} body
      * @return {} region
      */
-    var _getRegion = function(grid, body) {
+    Grid._getRegion = function(grid, body) {
         var bounds = body.bounds,
             startCol = Math.floor(bounds.min.x / grid.bucketWidth),
             endCol = Math.floor(bounds.max.x / grid.bucketWidth),
             startRow = Math.floor(bounds.min.y / grid.bucketHeight),
             endRow = Math.floor(bounds.max.y / grid.bucketHeight);
 
-        return _createRegion(startCol, endCol, startRow, endRow);
+        return Grid._createRegion(startCol, endCol, startRow, endRow);
     };
 
     /**
@@ -195,7 +195,7 @@ var Common = require('../core/Common');
      * @param {} endRow
      * @return {} region
      */
-    var _createRegion = function(startCol, endCol, startRow, endRow) {
+    Grid._createRegion = function(startCol, endCol, startRow, endRow) {
         return { 
             id: startCol + ',' + endCol + ',' + startRow + ',' + endRow,
             startCol: startCol, 
@@ -213,7 +213,7 @@ var Common = require('../core/Common');
      * @param {} row
      * @return {string} bucket id
      */
-    var _getBucketId = function(column, row) {
+    Grid._getBucketId = function(column, row) {
         return 'C' + column + 'R' + row;
     };
 
@@ -225,7 +225,7 @@ var Common = require('../core/Common');
      * @param {} bucketId
      * @return {} bucket
      */
-    var _createBucket = function(buckets, bucketId) {
+    Grid._createBucket = function(buckets, bucketId) {
         var bucket = buckets[bucketId] = [];
         return bucket;
     };
@@ -238,7 +238,7 @@ var Common = require('../core/Common');
      * @param {} bucket
      * @param {} body
      */
-    var _bucketAddBody = function(grid, bucket, body) {
+    Grid._bucketAddBody = function(grid, bucket, body) {
         // add new pairs
         for (var i = 0; i < bucket.length; i++) {
             var bodyB = bucket[i];
@@ -270,9 +270,9 @@ var Common = require('../core/Common');
      * @param {} bucket
      * @param {} body
      */
-    var _bucketRemoveBody = function(grid, bucket, body) {
+    Grid._bucketRemoveBody = function(grid, bucket, body) {
         // remove from bucket
-        bucket.splice(bucket.indexOf(body), 1);
+        bucket.splice(Common.indexOf(bucket, body), 1);
 
         // update pair counts
         for (var i = 0; i < bucket.length; i++) {
@@ -294,7 +294,7 @@ var Common = require('../core/Common');
      * @param {} grid
      * @return [] pairs
      */
-    var _createActivePairsList = function(grid) {
+    Grid._createActivePairsList = function(grid) {
         var pairKeys,
             pair,
             pairs = [];

src/physics/matter-js/lib/collision/Pair.js

@@ -32,7 +32,6 @@ module.exports = Pair;
             isSensor: bodyA.isSensor || bodyB.isSensor,
             timeCreated: timestamp,
             timeUpdated: timestamp,
-
             collision: null,
             inverseMass: 0,
             friction: 0,
@@ -54,22 +53,9 @@ module.exports = Pair;
      * @param {number} timestamp
      */
     Pair.update = function(pair, collision, timestamp) {
-        // var contacts = pair.contacts,
-        //     supports = collision.supports,
-        //     activeContacts = pair.activeContacts,
-        //     parentA = collision.parentA,
-        //     parentB = collision.parentB;
-        
         pair.collision = collision;
-        // pair.inverseMass = parentA.inverseMass + parentB.inverseMass;
-        // pair.friction = Math.min(parentA.friction, parentB.friction);
-        // pair.frictionStatic = Math.max(parentA.frictionStatic, parentB.frictionStatic);
-        // pair.restitution = Math.max(parentA.restitution, parentB.restitution);
-        // pair.slop = Math.max(parentA.slop, parentB.slop);
-        // activeContacts.length = 0;
-        
-        if (collision.collided) {
 
+        if (collision.collided) {
             var supports = collision.supports,
                 activeContacts = pair.activeContacts,
                 parentA = collision.parentA,
@@ -85,8 +71,8 @@ module.exports = Pair;
                 activeContacts[i] = supports[i].contact;
             }
 
+            // optimise array size
             var supportCount = supports.length;
-
             if (supportCount < activeContacts.length) {
                 activeContacts.length = supportCount;
             }