More Animation fixes. See #4377.

mrdoob · Feb 5, 2014 · 4a80dff · 4a80dff
1 parent 092e3ad
commit 4a80dff
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/extras/animation/Animation.js b/src/extras/animation/Animation.js
@@ -115,9 +115,10 @@ THREE.Animation.prototype.update = function ( delta ) {
 
 	var duration = this.data.length;
 
-	if ( this.loop === true ) {
+	if ( this.loop === true && this.currentTime > duration ) {
 
 		this.currentTime %= duration;
+		this.reset();
 
 	}
 
@@ -230,8 +231,6 @@ THREE.Animation.prototype.update = function ( delta ) {
 
 	if ( this.currentTime > duration ) {
 
-		this.reset();
-
 		if ( this.loop === false ) {
 
 			this.stop();

diff --git a/src/extras/animation/KeyFrameAnimation.js b/src/extras/animation/KeyFrameAnimation.js
@@ -178,7 +178,7 @@ THREE.KeyFrameAnimation.prototype.update = function ( delta ) {
 
 	var duration = this.data.length;
 
-	if ( this.loop === true ) {
+	if ( this.loop === true && this.currentTime > duration ) {
 
 		this.currentTime %= duration;