Merge remote-tracking branch 'origin/master'

Author: pavle-goloskokovic

v3/src/camera/2d/Camera.js

@@ -65,7 +65,6 @@ var Camera = new Class({
         this._id = 0;
     },
 
-    cameraToWorld: require('./inc/CameraToWorld'),
     centerToBounds: require('./inc/CenterToBounds'),
     centerToSize: require('./inc/CenterToSize'),
     cull: require('./inc/Cull'),
@@ -74,6 +73,7 @@ var Camera = new Class({
     destroy: require('./inc/Destroy'),
     fade: require('./inc/Fade'),
     flash: require('./inc/Flash'),
+    getWorldPoint: require('./inc/GetWorldPoint'),
     ignore: require('./inc/Ignore'),
     preRender: require('./inc/PreRender'),
     removeBounds: require('./inc/RemoveBounds'),
@@ -93,8 +93,7 @@ var Camera = new Class({
     startFollow: require('./inc/StartFollow'),
     stopFollow: require('./inc/StopFollow'),
     toJSON: require('./inc/ToJSON'),
-    update: require('./inc/Update'),
-    worldToCamera: require('./inc/WorldToCamera')
+    update: require('./inc/Update')
 
 });
 

v3/src/camera/2d/inc/CameraToWorld.js v3/src/camera/2d/inc/GetWorldPoint.jsv3/src/camera/2d/inc/CameraToWorld.js renamed to v3/src/camera/2d/inc/GetWorldPoint.js

@@ -1,4 +1,6 @@
-var CameraToWorld = function (pointIn, pointOut)
+var Vector2 = require('../../../math/Vector2');
+
+var GetWorldPoint = function (screenPoint, output)
 {
     var cameraMatrix = this.matrix.matrix;
     var mva = cameraMatrix[0];
@@ -13,7 +15,7 @@ var CameraToWorld = function (pointIn, pointOut)
 
     if (!determinant)
     {
-        return pointIn;
+        return screenPoint;
     }
 
     determinant = 1 / determinant;
@@ -29,19 +31,19 @@ var CameraToWorld = function (pointIn, pointOut)
     var zoom = this.zoom;
     var scrollX = this.scrollX;
     var scrollY = this.scrollY;
-    var x = pointIn.x + ((scrollX * c - scrollY * s) * zoom);
-    var y = pointIn.y + ((scrollX * s + scrollY * c) * zoom);
+    var x = screenPoint.x + ((scrollX * c - scrollY * s) * zoom);
+    var y = screenPoint.y + ((scrollX * s + scrollY * c) * zoom);
 
-    if (!pointOut)
+    if (!output)
     {
-        pointOut = { x: 0, y: 0 };
+        output = new Vector2();
     }
 
     /* Apply transform to point */
-    pointOut.x = (x * ima + y * imc + ime);
-    pointOut.y = (x * imb + y * imd + imf);
+    output.x = (x * ima + y * imc + ime);
+    output.y = (x * imb + y * imd + imf);
 
-    return pointOut;
+    return output;
 };
 
-module.exports = CameraToWorld;
+module.exports = GetWorldPoint;

v3/src/camera/2d/inc/WorldToCamera.js

@@ -244,6 +244,11 @@ var GameObject = new Class({
      */
     destroy: function ()
     {
+        if (this.preDestroy)
+        {
+            this.preDestroy();
+        }
+
         this.scene.sys.displayList.remove(this);
         this.scene.sys.updateList.remove(this);
 

v3/src/gameobjects/GameObject.js

@@ -90,11 +90,6 @@ var TextStyle = new Class({
 
     syncFont: function (canvas, context)
     {
-        if (this.rtl)
-        {
-            canvas.dir = 'rtl';
-        }
-
         context.font = this.font;
         context.textBaseline = 'alphabetic';
 

v3/src/gameobjects/text/TextStyle.js

@@ -1,11 +1,12 @@
-
+var AddToDOM = require('../../../dom/AddToDOM');
+var CanvasPool = require('../../../display/canvas/CanvasPool');
 var Class = require('../../../utils/Class');
-var GameObject = require('../../GameObject');
 var Components = require('../../components');
-var CanvasPool = require('../../../display/canvas/CanvasPool');
+var GameObject = require('../../GameObject');
+var GetTextSize = require('../GetTextSize');
+var RemoveFromDOM = require('../../../dom/RemoveFromDOM');
 var TextRender = require('./TextRender');
 var TextStyle = require('../TextStyle');
-var GetTextSize = require('../GetTextSize');
 
 var Text = new Class({
 
@@ -32,10 +33,6 @@ var Text = new Class({
     {
         if (x === undefined) { x = 0; }
         if (y === undefined) { y = 0; }
-        if (text === undefined) { text = ''; }
-
-        //  Cast to string whatever our value may be (numeric, etc)
-        text = text.toString();
 
         GameObject.call(this, scene, 'Text');
 
@@ -64,7 +61,8 @@ var Text = new Class({
          */
         this.splitRegExp = /(?:\r\n|\r|\n)/;
 
-        this.text = (Array.isArray(text)) ? text.join('\n') : text;
+        //  This is populated in this.setText
+        this.text = '';
 
         this.resolution = 1;
 
@@ -81,10 +79,9 @@ var Text = new Class({
         this.canvasTexture = null;
         this.dirty = false;
 
-        if (text !== '')
-        {
-            this.updateText();
-        }
+        this.initRTL();
+
+        this.setText(text);
 
         var _this = this;
 
@@ -95,6 +92,32 @@ var Text = new Class({
         });
     },
 
+    initRTL: function ()
+    {
+        if (!this.style.rtl)
+        {
+            return;
+        }
+
+        //  Here is where the crazy starts.
+        //  
+        //  Due to browser implementation issues, you cannot fillText BiDi text to a canvas
+        //  that is not part of the DOM. It just completely ignores the direction property.
+
+        this.canvas.dir = 'rtl';
+
+        //  Experimental atm, but one day ...
+        this.context.direction = 'rtl';
+
+        //  Add it to the DOM, but hidden within the parent canvas.
+        this.canvas.style.display = 'none';
+
+        AddToDOM(this.canvas, this.scene.sys.canvas);
+
+        //  And finally we set the x origin
+        this.originX = 1;
+    },
+
     setText: function (value)
     {
         if (Array.isArray(value))
@@ -255,13 +278,20 @@ var Text = new Class({
                 linePositionY += (textSize.lineSpacing * i);
             }
 
-            if (style.align === 'right')
+            if (style.rtl)
             {
-                linePositionX += textSize.width - textSize.lineWidths[i];
+                linePositionX = w - linePositionX;
             }
-            else if (style.align === 'center')
+            else
             {
-                linePositionX += (textSize.width - textSize.lineWidths[i]) / 2;
+                if (style.align === 'right')
+                {
+                    linePositionX += textSize.width - textSize.lineWidths[i];
+                }
+                else if (style.align === 'center')
+                {
+                    linePositionX += (textSize.width - textSize.lineWidths[i]) / 2;
+                }
             }
 
             if (this.autoRound)
@@ -315,7 +345,18 @@ var Text = new Class({
         out.data = data;
 
         return out;
+    },
+
+    preDestroy: function ()
+    {
+        if (this.style.rtl)
+        {
+            RemoveFromDOM(this.canvas);
+        }
+
+        CanvasPool.remove(this.canvas);
     }
+
 });
 
 module.exports = Text;

v3/src/gameobjects/text/static/Text.js

@@ -1,3 +1,5 @@
+// Note: direct port from v2
+
 /**
 * An Image Collection is a special tileset containing mulitple images, with no slicing into each image.
 *

v3/src/gameobjects/tilemap/ImageCollection.js

@@ -11,12 +11,12 @@ var Tilemap = require('./Tilemap');
  *
  * @param {Scene} scene - [description]
  * @param {string} [key] - The key in the Phaser cache that corresponds to the loaded tilemap data.
- * @param {number} [tileWidth=32] - The width of a tile in pixels.
- * @param {number} [tileHeight=32] - The height of a tile in pixels.
- * @param {number} [width=10] - The width of the map in tiles.
- * @param {number} [height=10] - The height of the map in tiles.
- * @param {array} [data] - Instead of loading from the cache, you can also load directly from a 2D
- * array of tile indexes.
+ * @param {integer} [tileWidth=32] - The width of a tile in pixels.
+ * @param {integer} [tileHeight=32] - The height of a tile in pixels.
+ * @param {integer} [width=10] - The width of the map in tiles.
+ * @param {integer} [height=10] - The height of the map in tiles.
+ * @param {integer[][]} [data] - Instead of loading from the cache, you can also load directly from
+ * a 2D array of tile indexes.
  * @param {boolean} [insertNull=false] - Controls how empty tiles, tiles with an index of -1, in the
  * map data are handled. If `true`, empty locations will get a value of `null`. If `false`, empty
  * location will get a Tile object with an index of -1. If you've a large sparsely populated map and