Fixed issue in Camera.inCamera check where it wouldn't take into consideration the Sprites scrollFactor.

Author: photonstorm

Phaser/Game.ts

@@ -302,6 +302,9 @@ module Phaser {
                 this.framerate = 60;
                 this.isBooted = true;
 
+                //  Set-up some static helper references
+                ColorUtils.game = this;
+
                 //  Display the default game screen?
                 if (this.onInitCallback == null && this.onCreateCallback == null && this.onUpdateCallback == null && this.onRenderCallback == null && this._pendingState == null)
                 {

Phaser/Phaser.csproj

@@ -173,6 +173,14 @@
     <Content Include="utils\CircleUtils.js">
       <DependentUpon>CircleUtils.ts</DependentUpon>
     </Content>
+    <TypeScriptCompile Include="utils\PixelUtils.ts" />
+    <TypeScriptCompile Include="utils\ColorUtils.ts" />
+    <Content Include="utils\ColorUtils.js">
+      <DependentUpon>ColorUtils.ts</DependentUpon>
+    </Content>
+    <Content Include="utils\PixelUtils.js">
+      <DependentUpon>PixelUtils.ts</DependentUpon>
+    </Content>
     <Content Include="utils\PointUtils.js">
       <DependentUpon>PointUtils.ts</DependentUpon>
     </Content>

Phaser/cameras/Camera.ts

@@ -474,6 +474,11 @@ module Phaser {
                 this._game.stage.context.globalAlpha = 1;
             }
 
+            //  Debug test
+            this._game.stage.context.fillStyle = 'rgba(255,0,0,0.3)';
+            //this._game.stage.context.fillRect(this.scaledX, this.scaledY, this.worldView.width, this.worldView.height);
+            this._game.stage.context.fillRect(this.worldView.x, this.worldView.y, this.worldView.width, this.worldView.height);
+
         }
 
         /**

Phaser/gameobjects/DynamicTexture.ts

@@ -1,5 +1,6 @@
 /// <reference path="../Game.ts" />
 /// <reference path="../utils/RectangleUtils.ts" />
+/// <reference path="../utils/ColorUtils.ts" />
 /// <reference path="IGameObject.ts" />
 
 /**
@@ -90,7 +91,7 @@ module Phaser {
             //a = imageData.data[3];
             var imageData = this.context.getImageData(x, y, 1, 1);
 
-            return this.getColor(imageData.data[0], imageData.data[1], imageData.data[2]);
+            return ColorUtils.getColor(imageData.data[0], imageData.data[1], imageData.data[2]);
 
         }
 
@@ -104,7 +105,7 @@ module Phaser {
 
             var imageData = this.context.getImageData(x, y, 1, 1);
 
-            return this.getColor32(imageData.data[3], imageData.data[0], imageData.data[1], imageData.data[2]);
+            return ColorUtils.getColor32(imageData.data[3], imageData.data[0], imageData.data[1], imageData.data[2]);
 
         }
 
@@ -288,37 +289,6 @@ module Phaser {
             return this.bounds.height;
         }
 
-        /**
-         * Given an alpha and 3 color values this will return an integer representation of it
-         *
-         * @param alpha {number} The Alpha value (between 0 and 255)
-         * @param red   {number} The Red channel value (between 0 and 255)
-         * @param green {number} The Green channel value (between 0 and 255)
-         * @param blue  {number} The Blue channel value (between 0 and 255)
-         *
-         * @return  A native color value integer (format: 0xAARRGGBB)
-         */
-        private getColor32(alpha: number, red: number, green: number, blue: number): number {
-
-            return alpha << 24 | red << 16 | green << 8 | blue;
-
-        }
-
-        /**
-         * Given 3 color values this will return an integer representation of it
-         *
-         * @param red   {number} The Red channel value (between 0 and 255)
-         * @param green {number} The Green channel value (between 0 and 255)
-         * @param blue  {number} The Blue channel value (between 0 and 255)
-         *
-         * @return  A native color value integer (format: 0xRRGGBB)
-         */
-        private getColor(red: number, green: number, blue: number): number {
-
-            return red << 16 | green << 8 | blue;
-
-        }
-
     }
 
 }

Phaser/input/Pointer.ts

@@ -374,8 +374,6 @@ module Phaser {
                     }
                 }
 
-                //console.log('highest priority was', _highestPriority);
-
                 if (this.isDown)
                 {
                     //  Now update all objects with the highest priority ID (can be more than 1)

Phaser/renderers/CanvasRenderer.ts

@@ -90,12 +90,12 @@ module Phaser {
                 return true;
             }
 
-            this._dx = sprite.frameBounds.x - camera.worldView.x;
-            this._dy = sprite.frameBounds.y - camera.worldView.y;
+            this._dx = sprite.frameBounds.x - (camera.worldView.x * sprite.scrollFactor.x);
+            this._dy = sprite.frameBounds.y - (camera.worldView.y * sprite.scrollFactor.y);
             this._dw = sprite.frameBounds.width * sprite.scale.x;
             this._dh = sprite.frameBounds.height * sprite.scale.y;
 
-            return (camera.worldView.right > this._dx) && (camera.worldView.x < this._dx + this._dw) && (camera.worldView.bottom > this._dy) && (camera.worldView.y < this._dy + this._dh);
+            return (camera.scaledX + camera.worldView.width > this._dx) && (camera.scaledX < this._dx + this._dw) && (camera.scaledY + camera.worldView.height > this._dy) && (camera.scaledY < this._dy + this._dh);
 
         }