Merge branch 'photonstorm/097'

Author: pixelpicosean

Phaser/Phaser.csproj

@@ -213,6 +213,10 @@
     <TypeScriptCompile Include="physics\advanced\shapes\Shape.ts" />
     <TypeScriptCompile Include="physics\advanced\shapes\IShape.ts" />
     <TypeScriptCompile Include="physics\advanced\shapes\Box.ts" />
+    <TypeScriptCompile Include="physics\advanced\Plane.ts" />
+    <Content Include="physics\advanced\Plane.js">
+      <DependentUpon>Plane.ts</DependentUpon>
+    </Content>
     <Content Include="physics\advanced\shapes\Box.js">
       <DependentUpon>Box.ts</DependentUpon>
     </Content>

Phaser/input/Input.ts

@@ -53,13 +53,30 @@ module Phaser {
             this.activePointer = this.mousePointer;
             this.currentPointers = 0;
 
+            this.hitCanvas = <HTMLCanvasElement> document.createElement('canvas');
+            this.hitCanvas.width = 1;
+            this.hitCanvas.height = 1;
+            this.hitContext = this.hitCanvas.getContext('2d');
+
         }
 
         /**
          * Local private reference to game.
          */
         private _game: Game;
 
+        /**
+         * A 1x1 sized canvas used for pixel-perfect checks
+         * @type {HTMLCanvasElement}
+         */
+        public hitCanvas: HTMLCanvasElement;
+
+        /**
+         * The context of the 1x1 pixel check canvas
+         * @type {CanvasRenderingContext2D}
+         */
+        public hitContext: CanvasRenderingContext2D;
+
         /**
         * A vector object representing the previous position of the Pointer.
         * @property vector
@@ -961,6 +978,14 @@ module Phaser {
             return Vec2Utils.angle(pointer1.position, pointer2.position);
         }
 
+        public pixelPerfectCheck(sprite: Phaser.Sprite, pointer: Phaser.Pointer, alpha: number = 255): bool {
+
+            this.hitContext.clearRect(0, 0, 1, 1);
+
+            return true;
+
+        }
+
     }
 
 }

Phaser/math/Transform.ts

@@ -22,12 +22,20 @@ module Phaser {
             this.t = Phaser.Vec2Utils.clone(pos);
             this.c = Math.cos(angle);
             this.s = Math.sin(angle);
+            this.angle = angle;
 
         }
 
         public t: Phaser.Vec2;
         public c: number;
         public s: number;
+        public angle: number;
+
+        public toString() {
+
+    	    return 't=' + this.t.toString() + ' c=' + this.c + ' s=' + this.s + ' a=' + this.angle;
+
+        }
 
         public setTo(pos:Phaser.Vec2, angle:number) {
 
@@ -41,15 +49,21 @@ module Phaser {
 
         public setRotation(angle:number) {
 
-            this.c = Math.cos(angle);
-            this.s = Math.sin(angle);
+            if (angle !== this.angle)
+            {
+                this.c = Math.cos(angle);
+                this.s = Math.sin(angle);
+                this.angle = angle;
+            }
+
             return this;
 
         }
 
         public setPosition(p:Phaser.Vec2) {
 
             this.t.copyFrom(p);
+
             return this;
 
         }

Phaser/math/TransformUtils.ts

@@ -14,14 +14,17 @@ module Phaser {
     export class TransformUtils {
 
         public static rotate(t: Transform, v:Phaser.Vec2, out?: Vec2 = new Vec2):Phaser.Vec2 {
+        	//return new vec2(v.x * this.c - v.y * this.s, v.x * this.s + v.y * this.c);
             return out.setTo(v.x * t.c - v.y * t.s, v.x * t.s + v.y * t.c);
         }
 
         public static unrotate(t: Transform, v:Phaser.Vec2, out?: Vec2 = new Vec2):Phaser.Vec2 {
+	        //return new vec2(v.x * this.c + v.y * this.s, -v.x * this.s + v.y * this.c);
             return out.setTo(v.x * t.c + v.y * t.s, -v.x * t.s + v.y * t.c);
         }
 
         public static transform(t: Transform, v:Phaser.Vec2, out?: Vec2 = new Vec2):Phaser.Vec2 {
+	        //return new vec2(v.x * this.c - v.y * this.s + this.t.x, v.x * this.s + v.y * this.c + this.t.y);
             return out.setTo(v.x * t.c - v.y * t.s + t.t.x, v.x * t.s + v.y * t.c + t.t.y);
         }
 
@@ -30,6 +33,7 @@ module Phaser {
             var px = v.x - t.t.x;
             var py = v.y - t.t.y;
 
+	        //return new vec2(px * this.c + py * this.s, -px * this.s + py * this.c);
             return out.setTo(px * t.c + py * t.s, -px * t.s + py * t.c);
 
         }

Phaser/math/Vec2.ts

@@ -288,7 +288,8 @@ module Phaser {
         * @return {string} a string representation of the object.
         **/
         public toString(): string {
-            return "[{Vec2 (x=" + this.x + " y=" + this.y + ")}]";
+            //return "[{Vec2 (x=" + this.x + " y=" + this.y + ")}]";
+            return "x=" + this.x + " y=" + this.y;
         }
 
     }