archive-gh-me/tween.js
1
0
Fork 0
mirror of https://github.com/tweenjs/tween.js.git synced 2026-02-01 17:27:10 +00:00
Code Issues Projects Releases Wiki Activity

Add repeatDelay

Browse Source 
repeatDelay is used to control the delay time between each repeat.  This
is useful if, for example, you want to have a 2 second delay between
each repeat but you want the Tween to start immediately. The current
delay method will cause the Tween to delay 2 seconds before starting.
This commit is contained in:
Mark Sandstrom 2013-09-05 20:18:27 -07:00
parent 5c9e9d961e
commit 074138c72e
2 changed files with 104 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Tween.js
View File

@ -100,6 +100,7 @@ TWEEN.Tween = function ( object ) {
var _valuesStartRepeat = {};
var _duration = 1000;
var _repeat = 0;
var _repeatDelayTime = undefined;
var _yoyo = false;
var _reversed = false;
var _delayTime = 0;
@ -193,6 +194,13 @@ TWEEN.Tween = function ( object ) {
};
this.repeatDelay = function ( amount ) {
_repeatDelayTime = amount;
return this;
};
this.yoyo = function( yoyo ) {
_yoyo = yoyo;
@ -326,7 +334,11 @@ TWEEN.Tween = function ( object ) {
}
_startTime = time + _delayTime;
if (_repeatDelayTime !== undefined) {
_startTime = time + _repeatDelayTime;
} else {
_startTime = time + _delayTime;
}
return true;

92
test/unit/TestTweens.js
View File

@ -594,4 +594,94 @@ test( "Test yoyo with repeat 1 happens once", function() {
TWEEN.update( 225 );
equal( obj.x, 0 );
});
});
// If repeatDelay isn't specified then delay is used since
// that's the way it worked before repeatDelay was added.
test( "Test delay adds delay before each repeat", function() {
TWEEN.removeAll();
var obj = { x: 0 },
t = new TWEEN.Tween( obj ).to( { x: 100 }, 100 ).repeat( 1 ).delay(100);
t.start( 0 );
TWEEN.update( 100 );
equal( obj.x, 0 );
TWEEN.update( 150 );
equal( obj.x, 50 );
TWEEN.update( 200 );
equal( obj.x, 100 );
TWEEN.update( 300 );
equal( obj.x, 0 );
TWEEN.update( 350 );
equal( obj.x, 50 );
TWEEN.update( 400 );
equal( obj.x, 100 );
});
test( "Test repeatDelay adds delay before each repeat", function() {
TWEEN.removeAll();
var obj = { x: 0 },
t = new TWEEN.Tween( obj ).to( { x: 100 }, 100 ).repeat( 1 ).repeatDelay(200);
t.start( 0 );
TWEEN.update( 0 );
equal( obj.x, 0 );
TWEEN.update( 50 );
equal( obj.x, 50 );
TWEEN.update( 100 );
equal( obj.x, 100 );
TWEEN.update( 300 );
equal( obj.x, 0 );
TWEEN.update( 350 );
equal( obj.x, 50 );
TWEEN.update( 400 );
equal( obj.x, 100 );
});
test( "Test repeatDelay and delay can be used together", function() {
TWEEN.removeAll();
var obj = { x: 0 },
t = new TWEEN.Tween( obj ).to( { x: 100 }, 100 ).delay(100).repeat( 1 ).repeatDelay(200);
t.start( 0 );
TWEEN.update( 100 );
equal( obj.x, 0 );
TWEEN.update( 150 );
equal( obj.x, 50 );
TWEEN.update( 200 );
equal( obj.x, 100 );
TWEEN.update( 400 );
equal( obj.x, 0 );
TWEEN.update( 450 );
equal( obj.x, 50 );
TWEEN.update( 500 );
equal( obj.x, 100 );
});