Merge branch 'master' into rendering-cleanup

Author: bitnenfer

.eslintrc.json

@@ -46,7 +46,7 @@
         "indent": [ "error", 4, { "SwitchCase": 1 } ],
         "key-spacing": [ "error", { "beforeColon": false, "afterColon": true }],
         "linebreak-style": [ "off" ],
-        "lines-around-comment": [ "error", { "beforeBlockComment": true, "afterBlockComment": false, "beforeLineComment": true, "afterLineComment": false, "allowBlockStart": true, "allowBlockEnd": false, "allowObjectStart": true, "allowArrayStart": true, "allowBlockEnd": true }],
+        "lines-around-comment": [ "error", { "beforeBlockComment": true, "afterBlockComment": false, "beforeLineComment": true, "afterLineComment": false, "allowBlockStart": true, "allowBlockEnd": false, "allowObjectStart": true, "allowArrayStart": true }],
         "new-parens": "error",
         "no-array-constructor": "error",
         "no-lonely-if": "error",
@@ -66,7 +66,7 @@
         "space-in-parens": [ "error",  "never" ],
         "space-infix-ops": [ "error", { "int32Hint": true } ],
         "wrap-regex": "error",
-        "spaced-comment": [ "error", "always", { "block": { "balanced": true }} ]
+        "spaced-comment": [ "error", "always", { "block": { "balanced": true, "exceptions": ["*", "!"] }} ]
 
     }
-}
+}

package.json

