From 4ecbd08581e6efe5a3667bb1900479a5337b0acf Mon Sep 17 00:00:00 2001 From: Mikael Emtinger Date: Tue, 8 Mar 2011 10:26:33 +0100 Subject: [PATCH] Updated so all times now are in MS instead of seconds. Note that all animations need to be re-exported with an exporter that supports this. --- src/animation/AnimationHandler.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/animation/AnimationHandler.js b/src/animation/AnimationHandler.js index 30cb979a..7cf5ea35 100644 --- a/src/animation/AnimationHandler.js +++ b/src/animation/AnimationHandler.js @@ -118,8 +118,8 @@ THREE.AnimationHandler = (function() { return; // THIS SHOULD BE REMOVED WHEN LENGTH IS UPDATED TO MS IN EXPORT FORMAT! - data.length = parseInt( data.length * 1000, 10 ); - data.fps *= 0.001; + //data.length = parseInt( data.length * 1000, 10 ); + //data.fps *= 0.001; // loop through all keys @@ -135,7 +135,7 @@ THREE.AnimationHandler = (function() { // THIS SHOULD BE REMOVED WHEN LENGTH IS UPDATED TO MS IN EXPORT FORMAT! - data.hierarchy[ h ].keys[ k ].time = parseInt( data.hierarchy[ h ].keys[ k ].time * 1000, 10 ); + //data.hierarchy[ h ].keys[ k ].time = parseInt( data.hierarchy[ h ].keys[ k ].time * 1000, 10 ); // create quaternions @@ -177,7 +177,7 @@ THREE.AnimationHandler = (function() { // JIT - var lengthInFrames = parseInt( data.length * data.fps * 0.001, 10 ); + var lengthInFrames = parseInt( data.length * data.fps, 10 ); data.JIT = {}; data.JIT.hierarchy = [];