浏览代码

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.

Mikael Emtinger 14 年之前
父节点
当前提交
4ecbd08581
共有 1 个文件被更改,包括 4 次插入4 次删除
  1. 4 4
      src/animation/AnimationHandler.js

+ 4 - 4
src/animation/AnimationHandler.js

@@ -118,8 +118,8 @@ THREE.AnimationHandler = (function() {
 			return;
 			return;
 
 
 		// THIS SHOULD BE REMOVED WHEN LENGTH IS UPDATED TO MS IN EXPORT FORMAT!
 		// 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
 		// loop through all keys
@@ -135,7 +135,7 @@ THREE.AnimationHandler = (function() {
 
 
 
 
 				// THIS SHOULD BE REMOVED WHEN LENGTH IS UPDATED TO MS IN EXPORT FORMAT!
 				// 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
 				// create quaternions
@@ -177,7 +177,7 @@ THREE.AnimationHandler = (function() {
 
 
 		// JIT
 		// JIT
 
 
-		var lengthInFrames = parseInt( data.length * data.fps * 0.001, 10 );
+		var lengthInFrames = parseInt( data.length * data.fps, 10 );
 
 
 		data.JIT = {};
 		data.JIT = {};
 		data.JIT.hierarchy = [];
 		data.JIT.hierarchy = [];