Tidying up ready to move the plugins to their own repo.

photonstorm · photonstorm · commit 410bc389edf3 · 2014-05-08T01:57:21.000+01:00
diff --git a/README.md b/README.md
@@ -59,7 +59,7 @@ Version 2.0.5 - "Tanchico" - in development
 
 ### Updates
 
-* TypeScript definitions fixes and updates (thanks @luispedrofonseca @clark-stevenson)
+* TypeScript definitions fixes and updates (thanks @luispedrofonseca @clark-stevenson @Anahkiasen @adamholdenyall)
 * Input.getPointerFromIdentifier docs update to reflect where the identifier comes from. Pointer properties now set to give it fixed defaults (thanks @JirkaDellOro, #793)
 * Pointer.pointerId added which is set by the DOM event (if present in the browser). Note that browsers can and do recycle pointer IDs.
 * Pointer.type and Pointer.exists properties added.
@@ -77,6 +77,8 @@ Version 2.0.5 - "Tanchico" - in development
 * ArcadePhysics.getObjectsUnderPointer will return all children from a Group that overlap with the given Pointer.
 * InputManager.minPriorityID lets you set the minimum priority level an object needs to be to be checked by a Pointer. Useful for UI layer stacking.
 * New consts: Phaser.Tilemap.NORTH, SOUTH, EAST and WEST to use with the TileMapWalker Plugin.
+* BitmapData.processPixelRGB added undefined check (thanks @muclemente, fix #808)
+
 
 ### New Plugins
 
diff --git a/plugins/TilemapWalker.js b/plugins/TilemapWalker.js
@@ -21,17 +21,17 @@ Phaser.Plugin.TilemapWalker = function (game, map, layer, x, y) {
     /**
     * @property {Phaser.Game} game - A reference to the currently running Game.
     */
-	this.game = game;
+    this.game = game;
 
     /**
     * @property {Phaser.Tilemap} map - A reference to the Tilemap this TilemapWalker belongs to.
     */
-	this.map = map;
+    this.map = map;
 
     /**
     * @property {number} locationLayer - The current layer of the location marker.
     */
-	this.locationLayer = map.getLayer(layer);
+    this.locationLayer = map.getLayer(layer);
 
     /**
     * @property {Phaser.Point} location - The current marker location. You can move the marker with the movement methods.
@@ -55,7 +55,7 @@ Phaser.Plugin.TilemapWalker = function (game, map, layer, x, y) {
     */
     this.history = [];
 
-    //	TODO: History limit, History scan, record how many times walker has been on a tile before
+    //  TODO: History limit, History scan, record how many times walker has been on a tile before
 
     if (typeof x !== 'undefined' && typeof y !== 'undefined')
     {
@@ -104,17 +104,17 @@ Phaser.Plugin.TilemapWalker.prototype = {
 
         if (this.map.hasTile(x, y, this.locationLayer))
         {
-        	if (this.collides)
-        	{
-        		var tile = this.map.getTile(x, y, this.locationLayer);
+            if (this.collides)
+            {
+                var tile = this.map.getTile(x, y, this.locationLayer);
 
-        		if (tile && tile.collides)
-        		{
-        			return false;
-        		}
-        	}
+                if (tile && tile.collides)
+                {
+                    return false;
+                }
+            }
 
-        	return true;
+            return true;
         }
 
         return false;
@@ -255,7 +255,7 @@ Phaser.Plugin.TilemapWalker.prototype = {
 
     getTile: function () {
 
-    	return this.map.getTile(this.location.x, this.location.y, this.locationLayer, true);
+        return this.map.getTile(this.location.x, this.location.y, this.locationLayer, true);
 
     },
 
@@ -547,7 +547,7 @@ Phaser.Plugin.TilemapWalker.prototype = {
             return this.getTileFromLocation(0, -distance);
         }
 
-    },
+    }
 
 };
 
diff --git a/plugins/VirtualJoystick.js b/plugins/VirtualJoystick.js
@@ -3,136 +3,135 @@
 */
 Phaser.Plugin.VirtualJoystick = function (game, parent) {
 
-	Phaser.Plugin.call(this, game, parent);
+    Phaser.Plugin.call(this, game, parent);
 
-	this.x = 0;
-	this.y = 0;
-	this.limit = 10;
+    this.x = 0;
+    this.y = 0;
+    this.limit = 10;
 
-	this.baseCircle;
+    this.baseCircle;
 
-	this.baseBMD;
-	this.nubBMD;
+    this.baseBMD;
+    this.nubBMD;
 
-	this.base;
-	this.nub;
+    this.base;
+    this.nub;
 
-	this.baseCenter;
-	this.nubCenter;
+    this.baseCenter;
+    this.nubCenter;
 
-	this.isDragging = false;
+    this.isDragging = false;
 
-	this.angle = 0;
-	this.distance = 0;
-	this.force = 0;
-	this.deltaX = 0;
-	this.deltaY = 0;
-	this.speed = 0;
-	
+    this.angle = 0;
+    this.distance = 0;
+    this.force = 0;
+    this.deltaX = 0;
+    this.deltaY = 0;
+    this.speed = 0;
+    
 };
 
-//	Extends the Phaser.Plugin template, setting up values we need
 Phaser.Plugin.VirtualJoystick.prototype = Object.create(Phaser.Plugin.prototype);
 Phaser.Plugin.VirtualJoystick.prototype.constructor = Phaser.Plugin.VirtualJoystick;
 
 Phaser.Plugin.VirtualJoystick.prototype.init = function (x, y, diameter, limit) {
 
-	if (typeof diameter === 'undefined') { diameter = 80; }
-	if (typeof limit === 'undefined') { limit = Math.floor(diameter / 2); }
+    if (typeof diameter === 'undefined') { diameter = 80; }
+    if (typeof limit === 'undefined') { limit = Math.floor(diameter / 2); }
 
-	this.x = x;
-	this.y = y;
+    this.x = x;
+    this.y = y;
 
-	var radius = Math.floor(diameter / 2);
-	var nr = radius - 4;
+    var radius = Math.floor(diameter / 2);
+    var nr = radius - 4;
 
-	this.baseCircle = new Phaser.Circle(x, y, diameter);
+    this.baseCircle = new Phaser.Circle(x, y, diameter);
 
-	this.baseBMD = this.game.make.bitmapData(diameter, diameter);
-	this.nubBMD = this.game.make.bitmapData(nr * 2, nr * 2);
+    this.baseBMD = this.game.make.bitmapData(diameter, diameter);
+    this.nubBMD = this.game.make.bitmapData(nr * 2, nr * 2);
 
-	this.baseBMD.circle(radius, radius, radius, 'rgb(255, 0, 0)');
-	this.nubBMD.circle(nr, nr, nr, 'rgb(0, 255, 0)');
+    this.baseBMD.circle(radius, radius, radius, 'rgb(255, 0, 0)');
+    this.nubBMD.circle(nr, nr, nr, 'rgb(0, 255, 0)');
 
-	//	Base
-	this.base = this.game.add.sprite(x, y, this.baseBMD);
-	this.base.anchor.set(0.5);
+    //  Base
+    this.base = this.game.add.sprite(x, y, this.baseBMD);
+    this.base.anchor.set(0.5);
 
-	//	Nub
-	this.nub = this.game.add.sprite(x, y, this.nubBMD);
-	this.nub.anchor.set(0.5);
+    //  Nub
+    this.nub = this.game.add.sprite(x, y, this.nubBMD);
+    this.nub.anchor.set(0.5);
 
-	this.nub.inputEnabled = true;
+    this.nub.inputEnabled = true;
 
-	this.nub.events.onInputDown.add(this.startDrag, this);
-	this.nub.events.onInputUp.add(this.stopDrag, this);
+    this.nub.events.onInputDown.add(this.startDrag, this);
+    this.nub.events.onInputUp.add(this.stopDrag, this);
 
-	//	Need to find a way to not hog this callback
-	this.game.input.setMoveCallback(this.move, this);
+    //  Need to find a way to not hog this callback
+    this.game.input.setMoveCallback(this.move, this);
 
-	this.isDragging = false;
+    this.isDragging = false;
 
-	this.distance = 0;
-	this.speed = 0;
-	this.force = 0;
-	this.limit = limit;
-	this.limitPoint = new Phaser.Point();
+    this.distance = 0;
+    this.speed = 0;
+    this.force = 0;
+    this.limit = limit;
+    this.limitPoint = new Phaser.Point();
 
-	this.location = new Phaser.Point();
+    this.location = new Phaser.Point();
 
 }
 
 Phaser.Plugin.VirtualJoystick.prototype.startDrag = function (nub, pointer) {
 
-	this.isDragging = true;
+    this.isDragging = true;
 
-	this.location.set(pointer.x, pointer.y);
-	this.distance = Phaser.Point.distance(this.base, this.location, true);
-	this.angle = this.game.math.wrapAngle(this.location.angle(this.base, true) + 180);
-	this.force = this.game.math.percent(this.distance, this.limit);
+    this.location.set(pointer.x, pointer.y);
+    this.distance = Phaser.Point.distance(this.base, this.location, true);
+    this.angle = this.game.math.wrapAngle(this.location.angle(this.base, true) + 180);
+    this.force = this.game.math.percent(this.distance, this.limit);
 
 };
 
 Phaser.Plugin.VirtualJoystick.prototype.stopDrag = function (nub, pointer) {
 
-	this.isDragging = false;
+    this.isDragging = false;
 
-	this.distance = 0;
-	this.angle = 0;
-	this.force = 0;
+    this.distance = 0;
+    this.angle = 0;
+    this.force = 0;
 
-	this.nub.x = this.base.x;
-	this.nub.y = this.base.y;
-	
-	this.limitPoint.set(this.base.x, this.base.y);
+    this.nub.x = this.base.x;
+    this.nub.y = this.base.y;
+    
+    this.limitPoint.set(this.base.x, this.base.y);
 
 };
 
 Phaser.Plugin.VirtualJoystick.prototype.move = function (pointer, x, y) {
 
-	if (!this.isDragging)
-	{
-		return;
-	}
+    if (!this.isDragging)
+    {
+        return;
+    }
 
-	this.location.set(x, y);
+    this.location.set(x, y);
 
-	this.distance = Phaser.Point.distance(this.base, this.location, true);
+    this.distance = Phaser.Point.distance(this.base, this.location, true);
 
-	this.angle = this.game.math.wrapAngle(this.location.angle(this.base, true) + 180);
+    this.angle = this.game.math.wrapAngle(this.location.angle(this.base, true) + 180);
 
-	this.force = this.game.math.percent(this.distance, this.limit);
+    this.force = this.game.math.percent(this.distance, this.limit);
 
-	if (this.distance < this.limit)
-	{
-		this.limitPoint.copyFrom(this.location);
-	}
-	else
-	{
-		this.baseCircle.circumferencePoint(this.angle, true, this.limitPoint);
-	}
+    if (this.distance < this.limit)
+    {
+        this.limitPoint.copyFrom(this.location);
+    }
+    else
+    {
+        this.baseCircle.circumferencePoint(this.angle, true, this.limitPoint);
+    }
 
-	this.nub.position.set(this.limitPoint.x, this.limitPoint.y);
+    this.nub.position.set(this.limitPoint.x, this.limitPoint.y);
 
 };
 
@@ -153,13 +152,13 @@ Phaser.Plugin.VirtualJoystick.prototype.setVelocity = function (sprite, minSpeed
 
     if (this.force === 0 && minSpeed === 0)
     {
-    	sprite.body.velocity.set(0, 0);
+        sprite.body.velocity.set(0, 0);
     }
     else
     {
-	    var speed = (maxSpeed - minSpeed) * this.force;
+        var speed = (maxSpeed - minSpeed) * this.force;
 
-	    sprite.body.velocity.set((Math.cos(this.game.math.degToRad(this.angle)) * speed), (Math.sin(this.game.math.degToRad(this.angle)) * speed));
+        sprite.body.velocity.set((Math.cos(this.game.math.degToRad(this.angle)) * speed), (Math.sin(this.game.math.degToRad(this.angle)) * speed));
     }
 
     return sprite;
@@ -172,15 +171,15 @@ Phaser.Plugin.VirtualJoystick.prototype.update = function () {
 
 Phaser.Plugin.VirtualJoystick.prototype.render = function () {
 
-	this.game.debug.text('force: ' + this.force, 32, 32);
-	// this.game.debug.text(this.distance, 32, 32);
-	// this.game.debug.text(this.angle, 132, 32);
+    this.game.debug.text('force: ' + this.force, 32, 32);
+    // this.game.debug.text(this.distance, 32, 32);
+    // this.game.debug.text(this.angle, 132, 32);
 
-	// this.game.debug.text('x: ' + this.location.x + ' y: ' + this.location.y, 32, 64);
-	// this.game.debug.text('x: ' + this.limitPoint.x + ' y: ' + this.limitPoint.y, 32, 64);
-	// this.game.debug.text('x: ' + this.prev.x + ' y: ' + this.prev.y, 32, 64);
-	// this.game.debug.text(Phaser.Point.distance(this.base, this.prev, true), 32, 96);
+    // this.game.debug.text('x: ' + this.location.x + ' y: ' + this.location.y, 32, 64);
+    // this.game.debug.text('x: ' + this.limitPoint.x + ' y: ' + this.limitPoint.y, 32, 64);
+    // this.game.debug.text('x: ' + this.prev.x + ' y: ' + this.prev.y, 32, 64);
+    // this.game.debug.text(Phaser.Point.distance(this.base, this.prev, true), 32, 96);
 
-	this.game.debug.geom(this.limitPoint, 'rgb(255,255,0)');
+    this.game.debug.geom(this.limitPoint, 'rgb(255,255,0)');
 
 };
diff --git a/src/loader/Loader.js b/src/loader/Loader.js
@@ -193,7 +193,8 @@ Phaser.Loader.prototype = {
 
     /**
     * Check whether asset exists with a specific key.
-    *
+    * Use Phaser.Cache to access loaded assets, e.g. Phaser.Cache#checkImageKey
+    * 
     * @method Phaser.Loader#checkKeyExists
     * @param {string} type - The type asset you want to check.
     * @param {string} key - Key of the asset you want to check.
