From 3f913f1f50dffb936f6e89ddcd938a517829c12f Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Sat, 7 Apr 2012 11:19:35 +0200 Subject: [PATCH] Some tweaks. --- examples/05_video_and_time.html | 2 +- src/Tween.js | 22 ++++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/examples/05_video_and_time.html b/examples/05_video_and_time.html index 30afad25..43cabfbc 100644 --- a/examples/05_video_and_time.html +++ b/examples/05_video_and_time.html @@ -37,7 +37,7 @@

05 _ video and time

new TWEEN.Tween( { x: 50, y: 0 } ) .to( { x: 400 }, this.duration ) - .easing( TWEEN.Easing.Bounce.EaseOut ) + .easing( TWEEN.Easing.Linear.EaseNone ) .onUpdate( function () { output.innerHTML = 'x == ' + Math.round( this.x ); diff --git a/src/Tween.js b/src/Tween.js index 5631fe16..6f73e126 100644 --- a/src/Tween.js +++ b/src/Tween.js @@ -16,12 +16,6 @@ var TWEEN = TWEEN || ( function () { return { - add: function ( tween ) { - - _tweens.push( tween ); - - }, - getAll: function () { return _tweens; @@ -34,6 +28,12 @@ var TWEEN = TWEEN || ( function () { }, + add: function ( tween ) { + + _tweens.push( tween ); + + }, + remove: function ( tween ) { var i = _tweens.indexOf( tween ); @@ -48,18 +48,20 @@ var TWEEN = TWEEN || ( function () { update: function ( time ) { - var i = 0, num_tweens = _tweens.length, time = time || Date.now(); + var i = 0; + var num_tweens = _tweens.length; + var time = time !== undefined ? time : Date.now(); while ( i < num_tweens ) { if ( _tweens[ i ].update( time ) ) { - i++; + i ++; } else { _tweens.splice( i, 1 ); - num_tweens--; + num_tweens --; } @@ -117,7 +119,7 @@ TWEEN.Tween = function ( object ) { TWEEN.add( this ); - _startTime = time || Date.now(); + _startTime = time !== undefined ? time : Date.now(); _startTime += _delayTime; for ( var property in _valuesEnd ) {