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

Fixed various issues in the TweenManager, added length property to Group and improved the build script.

Browse Source
This commit is contained in:
Richard Davey
2013-09-19 04:45:08 +01:00
parent cf26f68693
commit c5fc5e3394
8 changed files with 106 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+4
View File
@@ -39,6 +39,10 @@ Version 1.0.5 (In progress)
* Fixed issue in FrameData.getFrameIndexes where the input array was being ignored.
* Added Math.numberArray - Returns an Array containing the numbers from min to max (inclusive), useful for animation frame construction.
* Fixed a horrendously sneaky bug: If a new tween was created in the onComplete callback of a tween about to be deleted, it would get automatically spliced.
* Added a pendingDelete property to Tween to stop tweens that were removed during a callback from causing update errors during the TweenManager loop.
* Added Group.length property.
Version 1.0.4 (September 18th 2013)
build/build.php
+13 -2
View File
@@ -2,7 +2,13 @@
<textarea style="width: 800px; height: 800px">
<?php
// Get the version number
// VERSION: '1.0.5',
$vf = file_get_contents('../src/Phaser.js');
$version = substr($vf, strpos($vf, 'VERSION: ') + 10, 5);
echo "Building version $version \n\n";
$js = file('../examples/js.php');
$output = "";
@@ -15,16 +21,21 @@
{
$line = str_replace('<script src="', '', $line);
$line = str_replace('"></script>', '', $line);
$filename = substr($line, strrpos($line, '/') + 1);
echo $line . "\n";
// echo $filename . "\n";
// Read the file in
$source = file_get_contents($line);
if ($i == 4)
if ($filename == 'Intro.js')
{
// Built at: {buildDate}
$source = str_replace('{buildDate}', date('r'), $source);
// {version}
$source = str_replace('{version}', $version, $source);
}
$output .= $source . "\n";
build/phaser.js
+55 -17
View File
@@ -1,7 +1,7 @@
/**
* Phaser - http://www.phaser.io
*
* v1.0.1 - Built at: Wed, 18 Sep 2013 05:29:56 +0000
* v1.0.5 - Built at: Thu, 19 Sep 2013 03:03:05 +0000
*
* @author Richard Davey http://www.photonstorm.com @photonstorm
*
@@ -34,7 +34,7 @@ var PIXI = PIXI || {};
*/
var Phaser = Phaser || {
VERSION: '1.0.4',
VERSION: '1.0.5',
GAMES: [],
AUTO: 0,
CANVAS: 1,
@@ -16769,6 +16769,26 @@ Phaser.Math = {
}
}
},
/**
* Returns an Array containing the numbers from min to max (inclusive)
*
* @param min The minimum value the array starts with
* @param max The maximum value the array contains
* @return The array of number values
*/
numberArray: function (min, max) {
var result = [];
for (var i = min; i <= max; i++)
{
result.push(i);
}
return result;
},
/**
@@ -19282,6 +19302,7 @@ Phaser.TweenManager = function (game) {
this.game = game;
this._tweens = [];
this._add = [];
this.game.onPause.add(this.pauseAll, this);
this.game.onResume.add(this.resumeAll, this);
@@ -19319,7 +19340,7 @@ Phaser.TweenManager.prototype = {
*/
add: function ( tween ) {
this._tweens.push( tween );
this._add.push( tween );
},
@@ -19346,7 +19367,7 @@ Phaser.TweenManager.prototype = {
if ( i !== -1 ) {
this._tweens.splice( i, 1 );
this._tweens[i].pendingDelete = true;
}
@@ -19359,9 +19380,10 @@ Phaser.TweenManager.prototype = {
*/
update: function () {
if ( this._tweens.length === 0 ) return false;
if ( this._tweens.length === 0 && this._add.length === 0 ) return false;
var i = 0, numTweens = this._tweens.length;
var i = 0;
var numTweens = this._tweens.length;
while ( i < numTweens ) {
@@ -19379,6 +19401,13 @@ Phaser.TweenManager.prototype = {
}
// If there are any new tweens to be added, do so now - otherwise they can be spliced out of the array before ever running
if (this._add.length > 0)
{
this._tweens = this._tweens.concat(this._add);
this._add.length = 0;
}
return true;
},
@@ -19444,6 +19473,8 @@ Phaser.Tween = function (object, game) {
this._pausedTime = 0;
this.pendingDelete = false;
// Set all starting values present on the target object
for ( var field in object ) {
this._valuesStart[ field ] = parseFloat(object[field], 10);
@@ -19598,21 +19629,21 @@ Phaser.Tween.prototype = {
},
onStart: function ( callback ) {
onStartCallback: function ( callback ) {
this._onStartCallback = callback;
return this;
},
onUpdate: function ( callback ) {
onUpdateCallback: function ( callback ) {
this._onUpdateCallback = callback;
return this;
},
onComplete: function ( callback ) {
onCompleteCallback: function ( callback ) {
this._onCompleteCallback = callback;
return this;
@@ -19630,6 +19661,11 @@ Phaser.Tween.prototype = {
update: function ( time ) {
if (this.pendingDelete)
{
return false;
}
if (this._paused || time < this._startTime) {
return true;
@@ -20819,8 +20855,8 @@ Phaser.Animation.prototype = {
if (frameRate !== null)
{
// this.delay = 1000 / frameRate;
this.delay = frameRate;
this.delay = 1000 / frameRate;
// this.delay = frameRate;
}
if (loop !== null)
@@ -21421,14 +21457,14 @@ Phaser.Animation.FrameData.prototype = {
* @param {Array} [output] Optional array. If given the results will be appended to the end of this Array, otherwise a new array is created.
* @return {Array} An array of all Frame indexes matching the given names or IDs.
*/
getFrameIndexes: function (input, useNumericIndex, output) {
getFrameIndexes: function (frames, useNumericIndex, output) {
if (typeof useNumericIndex === "undefined") { useNumericIndex = true; }
if (typeof output === "undefined") { output = []; }
if (typeof frames === "undefined" || frames.length == 0)
{
// No input array, so we loop through all frames
// No frames array, so we loop through all frames
for (var i = 0, len = this._frames.length; i < len; i++)
{
output.push(this._frames[i].index);
@@ -21437,16 +21473,16 @@ Phaser.Animation.FrameData.prototype = {
else
{
// Input array given, loop through that instead
for (var i = 0, len = input.length; i < len; i++)
for (var i = 0, len = frames.length; i < len; i++)
{
// Does the input array contain names or indexes?
// Does the frames array contain names or indexes?
if (useNumericIndex)
{
output.push(input[i].index);
output.push(frames[i].index);
}
else
{
output.push(this.getFrameByName(input[i]).index);
output.push(this.getFrameByName(frames[i]).index);
}
}
}
@@ -21613,6 +21649,7 @@ Phaser.Animation.Parser = {
);
PIXI.TextureCache[uuid].realSize = frames[i].spriteSourceSize;
// PIXI.TextureCache[uuid].realSize = frames[i].sourceSize;
PIXI.TextureCache[uuid].trim.x = 0;
}
}
@@ -21682,6 +21719,7 @@ Phaser.Animation.Parser = {
);
PIXI.TextureCache[uuid].realSize = frames[key].spriteSourceSize;
// PIXI.TextureCache[uuid].realSize = frames[key].sourceSize;
PIXI.TextureCache[uuid].trim.x = 0;
}
src/Intro.js
+1 -1
View File
@@ -1,7 +1,7 @@
/**
* Phaser - http://www.phaser.io
*
* v1.0.1 - Built at: {buildDate}
* v{version} - Built at: {buildDate}
*
* @author Richard Davey http://www.photonstorm.com @photonstorm
*
src/animation/Parser.js
+2
View File
@@ -139,6 +139,7 @@ Phaser.Animation.Parser = {
);
PIXI.TextureCache[uuid].realSize = frames[i].spriteSourceSize;
// PIXI.TextureCache[uuid].realSize = frames[i].sourceSize;
PIXI.TextureCache[uuid].trim.x = 0;
}
}
@@ -208,6 +209,7 @@ Phaser.Animation.Parser = {
);
PIXI.TextureCache[uuid].realSize = frames[key].spriteSourceSize;
// PIXI.TextureCache[uuid].realSize = frames[key].sourceSize;
PIXI.TextureCache[uuid].trim.x = 0;
}
src/core/Group.js
+8
View File
@@ -832,6 +832,14 @@ Phaser.Group.prototype = {
};
Object.defineProperty(Phaser.Group.prototype, "length", {
get: function () {
return this._container.children.length;
}
});
Object.defineProperty(Phaser.Group.prototype, "x", {
get: function () {
src/tween/Tween.js
+10 -3
View File
@@ -36,6 +36,8 @@ Phaser.Tween = function (object, game) {
this._pausedTime = 0;
this.pendingDelete = false;
// Set all starting values present on the target object
for ( var field in object ) {
this._valuesStart[ field ] = parseFloat(object[field], 10);
@@ -190,21 +192,21 @@ Phaser.Tween.prototype = {
},
onStart: function ( callback ) {
onStartCallback: function ( callback ) {
this._onStartCallback = callback;
return this;
},
onUpdate: function ( callback ) {
onUpdateCallback: function ( callback ) {
this._onUpdateCallback = callback;
return this;
},
onComplete: function ( callback ) {
onCompleteCallback: function ( callback ) {
this._onCompleteCallback = callback;
return this;
@@ -222,6 +224,11 @@ Phaser.Tween.prototype = {
update: function ( time ) {
if (this.pendingDelete)
{
return false;
}
if (this._paused || time < this._startTime) {
return true;
src/tween/TweenManager.js
+13 -4
View File
@@ -13,6 +13,7 @@ Phaser.TweenManager = function (game) {
this.game = game;
this._tweens = [];
this._add = [];
this.game.onPause.add(this.pauseAll, this);
this.game.onResume.add(this.resumeAll, this);
@@ -50,7 +51,7 @@ Phaser.TweenManager.prototype = {
*/
add: function ( tween ) {
this._tweens.push( tween );
this._add.push( tween );
},
@@ -77,7 +78,7 @@ Phaser.TweenManager.prototype = {
if ( i !== -1 ) {
this._tweens.splice( i, 1 );
this._tweens[i].pendingDelete = true;
}
@@ -90,9 +91,10 @@ Phaser.TweenManager.prototype = {
*/
update: function () {
if ( this._tweens.length === 0 ) return false;
if ( this._tweens.length === 0 && this._add.length === 0 ) return false;
var i = 0, numTweens = this._tweens.length;
var i = 0;
var numTweens = this._tweens.length;
while ( i < numTweens ) {
@@ -110,6 +112,13 @@ Phaser.TweenManager.prototype = {
}
// If there are any new tweens to be added, do so now - otherwise they can be spliced out of the array before ever running
if (this._add.length > 0)
{
this._tweens = this._tweens.concat(this._add);
this._add.length = 0;
}
return true;
},