Some tweaks.

egraether · Apr 7, 2012 · 3f913f1 · 3f913f1
1 parent d20214f
commit 3f913f1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/examples/05_video_and_time.html b/examples/05_video_and_time.html
@@ -37,7 +37,7 @@ <h2>05 _ video and time</h2>
 
 					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
@@ -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 ) {