浏览代码

Fixed broken converter multi-dot filenames fix.

Also implanted Animation fix from empaempa.
alteredq 14 年之前
父节点
当前提交
2b90f7c047

+ 1 - 1
src/animation/Animation.js

@@ -216,7 +216,7 @@ THREE.Animation.prototype.update = function( deltaTimeMS ) {
 
 					// did we loop?
 
-					if ( currentTime <= unloopedCurrentTime ) {
+					if ( currentTime < unloopedCurrentTime ) {
 
 						if ( this.loop ) {
 

+ 1 - 1
utils/exporters/blender/2.49/convert_obj_threejs_slim.py

@@ -242,7 +242,7 @@ def get_name(fname):
     """Create model name based of filename ("path/fname.js" -> "fname").
     """
 
-    return os.path.splitext(os.path.basename(fname))
+    return os.path.splitext(os.path.basename(fname))[0]
 
 def bbox(vertices):
     """Compute bounding box of vertex array.

+ 1 - 1
utils/exporters/cinema4d/convert_obj_threejs_slim.py

@@ -242,7 +242,7 @@ def get_name(fname):
     """Create model name based of filename ("path/fname.js" -> "fname").
     """
 
-    return os.path.splitext(os.path.basename(fname))
+    return os.path.splitext(os.path.basename(fname))[0]
 
 def bbox(vertices):
     """Compute bounding box of vertex array.

+ 1 - 1
utils/exporters/convert_obj_threejs_slim.py

@@ -242,7 +242,7 @@ def get_name(fname):
     """Create model name based of filename ("path/fname.js" -> "fname").
     """
 
-    return os.path.splitext(os.path.basename(fname))
+    return os.path.splitext(os.path.basename(fname))[0]
 
 def bbox(vertices):
     """Compute bounding box of vertex array.