diff --git a/examples/webgl_loader_collada_keyframe.html b/examples/webgl_loader_collada_keyframe.html index 83dbec347921a099efb8115b7aac0555a8a03672..d13e9c381319c3280230ce9fbe6fc6bffda07fbf 100644 --- a/examples/webgl_loader_collada_keyframe.html +++ b/examples/webgl_loader_collada_keyframe.html @@ -55,7 +55,7 @@ var kfAnimations = [ ]; var kfAnimationsLength = 0; var loader = new THREE.ColladaLoader(); - var lastTimestamp; + var lastTimestamp = 0; var progress = 0; loader.load( './models/collada/pump/pump.dae', function ( collada ) { @@ -188,18 +188,17 @@ } } + animation.loop = false; animation.play(); - lastTimestamp = Date.now(); } } - function animate() { + function animate( timestamp ) { - var timestamp = Date.now(); - var frameTime = ( timestamp - lastTimestamp ) * 0.001; // seconds + var frameTime = ( timestamp - lastTimestamp ) * 0.001; if ( progress >= 0 && progress < 48 ) { diff --git a/src/renderers/WebGLRenderer.js b/src/renderers/WebGLRenderer.js index 6e35dd7fee0d148d6940f533e36b98d4c63868ac..3daabea11a9d1ecab57bff6a3b4b7ee15be078e4 100644 --- a/src/renderers/WebGLRenderer.js +++ b/src/renderers/WebGLRenderer.js @@ -3235,7 +3235,7 @@ THREE.WebGLRenderer = function ( parameters ) { opaqueObjects.length = 0; transparentObjects.length = 0; - projectObject( scene, scene, camera ); + projectObject( scene, scene ); if ( _this.sortObjects === true ) { @@ -3333,7 +3333,7 @@ THREE.WebGLRenderer = function ( parameters ) { }; - function projectObject(scene, object,camera){ + function projectObject( scene, object ) { if ( object.visible === false ) return; @@ -3390,7 +3390,7 @@ THREE.WebGLRenderer = function ( parameters ) { for ( var i = 0, l = object.children.length; i < l; i ++ ) { - projectObject( scene, object.children[ i ], camera ); + projectObject( scene, object.children[ i ] ); }