Camera updates, scrollFix check and some new pictures and tests.

Author: photonstorm

Docs/phaser_scrollfactor.png

@@ -523,7 +523,7 @@ module Phaser {
 
             if (this.bounds)
             {
-                this._game.stage.context.fillText('Bounds: ' + this.bounds.width + ' x ' + this.bounds.height, x, y + 56);
+                this._game.stage.context.fillText('Bounds: ' + this.bounds.width + ' x ' + this.bounds.height, x, y + 42);
             }
 
         }

Phaser/cameras/Camera.ts

@@ -48,7 +48,7 @@ module Phaser {
             this.height = this.frameBounds.height;
 
             //  Transform related (if we add any more then move to a component)
-            this.origin = new Phaser.Vec2(this.width / 2, this.height / 2);
+            this.origin = new Phaser.Vec2(0, 0);
             this.scale = new Phaser.Vec2(1, 1);
             this.skew = new Phaser.Vec2(0, 0);
 

Phaser/gameobjects/Sprite.ts

@@ -78,6 +78,10 @@ module Phaser {
             this._fy = sprite.scale.y;
             this._sin = 0;
             this._cos = 1;
+            this._dx = (camera.scaledX * sprite.scrollFactor.x) + sprite.frameBounds.x - (camera.worldView.x * sprite.scrollFactor.x);
+            this._dy = (camera.scaledY * sprite.scrollFactor.y) + sprite.frameBounds.y - (camera.worldView.y * sprite.scrollFactor.y);
+            this._dw = sprite.frameBounds.width;
+            this._dh = sprite.frameBounds.height;
 
             //  Alpha
             if (sprite.texture.alpha !== 1)
@@ -98,11 +102,6 @@ module Phaser {
                 this._fy = -sprite.scale.y;
             }
 
-            this._dx = (camera.scaledX * sprite.scrollFactor.x) + sprite.frameBounds.x - (camera.worldView.x * sprite.scrollFactor.x);
-            this._dy = (camera.scaledY * sprite.scrollFactor.y) + sprite.frameBounds.y - (camera.worldView.y * sprite.scrollFactor.y);
-            this._dw = sprite.frameBounds.width;
-            this._dh = sprite.frameBounds.height;
-
             if (sprite.animations.currentFrame !== null)
             {
                 this._sx = sprite.animations.currentFrame.x;
@@ -115,15 +114,6 @@ module Phaser {
                 }
             }
 
-            //	Apply camera difference - looks like this is already applied?
-            /*
-            if (sprite.scrollFactor.x !== 1 || sprite.scrollFactor.y !== 1)
-            {
-                //this._dx -= (camera.worldView.x * this.scrollFactor.x);
-                //this._dy -= (camera.worldView.y * this.scrollFactor.y);
-            }
-            */
-
             //	Rotation and Flipped
             if (sprite.modified)
             {
@@ -149,10 +139,11 @@ module Phaser {
             }
             else
             {
-                this._dx -= sprite.origin.x;
-                this._dy -= sprite.origin.y;
-                //this._dw = sprite.frameBounds.width * sprite.scale.x;
-                //this._dh = sprite.frameBounds.height * sprite.scale.y;
+                if (!sprite.origin.equals(0))
+                {
+                    this._dx -= sprite.origin.x;
+                    this._dy -= sprite.origin.y;
+                }
             }
 
             this._sx = Math.round(this._sx);

Phaser/renderers/CanvasRenderer.ts

@@ -26,6 +26,10 @@ TODO:
 * Removed ignoreGlobalUpdate because it checks exists etc in the Group update, so remove those checks from Sprite.update (same for render)
 * Investigate why tweens don't restart after the game pauses
 * Fix bug in Tween yoyo + loop combo
+* Copy the setTransform from Sprite to Camera
+* Move Camera.scroll.x to just Camera.x/y
+
+
 
 V1.0.0
 
@@ -41,7 +45,6 @@ V1.0.0
 * Refactored QuadTree so it no longer creates any temporary variables in any methods.
 * The Sprite Renderer now uses a single setTransform for scale, rotation and translation that respects the Sprite.origin value in all cases.
 * Sprite.modified is set to true if scale, rotation, skew or flip have been used.
-* By default the Sprite.origin is set to the center of the sprite, but can be offset to anywhere.
 * Added Tween.loop property so they can now re-run themselves indefinitely.
 * Added Tween.yoyo property so they can reverse themselves after completing.
 

README.md

@@ -53,6 +53,18 @@
     <TypeScriptSourceMap>false</TypeScriptSourceMap>
   </PropertyGroup>
   <ItemGroup>
+    <TypeScriptCompile Include="cameras\basic camera 1.ts" />
+    <Content Include="cameras\basic camera 1.js">
+      <DependentUpon>basic camera 1.ts</DependentUpon>
+    </Content>
+    <TypeScriptCompile Include="cameras\scrollfactor 1.ts" />
+    <Content Include="cameras\scrollfactor 1.js">
+      <DependentUpon>scrollfactor 1.ts</DependentUpon>
+    </Content>
+    <TypeScriptCompile Include="cameras\scrollfactor 2.ts" />
+    <Content Include="cameras\scrollfactor 2.js">
+      <DependentUpon>scrollfactor 2.ts</DependentUpon>
+    </Content>
     <Content Include="tweens\tween loop 1.js">
       <DependentUpon>tween loop 1.ts</DependentUpon>
     </Content>