Fixed daft issue in Camera and fully implemented tilemap collision.

Phaser/gameobjects/Emitter.ts

@@ -237,9 +237,8 @@ module Phaser {
                 if (Collide > 0)
                 {
                     particle.allowCollisions = Collision.ANY;
-                    particle.elasticity = Collide;
-                    //particle.width *= Collide;
-                    //particle.height *= Collide;
+                    particle.width *= Collide;
+                    particle.height *= Collide;
                     //particle.centerOffsets();
                 }
                 else

Phaser/gameobjects/Particle.ts

@@ -22,6 +22,7 @@ module Phaser {
 
             this.lifespan = 0;
             this.friction = 500;
+
         }
 
         /**

Phaser/gameobjects/Tilemap.ts

@@ -97,8 +97,6 @@ module Phaser {
 
             this.generateTiles(tileQuantity);
 
-            console.log('generate layer csv');
-
         }
 
         private parseTiledJSON(data: string, key: string) {
@@ -136,7 +134,6 @@ module Phaser {
                         layer.addColumn(row);
                         c = 0;
                     }
-                    console.log('generate layer json');
                 }
 
                 layer.updateBounds();

Phaser/geom/Quad.ts

@@ -68,6 +68,14 @@ module Phaser {
             return this.y + this.height;
         }
 
+        public get halfWidth(): number {
+            return this.width / 2;
+        }
+
+        public get halfHeight(): number {
+            return this.height / 2;
+        }
+
         /**
         * Determines whether the object specified intersects (overlaps) with this Quad object.
         * This method checks the x, y, width, and height properties of the specified Quad object to see if it intersects with this Quad object.

Phaser/system/Camera.ts

@@ -60,7 +60,7 @@ module Phaser {
         private _fxShakeIntensity: number = 0;
         private _fxShakeDuration: number = 0;
         private _fxShakeComplete = null;
-        private _fxShakeOffset: Point = new Point(0, 0);
+        private _fxShakeOffset: MicroPoint = new MicroPoint(0, 0);
         private _fxShakeDirection: number = 0;
         private _fxShakePrevX: number = 0;
         private _fxShakePrevY: number = 0;
@@ -77,8 +77,8 @@ module Phaser {
         public ID: number;
         public worldView: Rectangle;
         public totalSpritesRendered: number;
-        public scale: Point = new Point(1, 1);
-        public scroll: Point = new Point(0, 0);
+        public scale: MicroPoint = new MicroPoint(1, 1);
+        public scroll: MicroPoint = new MicroPoint(0, 0);
         public bounds: Rectangle = null;
         public deadzone: Rectangle = null;
 
@@ -96,7 +96,7 @@ module Phaser {
         public showShadow: bool = false;
         public shadowColor: string = 'rgb(0,0,0)';
         public shadowBlur: number = 10;
-        public shadowOffset: Point = new Point(4, 4);
+        public shadowOffset: MicroPoint = new MicroPoint(4, 4);
 
         public visible: bool = true;
         public alpha: number = 1;
@@ -230,42 +230,34 @@ module Phaser {
                     var w: number = this.width / 8;
                     var h: number = this.height / 3;
                     this.deadzone = new Rectangle((this.width - w) / 2, (this.height - h) / 2 - h * 0.25, w, h);
-                    console.log('follow 1');
                     break;
                 case Camera.STYLE_TOPDOWN:
                     helper = Math.max(this.width, this.height) / 4;
                     this.deadzone = new Rectangle((this.width - helper) / 2, (this.height - helper) / 2, helper, helper);
-                    console.log('follow 2');
                     break;
                 case Camera.STYLE_TOPDOWN_TIGHT:
                     helper = Math.max(this.width, this.height) / 8;
                     this.deadzone = new Rectangle((this.width - helper) / 2, (this.height - helper) / 2, helper, helper);
-                    console.log('follow 3');
                     break;
                 case Camera.STYLE_LOCKON:
                 default:
                     this.deadzone = null;
-                    console.log('follow 4');
                     break;
             }
 
         }
 
         public focusOnXY(x: number, y: number) {
 
-            console.log('focusOn', x, y);
-
             x += (x > 0) ? 0.0000001 : -0.0000001;
             y += (y > 0) ? 0.0000001 : -0.0000001;
 
             this.scroll.x = Math.round(x - this.worldView.halfWidth);
             this.scroll.y = Math.round(y - this.worldView.halfHeight);
 
-            console.log('focusOn scroll',this.scroll.x, this.scroll.y);
-
         }
 
-        public focusOn(point: Point) {
+        public focusOn(point) {
 
             point.x += (point.x > 0) ? 0.0000001 : -0.0000001;
             point.y += (point.y > 0) ? 0.0000001 : -0.0000001;
@@ -291,7 +283,7 @@ module Phaser {
             }
 
             this.bounds.setTo(x, y, width, height);
-            this.worldView.setTo(x, y, width, height);
+
             this.scroll.setTo(0, 0);
 
             this.update();
@@ -342,7 +334,7 @@ module Phaser {
 
             }
 
-            //  Make sure we didn't go outside the camera's bounds
+            //  Make sure we didn't go outside the cameras bounds
             if (this.bounds !== null)
             {
                 if (this.scroll.x < this.bounds.left)
@@ -369,6 +361,8 @@ module Phaser {
             this.worldView.x = this.scroll.x;
             this.worldView.y = this.scroll.y;
 
+            //console.log(this.worldView.width, this.worldView.height);
+
             //  Input values
             this.inputX = this.worldView.x + this._game.input.x;
             this.inputY = this.worldView.y + this._game.input.y;
@@ -610,9 +604,10 @@ module Phaser {
 
             this.worldView.width = width;
             this.worldView.height = height;
-
             this.checkClip();
 
+            //console.log('Camera setSize', width, height);
+
         }
 
         public renderDebugInfo(x: number, y: number, color?: string = 'rgb(255,255,255)') {
@@ -652,6 +647,12 @@ module Phaser {
         }
 
         public set width(value: number) {
+
+            if (value > this._game.stage.width)
+            {
+                value = this._game.stage.width;
+            }
+
             this.worldView.width = value;
             this.checkClip();
         }
@@ -661,6 +662,12 @@ module Phaser {
         }
 
         public set height(value: number) {
+
+            if (value > this._game.stage.height)
+            {
+                value = this._game.stage.height;
+            }
+
             this.worldView.height = value;
             this.checkClip();
         }

README.md

@@ -24,6 +24,8 @@ V0.9.4
 * Added Tilemap.getTile, getTileFromWorldXY, getTileFromInputXY
 * Added Tilemap.setCollisionByIndex and setCollisionByRange
 * Added GameObject.renderRotation boolean to control if the sprite will visually rotate or not (useful when angle needs to change but graphics don't)
+* Added additional check to Camera.width/height so you cannot set them larger than the Stage size
+* Added Collision.separateTile and Tilemap.collide
 
 
 Requirements

Tests/cameras/camera bounds.js

@@ -13,9 +13,9 @@
         for(var i = 0; i < 100; i++) {
             myGame.createSprite(Math.random() * myGame.world.width, Math.random() * myGame.world.height, 'melon');
         }
+        myGame.onRenderCallback = render;
     }
     function update() {
-        myGame.camera.renderDebugInfo(32, 32);
         if(myGame.input.keyboard.isDown(Phaser.Keyboard.LEFT)) {
             myGame.camera.scroll.x -= 4;
         } else if(myGame.input.keyboard.isDown(Phaser.Keyboard.RIGHT)) {
@@ -27,4 +27,7 @@
             myGame.camera.scroll.y += 4;
         }
     }
+    function render() {
+        myGame.camera.renderDebugInfo(32, 32);
+    }
 })();

Tests/cameras/camera bounds.ts

@@ -25,12 +25,12 @@
             myGame.createSprite(Math.random() * myGame.world.width, Math.random() * myGame.world.height, 'melon');
         }
 
+        myGame.onRenderCallback = render;
+
     }
 
     function update() {
 
-        myGame.camera.renderDebugInfo(32, 32);
-
         if (myGame.input.keyboard.isDown(Phaser.Keyboard.LEFT))
         {
             myGame.camera.scroll.x -= 4;
@@ -51,4 +51,10 @@
 
     }
 
+    function render() {
+
+        myGame.camera.renderDebugInfo(32, 32);
+
+    }
+
 })();