Preparing new tests

Author: photonstorm

Phaser/Phaser.csproj

@@ -92,21 +92,20 @@
       <DependentUpon>Game.ts</DependentUpon>
     </Content>
     <TypeScriptCompile Include="gameobjects\Sprite.ts" />
+    <TypeScriptCompile Include="gameobjects\IGameObject.ts" />
+    <Content Include="gameobjects\IGameObject.js">
+      <DependentUpon>IGameObject.ts</DependentUpon>
+    </Content>
     <Content Include="math\GameMath.js">
       <DependentUpon>GameMath.ts</DependentUpon>
     </Content>
     <TypeScriptCompile Include="gameobjects\GameObjectFactory.ts" />
     <Content Include="gameobjects\GameObjectFactory.js">
       <DependentUpon>GameObjectFactory.ts</DependentUpon>
     </Content>
-    <TypeScriptCompile Include="components\ScrollRegion.ts" />
-    <Content Include="components\ScrollRegion.js">
-      <DependentUpon>ScrollRegion.ts</DependentUpon>
-    </Content>
     <Content Include="gameobjects\Sprite.js">
       <DependentUpon>Sprite.ts</DependentUpon>
     </Content>
-    <TypeScriptCompile Include="geom\Polygon.ts" />
     <TypeScriptCompile Include="utils\PointUtils.ts" />
     <TypeScriptCompile Include="utils\CircleUtils.ts" />
     <TypeScriptCompile Include="renderers\CanvasRenderer.ts" />
@@ -131,24 +130,17 @@
     <Content Include="utils\PointUtils.js">
       <DependentUpon>PointUtils.ts</DependentUpon>
     </Content>
-    <Content Include="geom\Polygon.js">
-      <DependentUpon>Polygon.ts</DependentUpon>
-    </Content>
-    <TypeScriptCompile Include="geom\Response.ts" />
     <TypeScriptCompile Include="utils\RectangleUtils.ts" />
     <Content Include="utils\RectangleUtils.js">
       <DependentUpon>RectangleUtils.ts</DependentUpon>
     </Content>
-    <Content Include="geom\Response.js">
-      <DependentUpon>Response.ts</DependentUpon>
-    </Content>
     <Content Include="core\Circle.js">
       <DependentUpon>Circle.ts</DependentUpon>
     </Content>
-    <Content Include="geom\IntersectResult.js">
+    <Content Include="math\IntersectResult.js">
       <DependentUpon>IntersectResult.ts</DependentUpon>
     </Content>
-    <Content Include="geom\Line.js">
+    <Content Include="core\Line.js">
       <DependentUpon>Line.ts</DependentUpon>
     </Content>
     <TypeScriptCompile Include="math\Vec2Utils.ts" />
@@ -216,18 +208,10 @@
     <Content Include="system\StageScaleMode.js">
       <DependentUpon>StageScaleMode.ts</DependentUpon>
     </Content>
-    <Content Include="components\Tile.js">
-      <DependentUpon>Tile.ts</DependentUpon>
-    </Content>
-    <TypeScriptCompile Include="components\TilemapLayer.ts" />
-    <Content Include="components\TilemapLayer.js">
-      <DependentUpon>TilemapLayer.ts</DependentUpon>
-    </Content>
     <Content Include="tweens\Tween.js">
       <DependentUpon>Tween.ts</DependentUpon>
     </Content>
     <TypeScriptCompile Include="tweens\Tween.ts" />
-    <TypeScriptCompile Include="components\Tile.ts" />
     <TypeScriptCompile Include="system\StageScaleMode.ts" />
     <TypeScriptCompile Include="system\RequestAnimationFrame.ts" />
     <TypeScriptCompile Include="math\RandomDataGenerator.ts" />
@@ -299,8 +283,8 @@
     <TypeScriptCompile Include="components\animation\Frame.ts" />
     <TypeScriptCompile Include="loader\AnimationLoader.ts" />
     <TypeScriptCompile Include="components\animation\Animation.ts" />
-    <TypeScriptCompile Include="geom\Line.ts" />
-    <TypeScriptCompile Include="geom\IntersectResult.ts" />
+    <TypeScriptCompile Include="core\Line.ts" />
+    <TypeScriptCompile Include="math\IntersectResult.ts" />
     <TypeScriptCompile Include="core\Circle.ts" />
     <Content Include="core\Group.js">
       <DependentUpon>Group.ts</DependentUpon>

Phaser/State.ts

