mirror of
https://github.com/wassname/phaser.git
synced 2026-07-21 12:40:56 +08:00
The entire Phaser library has been updated to match the new JSHint configuration.
This commit is contained in:
+5
-5
@@ -79,13 +79,13 @@ Phaser.Color = {
|
||||
var argb = Phaser.Color.getRGB(color);
|
||||
var hsl = Phaser.Color.RGBtoHSV(color);
|
||||
|
||||
// Hex format
|
||||
// Hex format
|
||||
var result = Phaser.Color.RGBtoHexstring(color) + "\n";
|
||||
|
||||
// RGB format
|
||||
// RGB format
|
||||
result = result.concat("Alpha: " + argb.alpha + " Red: " + argb.red + " Green: " + argb.green + " Blue: " + argb.blue) + "\n";
|
||||
|
||||
// HSL info
|
||||
// HSL info
|
||||
result = result.concat("Hue: " + hsl.hue + " Saturation: " + hsl.saturation + " Lightnes: " + hsl.lightness);
|
||||
|
||||
return result;
|
||||
@@ -232,7 +232,7 @@ Phaser.Color = {
|
||||
if (typeof max === "undefined") { max = 255; }
|
||||
if (typeof alpha === "undefined") { alpha = 255; }
|
||||
|
||||
// Sanity checks
|
||||
// Sanity checks
|
||||
if (max > 255) {
|
||||
return Phaser.Color.getColor(255, 255, 255);
|
||||
}
|
||||
@@ -347,5 +347,5 @@ Phaser.Color = {
|
||||
getBlue: function (color) {
|
||||
return color & 0xFF;
|
||||
}
|
||||
|
||||
|
||||
};
|
||||
|
||||
+43
-43
@@ -15,47 +15,47 @@
|
||||
Phaser.Utils.Debug = function (game) {
|
||||
|
||||
/**
|
||||
* @property {Phaser.Game} game - A reference to the currently running Game.
|
||||
*/
|
||||
* @property {Phaser.Game} game - A reference to the currently running Game.
|
||||
*/
|
||||
this.game = game;
|
||||
|
||||
/**
|
||||
* @property {Context} context - The canvas context on which to render the debug information.
|
||||
*/
|
||||
/**
|
||||
* @property {Context} context - The canvas context on which to render the debug information.
|
||||
*/
|
||||
this.context = game.context;
|
||||
|
||||
/**
|
||||
* @property {string} font - The font that the debug information is rendered in.
|
||||
* @default '14px Courier'
|
||||
*/
|
||||
/**
|
||||
* @property {string} font - The font that the debug information is rendered in.
|
||||
* @default '14px Courier'
|
||||
*/
|
||||
this.font = '14px Courier';
|
||||
|
||||
/**
|
||||
* @property {number} lineHeight - The line height between the debug text.
|
||||
*/
|
||||
/**
|
||||
* @property {number} lineHeight - The line height between the debug text.
|
||||
*/
|
||||
this.lineHeight = 16;
|
||||
|
||||
/**
|
||||
* @property {boolean} renderShadow - Should the text be rendered with a slight shadow? Makes it easier to read on different types of background.
|
||||
*/
|
||||
/**
|
||||
* @property {boolean} renderShadow - Should the text be rendered with a slight shadow? Makes it easier to read on different types of background.
|
||||
*/
|
||||
this.renderShadow = true;
|
||||
|
||||
/**
|
||||
* @property {Context} currentX - The current X position the debug information will be rendered at.
|
||||
* @default
|
||||
*/
|
||||
/**
|
||||
* @property {Context} currentX - The current X position the debug information will be rendered at.
|
||||
* @default
|
||||
*/
|
||||
this.currentX = 0;
|
||||
|
||||
/**
|
||||
* @property {number} currentY - The current Y position the debug information will be rendered at.
|
||||
* @default
|
||||
*/
|
||||
/**
|
||||
* @property {number} currentY - The current Y position the debug information will be rendered at.
|
||||
* @default
|
||||
*/
|
||||
this.currentY = 0;
|
||||
|
||||
/**
|
||||
* @property {number} currentAlpha - The current alpha the debug information will be rendered at.
|
||||
* @default
|
||||
*/
|
||||
/**
|
||||
* @property {number} currentAlpha - The current alpha the debug information will be rendered at.
|
||||
* @default
|
||||
*/
|
||||
this.currentAlpha = 1;
|
||||
|
||||
};
|
||||
@@ -184,13 +184,13 @@ Phaser.Utils.Debug.prototype = {
|
||||
},
|
||||
|
||||
/**
|
||||
* Renders the corners and point information of the given Sprite.
|
||||
* @method Phaser.Utils.Debug#renderSpriteCorners
|
||||
* @param {Phaser.Sprite} sprite - The sprite to be rendered.
|
||||
* @param {boolean} [showText=false] - If true the x/y coordinates of each point will be rendered.
|
||||
* @param {boolean} [showBounds=false] - If true the bounds will be rendered over the top of the sprite.
|
||||
* @param {string} [color='rgb(255,0,255)'] - The color the text is rendered in.
|
||||
*/
|
||||
* Renders the corners and point information of the given Sprite.
|
||||
* @method Phaser.Utils.Debug#renderSpriteCorners
|
||||
* @param {Phaser.Sprite} sprite - The sprite to be rendered.
|
||||
* @param {boolean} [showText=false] - If true the x/y coordinates of each point will be rendered.
|
||||
* @param {boolean} [showBounds=false] - If true the bounds will be rendered over the top of the sprite.
|
||||
* @param {string} [color='rgb(255,0,255)'] - The color the text is rendered in.
|
||||
*/
|
||||
renderSpriteCorners: function (sprite, showText, showBounds, color) {
|
||||
|
||||
if (this.context == null)
|
||||
@@ -372,7 +372,7 @@ Phaser.Utils.Debug.prototype = {
|
||||
* @param {number} x - X position of the debug info to be rendered.
|
||||
* @param {number} y - Y position of the debug info to be rendered.
|
||||
* @param {string} [color='rgb(255,255,255)'] - color of the debug info to be rendered. (format is css color string).
|
||||
*/
|
||||
*/
|
||||
renderSpriteInputInfo: function (sprite, x, y, color) {
|
||||
|
||||
color = color || 'rgb(255,255,255)';
|
||||
@@ -388,13 +388,13 @@ Phaser.Utils.Debug.prototype = {
|
||||
},
|
||||
|
||||
/**
|
||||
* Render Sprite collision.
|
||||
* @method Phaser.Utils.Debug#renderSpriteCollision
|
||||
* @param {Phaser.Sprite} sprite - The sprite to be rendered.
|
||||
* @param {number} x - X position of the debug info to be rendered.
|
||||
* @param {number} y - Y position of the debug info to be rendered.
|
||||
* Render Sprite collision.
|
||||
* @method Phaser.Utils.Debug#renderSpriteCollision
|
||||
* @param {Phaser.Sprite} sprite - The sprite to be rendered.
|
||||
* @param {number} x - X position of the debug info to be rendered.
|
||||
* @param {number} y - Y position of the debug info to be rendered.
|
||||
* @param {string} [color='rgb(255,255,255)'] - color of the debug info to be rendered. (format is css color string).
|
||||
*/
|
||||
*/
|
||||
renderSpriteCollision: function (sprite, x, y, color) {
|
||||
|
||||
color = color || 'rgb(255,255,255)';
|
||||
@@ -779,7 +779,7 @@ Phaser.Utils.Debug.prototype = {
|
||||
* @param {number} y - Y position of the debug info to be rendered.
|
||||
* @param {string} [color] - Color of the debug info to be rendered (format is css color string).
|
||||
* @param {string} font - The font of text to draw.
|
||||
*/
|
||||
*/
|
||||
renderText: function (text, x, y, color, font) {
|
||||
|
||||
if (this.context == null)
|
||||
@@ -819,7 +819,7 @@ Phaser.Utils.Debug.prototype = {
|
||||
var testObject = entity.last.next;
|
||||
entity = entity.first;
|
||||
|
||||
do
|
||||
do
|
||||
{
|
||||
var name = entity.sprite.name || '*';
|
||||
var nameNext = '-';
|
||||
|
||||
+181
-167
@@ -1,3 +1,5 @@
|
||||
/* jshint supernew: true */
|
||||
|
||||
/**
|
||||
* @author Richard Davey <rich@photonstorm.com>
|
||||
* @copyright 2013 Photon Storm Ltd.
|
||||
@@ -9,67 +11,69 @@
|
||||
* @static
|
||||
*/
|
||||
Phaser.Utils = {
|
||||
|
||||
/**
|
||||
* A standard Fisher-Yates Array shuffle implementation.
|
||||
* @method Phaser.Utils.shuffle
|
||||
* @param {array} array - The array to shuffle.
|
||||
* @return {array} The shuffled array.
|
||||
*/
|
||||
shuffle: function (array) {
|
||||
|
||||
/**
|
||||
* A standard Fisher-Yates Array shuffle implementation.
|
||||
* @method Phaser.Utils.shuffle
|
||||
* @param {array} array - The array to shuffle.
|
||||
* @return {array} The shuffled array.
|
||||
*/
|
||||
shuffle: function (array) {
|
||||
|
||||
for (var i = array.length - 1; i > 0; i--)
|
||||
{
|
||||
var j = Math.floor(Math.random() * (i + 1));
|
||||
var temp = array[i];
|
||||
array[i] = array[j];
|
||||
array[j] = temp;
|
||||
}
|
||||
for (var i = array.length - 1; i > 0; i--)
|
||||
{
|
||||
var j = Math.floor(Math.random() * (i + 1));
|
||||
var temp = array[i];
|
||||
array[i] = array[j];
|
||||
array[j] = temp;
|
||||
}
|
||||
|
||||
return array;
|
||||
|
||||
},
|
||||
return array;
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* Javascript string pad http://www.webtoolkit.info/.
|
||||
* pad = the string to pad it out with (defaults to a space)
|
||||
* dir = 1 (left), 2 (right), 3 (both)
|
||||
* @method Phaser.Utils.pad
|
||||
* @param {string} str - The target string.
|
||||
* @param {number} len - Description.
|
||||
* @param {number} pad - the string to pad it out with (defaults to a space).
|
||||
* @param {number} [dir=3] the direction dir = 1 (left), 2 (right), 3 (both).
|
||||
* @return {string} The padded string
|
||||
*/
|
||||
pad: function (str, len, pad, dir) {
|
||||
/**
|
||||
* Javascript string pad http://www.webtoolkit.info/.
|
||||
* pad = the string to pad it out with (defaults to a space)
|
||||
* dir = 1 (left), 2 (right), 3 (both)
|
||||
* @method Phaser.Utils.pad
|
||||
* @param {string} str - The target string.
|
||||
* @param {number} len - Description.
|
||||
* @param {number} pad - the string to pad it out with (defaults to a space).
|
||||
* @param {number} [dir=3] the direction dir = 1 (left), 2 (right), 3 (both).
|
||||
* @return {string} The padded string
|
||||
*/
|
||||
pad: function (str, len, pad, dir) {
|
||||
|
||||
if (typeof(len) == "undefined") { var len = 0; }
|
||||
if (typeof(pad) == "undefined") { var pad = ' '; }
|
||||
if (typeof(dir) == "undefined") { var dir = 3; }
|
||||
if (typeof(len) == "undefined") { var len = 0; }
|
||||
if (typeof(pad) == "undefined") { var pad = ' '; }
|
||||
if (typeof(dir) == "undefined") { var dir = 3; }
|
||||
|
||||
if (len + 1 >= str.length)
|
||||
{
|
||||
switch (dir)
|
||||
{
|
||||
case 1:
|
||||
str = Array(len + 1 - str.length).join(pad) + str;
|
||||
break;
|
||||
var padlen = 0;
|
||||
|
||||
case 3:
|
||||
var right = Math.ceil((padlen = len - str.length) / 2);
|
||||
var left = padlen - right;
|
||||
str = Array(left+1).join(pad) + str + Array(right+1).join(pad);
|
||||
break;
|
||||
if (len + 1 >= str.length)
|
||||
{
|
||||
switch (dir)
|
||||
{
|
||||
case 1:
|
||||
str = Array(len + 1 - str.length).join(pad) + str;
|
||||
break;
|
||||
|
||||
default:
|
||||
str = str + Array(len + 1 - str.length).join(pad);
|
||||
break;
|
||||
}
|
||||
}
|
||||
case 3:
|
||||
var right = Math.ceil((padlen = len - str.length) / 2);
|
||||
var left = padlen - right;
|
||||
str = Array(left+1).join(pad) + str + Array(right+1).join(pad);
|
||||
break;
|
||||
|
||||
return str;
|
||||
default:
|
||||
str = str + Array(len + 1 - str.length).join(pad);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
},
|
||||
return str;
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* This is a slightly modified version of jQuery.isPlainObject. A plain object is an object whose internal class property is [object Object].
|
||||
@@ -77,41 +81,41 @@ Phaser.Utils = {
|
||||
* @param {object} obj - The object to inspect.
|
||||
* @return {boolean} - true if the object is plain, otherwise false.
|
||||
*/
|
||||
isPlainObject: function (obj) {
|
||||
isPlainObject: function (obj) {
|
||||
|
||||
// Not plain objects:
|
||||
// - Any object or value whose internal [[Class]] property is not "[object Object]"
|
||||
// - DOM nodes
|
||||
// - window
|
||||
if (typeof(obj) !== "object" || obj.nodeType || obj === obj.window)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
// Not plain objects:
|
||||
// - Any object or value whose internal [[Class]] property is not "[object Object]"
|
||||
// - DOM nodes
|
||||
// - window
|
||||
if (typeof(obj) !== "object" || obj.nodeType || obj === obj.window)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// Support: Firefox <20
|
||||
// The try/catch suppresses exceptions thrown when attempting to access
|
||||
// the "constructor" property of certain host objects, ie. |window.location|
|
||||
// https://bugzilla.mozilla.org/show_bug.cgi?id=814622
|
||||
try {
|
||||
if (obj.constructor && !hasOwn.call(obj.constructor.prototype, "isPrototypeOf"))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
} catch (e) {
|
||||
return false;
|
||||
}
|
||||
// Support: Firefox <20
|
||||
// The try/catch suppresses exceptions thrown when attempting to access
|
||||
// the "constructor" property of certain host objects, ie. |window.location|
|
||||
// https://bugzilla.mozilla.org/show_bug.cgi?id=814622
|
||||
try {
|
||||
if (obj.constructor && !hasOwn.call(obj.constructor.prototype, "isPrototypeOf"))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
} catch (e) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// If the function hasn't returned already, we're confident that
|
||||
// |obj| is a plain object, created by {} or constructed with new Object
|
||||
return true;
|
||||
},
|
||||
// If the function hasn't returned already, we're confident that
|
||||
// |obj| is a plain object, created by {} or constructed with new Object
|
||||
return true;
|
||||
},
|
||||
|
||||
|
||||
// deep, target, objects to copy to the target object
|
||||
// This is a slightly modified version of {@link http://api.jquery.com/jQuery.extend/|jQuery.extend}
|
||||
// deep (boolean)
|
||||
// target (object to add to)
|
||||
// objects ... (objects to recurse and copy from)
|
||||
// deep, target, objects to copy to the target object
|
||||
// This is a slightly modified version of {@link http://api.jquery.com/jQuery.extend/|jQuery.extend}
|
||||
// deep (boolean)
|
||||
// target (object to add to)
|
||||
// objects ... (objects to recurse and copy from)
|
||||
|
||||
/**
|
||||
* This is a slightly modified version of http://api.jquery.com/jQuery.extend/
|
||||
@@ -120,87 +124,87 @@ Phaser.Utils = {
|
||||
* @param {object} target - The target object to copy to.
|
||||
* @return {object} The extended object.
|
||||
*/
|
||||
extend: function () {
|
||||
extend: function () {
|
||||
|
||||
var options, name, src, copy, copyIsArray, clone,
|
||||
target = arguments[0] || {},
|
||||
i = 1,
|
||||
length = arguments.length,
|
||||
deep = false;
|
||||
var options, name, src, copy, copyIsArray, clone,
|
||||
target = arguments[0] || {},
|
||||
i = 1,
|
||||
length = arguments.length,
|
||||
deep = false;
|
||||
|
||||
// Handle a deep copy situation
|
||||
if (typeof target === "boolean")
|
||||
{
|
||||
deep = target;
|
||||
target = arguments[1] || {};
|
||||
// skip the boolean and the target
|
||||
i = 2;
|
||||
}
|
||||
// Handle a deep copy situation
|
||||
if (typeof target === "boolean")
|
||||
{
|
||||
deep = target;
|
||||
target = arguments[1] || {};
|
||||
// skip the boolean and the target
|
||||
i = 2;
|
||||
}
|
||||
|
||||
// extend Phaser if only one argument is passed
|
||||
if (length === i)
|
||||
{
|
||||
target = this;
|
||||
--i;
|
||||
}
|
||||
// extend Phaser if only one argument is passed
|
||||
if (length === i)
|
||||
{
|
||||
target = this;
|
||||
--i;
|
||||
}
|
||||
|
||||
for ( ; i < length; i++ )
|
||||
{
|
||||
// Only deal with non-null/undefined values
|
||||
if ((options = arguments[i]) != null)
|
||||
{
|
||||
// Extend the base object
|
||||
for (name in options)
|
||||
{
|
||||
src = target[name];
|
||||
copy = options[name];
|
||||
for ( ; i < length; i++ )
|
||||
{
|
||||
// Only deal with non-null/undefined values
|
||||
if ((options = arguments[i]) != null)
|
||||
{
|
||||
// Extend the base object
|
||||
for (name in options)
|
||||
{
|
||||
src = target[name];
|
||||
copy = options[name];
|
||||
|
||||
// Prevent never-ending loop
|
||||
if (target === copy)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
// Prevent never-ending loop
|
||||
if (target === copy)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
// Recurse if we're merging plain objects or arrays
|
||||
if (deep && copy && (Phaser.Utils.isPlainObject(copy) || (copyIsArray = Array.isArray(copy))))
|
||||
{
|
||||
if (copyIsArray)
|
||||
{
|
||||
copyIsArray = false;
|
||||
clone = src && Array.isArray(src) ? src : [];
|
||||
}
|
||||
else
|
||||
{
|
||||
clone = src && Phaser.Utils.isPlainObject(src) ? src : {};
|
||||
}
|
||||
// Recurse if we're merging plain objects or arrays
|
||||
if (deep && copy && (Phaser.Utils.isPlainObject(copy) || (copyIsArray = Array.isArray(copy))))
|
||||
{
|
||||
if (copyIsArray)
|
||||
{
|
||||
copyIsArray = false;
|
||||
clone = src && Array.isArray(src) ? src : [];
|
||||
}
|
||||
else
|
||||
{
|
||||
clone = src && Phaser.Utils.isPlainObject(src) ? src : {};
|
||||
}
|
||||
|
||||
// Never move original objects, clone them
|
||||
target[name] = Phaser.Utils.extend(deep, clone, copy);
|
||||
// Never move original objects, clone them
|
||||
target[name] = Phaser.Utils.extend(deep, clone, copy);
|
||||
|
||||
// Don't bring in undefined values
|
||||
}
|
||||
else if (copy !== undefined)
|
||||
{
|
||||
target[name] = copy;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// Don't bring in undefined values
|
||||
}
|
||||
else if (copy !== undefined)
|
||||
{
|
||||
target[name] = copy;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Return the modified object
|
||||
return target;
|
||||
}
|
||||
// Return the modified object
|
||||
return target;
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
// Global functions that PIXI needs
|
||||
// Global functions that PIXI needs
|
||||
|
||||
(function() {
|
||||
var consoleDisabled = false;
|
||||
if (consoleDisabled) {
|
||||
window.console = undefined;
|
||||
}
|
||||
if (window.console == undefined) {
|
||||
if (window.console === undefined) {
|
||||
window.console = {
|
||||
debug: function() {
|
||||
return true;
|
||||
@@ -237,32 +241,42 @@ Phaser.Utils = {
|
||||
* @return {array}
|
||||
*/
|
||||
function HEXtoRGB(hex) {
|
||||
return [(hex >> 16 & 0xFF) / 255, ( hex >> 8 & 0xFF) / 255, (hex & 0xFF)/ 255];
|
||||
return [(hex >> 16 & 0xFF) / 255, ( hex >> 8 & 0xFF) / 255, (hex & 0xFF)/ 255];
|
||||
}
|
||||
|
||||
/**
|
||||
* A polyfill for Function.prototype.bind
|
||||
*/
|
||||
if (typeof Function.prototype.bind != 'function') {
|
||||
Function.prototype.bind = (function () {
|
||||
var slice = Array.prototype.slice;
|
||||
return function (thisArg) {
|
||||
var target = this, boundArgs = slice.call(arguments, 1);
|
||||
|
||||
if (typeof target != 'function') throw new TypeError();
|
||||
|
||||
function bound() {
|
||||
var args = boundArgs.concat(slice.call(arguments));
|
||||
target.apply(this instanceof bound ? this : thisArg, args);
|
||||
}
|
||||
|
||||
bound.prototype = (function F(proto) {
|
||||
proto && (F.prototype = proto);
|
||||
if (!(this instanceof F)) return new F;
|
||||
})(target.prototype);
|
||||
|
||||
return bound;
|
||||
};
|
||||
})();
|
||||
}
|
||||
|
||||
Function.prototype.bind = (function () {
|
||||
|
||||
var slice = Array.prototype.slice;
|
||||
|
||||
return function (thisArg) {
|
||||
|
||||
var target = this, boundArgs = slice.call(arguments, 1);
|
||||
|
||||
if (typeof target != 'function')
|
||||
{
|
||||
throw new TypeError();
|
||||
}
|
||||
|
||||
function bound() {
|
||||
var args = boundArgs.concat(slice.call(arguments));
|
||||
target.apply(this instanceof bound ? this : thisArg, args);
|
||||
}
|
||||
|
||||
bound.prototype = (function F(proto) {
|
||||
proto && (F.prototype = proto);
|
||||
|
||||
if (!(this instanceof F))
|
||||
{
|
||||
return new F;
|
||||
}
|
||||
})(target.prototype);
|
||||
|
||||
return bound;
|
||||
};
|
||||
})();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user