@@ -1,7 +1,7 @@
 {
   "//": "npm publish --tag beta",
   "name": "phaser",
-  "version": "3.0.0-beta.18",
+  "version": "3.0.0-beta.19",
   "release": "Shadow Coast",
   "description": "A fast, free and fun HTML5 Game Framework for Desktop and Mobile web browsers.",
   "author": "Richard Davey <rdavey@gmail.com> (http://www.photonstorm.com)",

src/gameobjects/text/static/Text.js

@@ -576,6 +576,9 @@ var Text = new Class({
         w *= this.resolution;
         h *= this.resolution;
 
+        w = Math.max(w, 1);
+        h = Math.max(h, 1);
+
         if (canvas.width !== w || canvas.height !== h)
         {
             canvas.width = w;

src/gameobjects/tilemap/Tile.js

@@ -182,6 +182,12 @@ var Tile = new Class({
          * @default
          */
         this.tint = 0xffffff;
+
+        /**
+         * An empty object where physics-engine specific information (e.g. bodies) may be stored.
+         * @property {object} physics
+         */
+        this.physics = {};
     },
 
     /**

src/input/InputManager.js

@@ -1,14 +1,15 @@
-//  Phaser.Input.InputManager
-
 var Class = require('../utils/Class');
 var EventEmitter = require('eventemitter3');
 var Gamepad = require('./gamepad/GamepadManager');
 var Keyboard = require('./keyboard/KeyboardManager');
 var Mouse = require('./mouse/MouseManager');
 var Pointer = require('./Pointer');
+var Rectangle = require('../geom/rectangle/Rectangle');
 var Touch = require('./touch/TouchManager');
 var TransformXY = require('../math/TransformXY');
 
+//  Phaser.Input.InputManager
+
 var InputManager = new Class({
 
     initialize:
@@ -46,7 +47,7 @@ var InputManager = new Class({
 
         this.ignoreEvents = false;
 
-        this.bounds;
+        this.bounds = new Rectangle();
 
         this._tempPoint = { x: 0, y: 0 };
         this._tempHitTest = [];
@@ -72,22 +73,16 @@ var InputManager = new Class({
 
     updateBounds: function ()
     {
-        var bounds = this.canvas.getBoundingClientRect();
-
-        if (window.scrollX)
-        {
-            bounds.left += window.scrollX;
-        }
-
-        if (window.scrollY)
-        {
-            bounds.top += window.scrollY;
-        }
+        var clientRect = this.canvas.getBoundingClientRect();
+        var bounds = this.bounds;
 
-        this.bounds = bounds;
+        bounds.left = clientRect.left + window.pageXOffset;
+        bounds.top = clientRect.top + window.pageYOffset;
+        bounds.width = clientRect.width;
+        bounds.height = clientRect.height;
     },
 
-    update: function (time, delta)
+    update: function (time)
     {
         this.keyboard.update();
         this.gamepad.update();

src/loader/filetypes/HTML5AudioFile.js

@@ -15,6 +15,8 @@ var HTML5AudioFile = new Class({
         {
             this.locked = locked;
 
+            this.loaded = false;
+
             var fileConfig = {
                 type: 'audio',
                 extension: GetFastValue(url, 'type', ''),
@@ -29,7 +31,14 @@ var HTML5AudioFile = new Class({
 
     onLoad: function ()
     {
-        this.callback(this, true);
+        if(this.loaded)
+        {
+            return;
+        }
+
+        this.loaded = true;
+
+        this.loader.nextFile(this, true);
     },
 
     onError: function (event)
@@ -41,7 +50,7 @@ var HTML5AudioFile = new Class({
             audio.onerror = null;
         }
 
-        this.callback(this, false);
+        this.loader.nextFile(this, false);
     },
 
     onProgress: function (event)
@@ -50,18 +59,22 @@ var HTML5AudioFile = new Class({
         audio.oncanplaythrough = null;
         audio.onerror = null;
 
-        if(++this.filesLoaded === this.filesTotal)
+        this.filesLoaded++;
+
+        this.percentComplete = Math.min((this.filesLoaded / this.filesTotal), 1);
+
+        this.loader.emit('fileprogress', this, this.percentComplete);
+
+        if(this.filesLoaded === this.filesTotal)
         {
             this.onLoad();
         }
-
-        this.percentComplete = Math.min((this.filesLoaded / this.filesTotal), 1);
     },
 
     //  Called by the Loader, starts the actual file downloading
-    load: function (callback, baseURL)
+    load: function (loader)
     {
-        this.callback = callback;
+        this.loader = loader;
 
         this.data = [];
 
@@ -90,7 +103,7 @@ var HTML5AudioFile = new Class({
         for (i = 0; i < this.data.length; i++)
         {
             audio = this.data[i];
-            audio.src = GetURL(this, baseURL || '');
+            audio.src = GetURL(this, loader.baseURL);
 
             if (!this.locked)
             {
@@ -100,13 +113,7 @@ var HTML5AudioFile = new Class({
 
         if (this.locked)
         {
-            setTimeout(function ()
-            {
-                this.filesLoaded = this.filesTotal;
-                this.percentComplete = 1;
-                this.onLoad();
-
-            }.bind(this));
+            setTimeout(this.onLoad.bind(this));
         }
     }
 

src/loader/filetypes/TilemapJSONFile.js

@@ -17,9 +17,9 @@ var TilemapJSONFile = function (key, url, path, format, xhrSettings)
 };
 
 //  When registering a factory function 'this' refers to the Loader context.
-//  
+//
 //  There are several properties available to use:
-//  
+//
 //  this.scene - a reference to the Scene that owns the GameObjectFactory
 
 FileTypesManager.register('tilemapTiledJSON', function (key, url, xhrSettings)
@@ -48,12 +48,12 @@ FileTypesManager.register('tilemapWeltmeister', function (key, url, xhrSettings)
         for (var i = 0; i < key.length; i++)
         {
             //  If it's an array it has to be an array of Objects, so we get everything out of the 'key' object
-            this.addFile(TilemapJSONFile(key[i], url, this.path, TILEMAP_FORMATS.WELTMEISTER.TILED_JSON, xhrSettings));
+            this.addFile(TilemapJSONFile(key[i], url, this.path, TILEMAP_FORMATS.WELTMEISTER, xhrSettings));
         }
     }
     else
     {
-        this.addFile(TilemapJSONFile(key, url, this.path, TILEMAP_FORMATS.WELTMEISTER.TILED_JSON, xhrSettings));
+        this.addFile(TilemapJSONFile(key, url, this.path, TILEMAP_FORMATS.WELTMEISTER, xhrSettings));
     }
 
     //  For method chaining

src/physics/matter-js/Factory.js

@@ -5,11 +5,12 @@ var Constraint = require('./lib/constraint/Constraint');
 var MatterImage = require('./MatterImage');
 var MatterSprite = require('./MatterSprite');
 var PointerConstraint = require('./PointerConstraint');
+var MatterTileBody = require('./MatterTileBody');
 
 //  When registering a factory function 'this' refers to the GameObjectFactory context.
-//  
+//
 //  There are several properties available to use:
-//  
+//
 //  this.scene - a reference to the Scene that owns the GameObjectFactory
 //  this.displayList - a reference to the Display List the Scene owns
 //  this.updateList - a reference to the Update List the Scene owns
@@ -219,6 +220,13 @@ var Factory = new Class({
         return image;
     },
 
+    tileBody: function (tile, options)
+    {
+        var tileBody = new MatterTileBody(this.world, tile, options);
+
+        return tileBody;
+    },
+
     sprite: function (x, y, key, frame, options)
     {
         var sprite = new MatterSprite(this.world, x, y, key, frame, options);