wassname/phaser
1
0
Fork 0
mirror of https://github.com/wassname/phaser.git synced 2026-08-18 12:20:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Preparing new tests

Browse Source
This commit is contained in:
Richard Davey
2013-05-29 02:58:56 +01:00
parent 3c0c349089
commit 09f57fa346
237 changed files with 13385 additions and 34447 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Phaser/State.ts
+7 -7
View File
@@ -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);
//}
}