Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-11-23 13:13:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #212 from TheJare/dev

Browse source 
Fixes to Math and Loader
This commit is contained in:
Richard Davey 2013-11-20 04:51:25 -08:00
commit e32c127a97
4 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/Game.js
View file

@ -138,7 +138,7 @@ Phaser.Game = function (width, height, renderer, parent, state, transparent, ant
this.load = null; this.load = null;
/** /**
* @property {Phaser.GameMath} math - Reference to the math helper. * @property {Phaser.Math} math - Reference to the math helper.
* @default * @default
*/ */
this.math = null; this.math = null;

2
src/core/State.js
View file

@ -50,7 +50,7 @@ Phaser.State = function () {
this.load = null; this.load = null;
/** /**
* @property {Phaser.GameMath} math - Reference to the math helper. * @property {Phaser.Math} math - Reference to the math helper.
* @default * @default
*/ */
this.math = null; this.math = null;

10
src/loader/Loader.js
View file

@ -744,6 +744,10 @@ Phaser.Loader.prototype = {
return _this.csvLoadComplete(file.key); return _this.csvLoadComplete(file.key);
}; };
} }
else
{
throw new Error("Phaser.Loader. Invalid Tilemap format: " + file.format);
}
this._xhr.onerror = function () { this._xhr.onerror = function () {
return _this.dataLoadError(file.key); return _this.dataLoadError(file.key);
@ -873,6 +877,10 @@ Phaser.Loader.prototype = {
return _this.xmlLoadComplete(file.key); return _this.xmlLoadComplete(file.key);
}; };
} }
else
{
throw new Error("Phaser.Loader. Invalid Texture Atlas format: " + file.format);
}
this._xhr.onerror = function () { this._xhr.onerror = function () {
return _this.dataLoadError(file.key); return _this.dataLoadError(file.key);
@ -1105,4 +1113,4 @@ Phaser.Loader.prototype = {
} }
}; };

2
src/math/Math.js
View file

@ -350,7 +350,7 @@ Phaser.Math = {
if (typeof radians === "undefined") { radians = true; } if (typeof radians === "undefined") { radians = true; }
var rd = (radians) ? GameMath.PI : 180; var rd = (radians) ? Math.PI : 180;
return this.wrap(angle, rd, -rd); return this.wrap(angle, rd, -rd);
}, },