mirror of
https://github.com/wassname/phaser.git
synced 2026-08-11 11:23:06 +08:00
Group.xy(index, x, y) allows you to set the x and y coordinates of a Group child at the given index.
Group.reverse() reverses the display order of all children in the Group. New labs demo. Fixed some Easing docs issues.
This commit is contained in:
@@ -458,6 +458,17 @@ Phaser.Group.prototype.xy = function (index, x, y) {
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Reverses all children in this Group. Note that this does not propagate, only direct children are re-ordered.
|
||||
*
|
||||
* @method Phaser.Group#reverse
|
||||
*/
|
||||
Phaser.Group.prototype.reverse = function () {
|
||||
|
||||
this.children.reverse();
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the index position of the given child in this Group.
|
||||
*
|
||||
|
||||
+1
-1
@@ -586,7 +586,7 @@ Phaser.Math = {
|
||||
|
||||
/**
|
||||
* Adds value to amount and ensures that the result always stays between 0 and max, by wrapping the value around.
|
||||
* <p>Values must be positive integers, and are passed through Math.abs</p>
|
||||
* Values must be positive integers, and are passed through Math.abs.
|
||||
*
|
||||
* @method Phaser.Math#wrapValue
|
||||
* @param {number} value - The value to add the amount to.
|
||||
|
||||
+20
-20
@@ -365,11 +365,11 @@ Phaser.Easing = {
|
||||
|
||||
/**
|
||||
* Circular ease-in/out.
|
||||
*
|
||||
*
|
||||
* @method Phaser.Easing.Circular#InOut
|
||||
* @param {number} k - The value to be tweened.
|
||||
* @returns {number} The tweened value.
|
||||
*/
|
||||
*/
|
||||
InOut: function ( k ) {
|
||||
|
||||
if ( ( k *= 2 ) < 1) return - 0.5 * ( Math.sqrt( 1 - k * k) - 1);
|
||||
@@ -388,11 +388,11 @@ Phaser.Easing = {
|
||||
|
||||
/**
|
||||
* Elastic ease-in.
|
||||
*
|
||||
*
|
||||
* @method Phaser.Easing.Elastic#In
|
||||
* @param {number} k - The value to be tweened.
|
||||
* @returns {number} The tweened value.
|
||||
*/
|
||||
*/
|
||||
In: function ( k ) {
|
||||
|
||||
var s, a = 0.1, p = 0.4;
|
||||
@@ -406,11 +406,11 @@ Phaser.Easing = {
|
||||
|
||||
/**
|
||||
* Elastic ease-out.
|
||||
*
|
||||
*
|
||||
* @method Phaser.Easing.Elastic#Out
|
||||
* @param {number} k - The value to be tweened.
|
||||
* @returns {number} The tweened value.
|
||||
*/
|
||||
*/
|
||||
Out: function ( k ) {
|
||||
|
||||
var s, a = 0.1, p = 0.4;
|
||||
@@ -424,11 +424,11 @@ Phaser.Easing = {
|
||||
|
||||
/**
|
||||
* Elastic ease-in/out.
|
||||
*
|
||||
*
|
||||
* @method Phaser.Easing.Elastic#InOut
|
||||
* @param {number} k - The value to be tweened.
|
||||
* @returns {number} The tweened value.
|
||||
*/
|
||||
*/
|
||||
InOut: function ( k ) {
|
||||
|
||||
var s, a = 0.1, p = 0.4;
|
||||
@@ -452,11 +452,11 @@ Phaser.Easing = {
|
||||
|
||||
/**
|
||||
* Back ease-in.
|
||||
*
|
||||
*
|
||||
* @method Phaser.Easing.Back#In
|
||||
* @param {number} k - The value to be tweened.
|
||||
* @returns {number} The tweened value.
|
||||
*/
|
||||
*/
|
||||
In: function ( k ) {
|
||||
|
||||
var s = 1.70158;
|
||||
@@ -466,11 +466,11 @@ Phaser.Easing = {
|
||||
|
||||
/**
|
||||
* Back ease-out.
|
||||
*
|
||||
*
|
||||
* @method Phaser.Easing.Back#Out
|
||||
* @param {number} k - The value to be tweened.
|
||||
* @returns {number} The tweened value.
|
||||
*/
|
||||
*/
|
||||
Out: function ( k ) {
|
||||
|
||||
var s = 1.70158;
|
||||
@@ -480,11 +480,11 @@ Phaser.Easing = {
|
||||
|
||||
/**
|
||||
* Back ease-in/out.
|
||||
*
|
||||
*
|
||||
* @method Phaser.Easing.Back#InOut
|
||||
* @param {number} k - The value to be tweened.
|
||||
* @returns {number} The tweened value.
|
||||
*/
|
||||
*/
|
||||
InOut: function ( k ) {
|
||||
|
||||
var s = 1.70158 * 1.525;
|
||||
@@ -504,11 +504,11 @@ Phaser.Easing = {
|
||||
|
||||
/**
|
||||
* Bounce ease-in.
|
||||
*
|
||||
*
|
||||
* @method Phaser.Easing.Bounce#In
|
||||
* @param {number} k - The value to be tweened.
|
||||
* @returns {number} The tweened value.
|
||||
*/
|
||||
*/
|
||||
In: function ( k ) {
|
||||
|
||||
return 1 - Phaser.Easing.Bounce.Out( 1 - k );
|
||||
@@ -517,11 +517,11 @@ Phaser.Easing = {
|
||||
|
||||
/**
|
||||
* Bounce ease-out.
|
||||
*
|
||||
*
|
||||
* @method Phaser.Easing.Bounce#Out
|
||||
* @param {number} k - The value to be tweened.
|
||||
* @returns {number} The tweened value.
|
||||
*/
|
||||
*/
|
||||
Out: function ( k ) {
|
||||
|
||||
if ( k < ( 1 / 2.75 ) ) {
|
||||
@@ -546,11 +546,11 @@ Phaser.Easing = {
|
||||
|
||||
/**
|
||||
* Bounce ease-in/out.
|
||||
*
|
||||
*
|
||||
* @method Phaser.Easing.Bounce#InOut
|
||||
* @param {number} k - The value to be tweened.
|
||||
* @returns {number} The tweened value.
|
||||
*/
|
||||
*/
|
||||
InOut: function ( k ) {
|
||||
|
||||
if ( k < 0.5 ) return Phaser.Easing.Bounce.In( k * 2 ) * 0.5;
|
||||
|
||||
+12
-2
@@ -310,9 +310,10 @@ Phaser.Tween.prototype = {
|
||||
*
|
||||
* @method Phaser.Tween#generateData
|
||||
* @param {number} [frameRate=60] - The speed in frames per second that the data should be generated at. The higher the value, the larger the array it creates.
|
||||
* @param {array} [data] - If given the generated data will be appended to this array, otherwise a new array will be returned.
|
||||
* @return {array} An array of tweened values.
|
||||
*/
|
||||
generateData: function (frameRate) {
|
||||
generateData: function (frameRate, data) {
|
||||
|
||||
if (this.game === null || this._object === null)
|
||||
{
|
||||
@@ -399,7 +400,16 @@ Phaser.Tween.prototype = {
|
||||
output = output.concat(reversed);
|
||||
}
|
||||
|
||||
return output;
|
||||
if (typeof data !== 'undefined')
|
||||
{
|
||||
data = data.concat(output);
|
||||
|
||||
return data;
|
||||
}
|
||||
else
|
||||
{
|
||||
return output;
|
||||
}
|
||||
|
||||
},
|
||||
|
||||
|
||||
Reference in New Issue
Block a user