From af5847e8e49cdd0230128e9b91867793bc35e65f Mon Sep 17 00:00:00 2001
From: photonstorm <rdavey@gmail.com>
Date: Mon, 9 Dec 2013 16:40:48 +0000
Subject: [PATCH] Tilemap and game core loop updates.

---
 README.md                   |  1 +
 src/tilemap/TilemapLayer.js | 85 ++++++++++++++++---------------------
 2 files changed, 37 insertions(+), 49 deletions(-)

diff --git a/README.md b/README.md
index fd5681c8..f00c2651 100644
--- a/README.md
+++ b/README.md
@@ -66,6 +66,7 @@ Bug Fixes:
 * Group.length now returns the number of children in the Group regardless of their exists/alive state, or 0 if the Group is has no children.
 * Switch Camera.setBoundsToWorld to match world.bounds instead of world (thanks cocoademon)
 * Fixed an issue where passing null as the Group parent wouldn't set it to game.world as it should have (thanks tito100)
+* Fixed Pixi bug (#425) incorrect width property for multi-line Bitmap (thanks jcd-as)
 
 
 You can view the Change Log for all previous versions at https://github.com/photonstorm/phaser/changelog.md
diff --git a/src/tilemap/TilemapLayer.js b/src/tilemap/TilemapLayer.js
index 87dacc31..8fb940b3 100644
--- a/src/tilemap/TilemapLayer.js
+++ b/src/tilemap/TilemapLayer.js
@@ -368,7 +368,7 @@ Phaser.TilemapLayer.prototype.updateMapData = function (tilemap, layer) {
 }
 
 /**
-* Take an x coordinate that doesn't account for scrollFactorY and 'fix' it 
+* Take an x coordinate that doesn't account for scrollFactorX and 'fix' it 
 * into a scrolled local space. Used primarily internally
 * @method Phaser.TilemapLayer#_fixX
 * @memberof Phaser.TilemapLayer
@@ -378,19 +378,22 @@ Phaser.TilemapLayer.prototype.updateMapData = function (tilemap, layer) {
 */
 Phaser.TilemapLayer.prototype._fixX = function(x) {
 
+    if (x < 0)
+    {
+        x = 0;
+    }
+
     if (this.scrollFactorX === 1)
     {
         return x;
     }
 
-    var leftEdge = x - (this._x / this.scrollFactorX);
-
-    return this._x + leftEdge;
+    return this._x + (x - (this._x / this.scrollFactorX));
 
 }
 
 /**
-* Take an x coordinate that _does_ account for scrollFactorY and 'unfix' it 
+* Take an x coordinate that _does_ account for scrollFactorX and 'unfix' it 
 * back to camera space. Used primarily internally
 * @method Phaser.TilemapLayer#_unfixX
 * @memberof Phaser.TilemapLayer
@@ -405,9 +408,7 @@ Phaser.TilemapLayer.prototype._unfixX = function(x) {
         return x;
     }
 
-    var leftEdge = x - this._x;
-
-    return (this._x / this.scrollFactorX) + leftEdge;
+    return (this._x / this.scrollFactorX) + (x - this._x);
 
 }
 
@@ -422,14 +423,17 @@ Phaser.TilemapLayer.prototype._unfixX = function(x) {
 */
 Phaser.TilemapLayer.prototype._fixY = function(y) {
 
+    if (y < 0)
+    {
+        y = 0;
+    }
+
     if (this.scrollFactorY === 1)
     {
         return y;
     }
 
-    var topEdge = y - (this._y / this.scrollFactorY);
-
-    return this._y + topEdge;
+    return this._y + (y - (this._y / this.scrollFactorY));
 
 }
 
@@ -449,9 +453,7 @@ Phaser.TilemapLayer.prototype._unfixY = function(y) {
         return y;
     }
 
-    var topEdge = y - this._y;
-
-    return (this._y / this.scrollFactorY) + topEdge;
+    return (this._y / this.scrollFactorY) + (y - this._y);
 
 }
 
@@ -524,18 +526,6 @@ Phaser.TilemapLayer.prototype.getTiles = function (x, y, width, height, collides
     if (typeof collides === 'undefined') { collides = false; }
     if (typeof debug === 'undefined') { debug = false; }
 
-    //  Cap the values
-
-    if (x < 0)
-    {
-        x = 0;
-    }
-
-    if (y < 0)
-    {
-        y = 0;
-    }
-
     // adjust the x,y coordinates for scrollFactor
     x = this._fixX(x);
     y = this._fixY(y);
@@ -702,7 +692,7 @@ Phaser.TilemapLayer.prototype.render = function () {
 
     if (!this.dirty || !this.tileset || !this.tilemap || !this.visible)
     {
-        // return;
+        return;
     }
 
     this._prevX = this._dx;
@@ -720,8 +710,8 @@ Phaser.TilemapLayer.prototype.render = function () {
     this._ty = this._dy;
 
     this.context.clearRect(0, 0, this.canvas.width, this.canvas.height);
-    this.context.fillStyle = '#000000';
-    this.context.fillRect(0, 0, this.canvas.width, this.canvas.height);
+    // this.context.fillStyle = '#000000';
+    // this.context.fillRect(0, 0, this.canvas.width, this.canvas.height);
 
     this.context.strokeStyle = '#00ff00';
 
@@ -733,6 +723,23 @@ Phaser.TilemapLayer.prototype.render = function () {
         {
             var tile = this._column[x];
 
+            // var tile = this.tileset.tiles[this._column[x] - 1];
+
+            if (tile)
+            {
+                // this.context.drawImage(
+                //     this.tileset.image,
+                //     tile.x,
+                //     tile.y,
+                //     this.tileWidth,
+                //     this.tileHeight,
+                //     Math.floor(this._tx),
+                //     Math.floor(this._ty),
+                //     this.tileWidth,
+                //     this.tileHeight
+                // );
+            }
+
             if (tile && (tile.faceTop || tile.faceBottom || tile.faceLeft || tile.faceRight))
             {
                 this._tx = Math.floor(this._tx);
@@ -769,26 +776,6 @@ Phaser.TilemapLayer.prototype.render = function () {
                 // this.context.strokeRect(this._tx, this._ty, this.tileWidth, this.tileHeight);
             }
 
-            //  only -1 on TILED maps, not CSV
-            /*
-            var tile = this.tileset.tiles[this._column[x]-1];
-
-            if (tile)
-            {
-                this.context.drawImage(
-                    this.tileset.image,
-                    tile.x,
-                    tile.y,
-                    this.tileWidth,
-                    this.tileHeight,
-                    Math.floor(this._tx),
-                    Math.floor(this._ty),
-                    this.tileWidth,
-                    this.tileHeight
-                );
-            }
-            */
-
             this._tx += this.tileWidth;
 
         }