@@ -21,11 +21,11 @@ module Phaser {
             this.add = game.add;
             this.camera = game.camera;
             this.cache = game.cache;
-            this.collision = game.collision;
+            //this.collision = game.collision;
             this.input = game.input;
             this.loader = game.loader;
             this.math = game.math;
-            this.motion = game.motion;
+            //this.motion = game.motion;
             this.sound = game.sound;
             this.stage = game.stage;
             this.time = game.time;
@@ -55,7 +55,7 @@ module Phaser {
          * Reference to the collision helper.
          * @type {Collision}
          */
-        public collision: Collision;
+        //public collision: Collision;
 
         /**
          * Reference to the GameObject Factory.
@@ -85,7 +85,7 @@ module Phaser {
          * Reference to the motion helper.
          * @type {Motion}
          */
-        public motion: Motion;
+        //public motion: Motion;
 
         /**
          * Reference to the sound manager.
@@ -161,9 +161,9 @@ module Phaser {
          * @param context The context in which the callbacks will be called
          * @returns {boolean} true if the objects overlap, otherwise false.
          */
-        public collide(objectOrGroup1 = null, objectOrGroup2 = null, notifyCallback = null, context? = this.game.callbackContext): bool {
-            return this.collision.overlap(objectOrGroup1, objectOrGroup2, notifyCallback, Collision.separate, context);
-        }
+        //public collide(objectOrGroup1 = null, objectOrGroup2 = null, notifyCallback = null, context? = this.game.callbackContext): bool {
+        //    return this.collision.overlap(objectOrGroup1, objectOrGroup2, notifyCallback, Collision.separate, context);
+        //}
 
     }
 

Phaser/components/TilemapLayer.ts

@@ -1,4 +1,6 @@
 /// <reference path="../Game.ts" />
+/// <reference path="../gameobjects/Tilemap.ts" />
+/// <reference path="../gameobjects/IGameObject.ts" />
 
 /**
 * Phaser - TilemapLayer
@@ -354,7 +356,7 @@ module Phaser {
          * @param object {GameObject} Tiles you want to get that overlaps this.
          * @return {array} Array with tiles informations. (Each contains x, y and the tile.)
          */
-        public getTileOverlaps(object: GameObject) {
+        public getTileOverlaps(object: IGameObject) {
 
             //  If the object is outside of the world coordinates then abort the check (tilemap has to exist within world bounds)
             if (object.collisionMask.x < 0 || object.collisionMask.x > this.widthInPixels || object.collisionMask.y < 0 || object.collisionMask.bottom > this.heightInPixels)

Phaser/components/sprite/Texture.ts

@@ -14,6 +14,7 @@ module Phaser.Components {
 
         constructor(parent: Sprite, key?: string = '', canvas?: HTMLCanvasElement = null, context?: CanvasRenderingContext2D = null) {
 
+            this._game = parent.game;
             this._sprite = parent;
 
             this.canvas = canvas;
@@ -30,6 +31,11 @@ module Phaser.Components {
 
         }
 
+        /**
+         * 
+         */
+        private _game: Game;
+
         /**
          * Reference to the Image stored in the Game.Cache that is used as the texture for the Sprite.
          */
@@ -121,17 +127,50 @@ module Phaser.Components {
          * @param clearAnimations {boolean} If this Sprite has a set of animation data already loaded you can choose to keep or clear it with this boolean
          * @return {Sprite} Sprite instance itself.
          */
-        public loadImage(key: string, clearAnimations: bool = true): Sprite {
-            return Phaser.SpriteUtils.loadTexture(this._sprite, key, clearAnimations);
+        public loadImage(key: string, clearAnimations: bool = true) {
+
+            //if (clearAnimations && sprite.animations.frameData !== null)
+            //{
+            //    sprite.animations.destroy();
+            //}
+
+            if (this._game.cache.getImage(key) !== null)
+            {
+                this.setTo(this._game.cache.getImage(key), null);
+
+                if (this._game.cache.isSpriteSheet(key))
+                {
+                    //sprite.animations.loadFrameData(sprite._game.cache.getFrameData(key));
+                    //sprite.collisionMask.width = sprite.animations.currentFrame.width;
+                    //sprite.collisionMask.height = sprite.animations.currentFrame.height;
+                }
+                else
+                {
+                    this._sprite.frameBounds.width = this.width;
+                    this._sprite.frameBounds.height = this.height;
+                    //sprite.collisionMask.width = sprite._texture.width;
+                    //sprite.collisionMask.height = sprite._texture.height;
+                }
+            }
+
         }
 
         /**
          * Load a DynamicTexture as its texture.
          * @param texture {DynamicTexture} The texture object to be used by this sprite.
          * @return {Sprite} Sprite instance itself.
          */
-        public loadDynamicTexture(texture: DynamicTexture): Sprite {
-            return Phaser.SpriteUtils.loadDynamicTexture(this._sprite, texture);
+        public loadDynamicTexture(texture: DynamicTexture) {
+
+            //if (sprite.animations.frameData !== null)
+            //{
+            //    sprite.animations.destroy();
+            //}
+
+            this.setTo(null, texture);
+            this._sprite.frameBounds.width = this.width;
+            this._sprite.frameBounds.height = this.height;
+
         }
 
         /**

Phaser/geom/Line.ts Phaser/core/Line.tsPhaser/geom/Line.ts renamed to Phaser/core/Line.ts

@@ -1,4 +1,6 @@
 /// <reference path="../Game.ts" />
+/// <reference path="../utils/RectangleUtils.ts" />
+/// <reference path="IGameObject.ts" />
 
 /**
 * Phaser - DynamicTexture
@@ -234,7 +236,7 @@ module Phaser {
         public copyPixels(sourceTexture: DynamicTexture, sourceRect: Rectangle, destPoint: Point) {
 
             //  Swap for drawImage if the sourceRect is the same size as the sourceTexture to avoid a costly getImageData call
-            if (sourceRect.equals(this.bounds) == true)
+            if (Phaser.RectangleUtils.equals(sourceRect, this.bounds) == true)
             {
                 this.context.drawImage(sourceTexture.canvas, destPoint.x, destPoint.y);
             }
@@ -246,15 +248,15 @@ module Phaser {
         }
 
         /**
-         * Given an array of GameObjects it will update each of them so that their canvas/contexts reference this DynamicTexture
+         * Given an array of Sprites it will update each of them so that their canvas/contexts reference this DynamicTexture
          * @param objects {Array} An array of GameObjects, or objects that inherit from it such as Sprites
          */
-        public assignCanvasToGameObjects(objects: GameObject[]) {
+        public assignCanvasToGameObjects(objects: IGameObject[]) {
 
             for (var i = 0; i < objects.length; i++)
             {
-                objects[i].canvas = this.canvas;
-                objects[i].context = this.context;
+                objects[i].texture.canvas = this.canvas;
+                objects[i].texture.context = this.context;
             }
 
         }
@@ -275,9 +277,7 @@ module Phaser {
         * @param y {number} The Y coordinate to render on the stage to (given in screen coordinates, not world)
         */
         public render(x?: number = 0, y?: number = 0) {
-
             this.game.stage.context.drawImage(this.canvas, x, y);
-
         }
 
         public get width(): number {

Phaser/gameobjects/DynamicTexture.ts

@@ -135,9 +135,9 @@ module Phaser {
          * @param [tileHeight] {number} height of each tile.
          * @return {Tilemap} The newly created tilemap object.
          */
-        public tilemap(key: string, mapData: string, format: number, resizeWorld: bool = true, tileWidth?: number = 0, tileHeight?: number = 0): Tilemap {
-            return <Tilemap> this._world.group.add(new Tilemap(this._game, key, mapData, format, resizeWorld, tileWidth, tileHeight));
-        }
+        //public tilemap(key: string, mapData: string, format: number, resizeWorld: bool = true, tileWidth?: number = 0, tileHeight?: number = 0): Tilemap {
+        //    return <Tilemap> this._world.group.add(new Tilemap(this._game, key, mapData, format, resizeWorld, tileWidth, tileHeight));
+        //}
 
         /**
          * Create a tween object for a specific object.
@@ -200,9 +200,9 @@ module Phaser {
          * @param tilemap The Tilemap to add to the Game World
          * @return {Phaser.Tilemap} The Tilemap object
          */
-        public existingTilemap(tilemap: Tilemap): Tilemap {
-            return this._world.group.add(tilemap);
-        }
+        //public existingTilemap(tilemap: Tilemap): Tilemap {
+        //    return this._world.group.add(tilemap);
+        //}
 
         /**
          * Add an existing Tween to the current world.

Phaser/gameobjects/GameObjectFactory.ts

@@ -0,0 +1,59 @@
+/// <reference path="../Game.ts" />
+
+module Phaser {
+
+    export interface IGameObject {
+
+        /**
+         * Reference to the main game object
+         */
+        game: Game;
+
+        /**
+         * The type of game object.
+         */
+        type: number;
+
+        /**
+         * Reference to the Renderer.renderSprite method. Can be overriden by custom classes.
+         */
+        render;
+
+        /**
+         * Controls if both <code>update</code> and render are called by the core game loop.
+         */
+        exists: bool;
+
+        /**
+         * Controls if <code>update()</code> is automatically called by the core game loop.
+         */
+        active: bool;
+
+        /**
+         * Controls if this Sprite is rendered or skipped during the core game loop.
+         */
+        visible: bool;
+
+        /**
+         * The position of the Sprite in world and screen coordinates.
+         */
+        position: Phaser.Components.Position;
+
+        /**
+         * The texture used to render the Sprite.
+         */
+        texture: Phaser.Components.Texture;
+
+        /**
+         * Scale of the Sprite. A scale of 1.0 is the original size. 0.5 half size. 2.0 double sized.
+         */
+        scale: Phaser.Vec2;
+
+        /**
+         * The influence of camera movement upon the Sprite.
+         */
+        scrollFactor: Phaser.Vec2;
+
+    }
+
+}