瀏覽代碼

Minor tweaks.

Mr.doob 11 年之前
父節點
當前提交
6b4e5613f8
共有 2 個文件被更改,包括 9 次插入14 次删除
  1. 7 6
      examples/js/loaders/ColladaLoader.js
  2. 2 8
      examples/webgl_loader_collada_kinematics.html

+ 7 - 6
examples/js/loaders/ColladaLoader.js

@@ -340,7 +340,7 @@ THREE.ColladaLoader = function () {
 
 			}
 
-		} else  {
+		} else {
 
 			newData = {
 				hierarchy: [ {
@@ -978,8 +978,8 @@ THREE.ColladaLoader = function () {
 						threejsNode.matrix.set.apply( threejsNode.matrix, elementsRowMajor );
 						threejsNode.matrix.decompose( threejsNode.position, threejsNode.quaternion, threejsNode.scale );
 					}
-				}
-				else {
+
+				} else {
 
 					console.log( 'setJointValue: joint ' + jointIndex + ' doesn\'t exist' );
 
@@ -993,9 +993,10 @@ THREE.ColladaLoader = function () {
 
 		if ( element ) {
 
-			for (var i = 0; i < element.childNodes.length; i++ ) {
+			for ( var i = 0; i < element.childNodes.length; i ++ ) {
 
 				var child = element.childNodes[ i ];
+
 				if ( child.nodeType != 1 ) continue;
 
 				switch ( child.nodeName ) {
@@ -1185,7 +1186,7 @@ THREE.ColladaLoader = function () {
 
 					applySkin( geom, skinController );
 
-					if(geom.morphTargets.length > 0) {
+					if ( geom.morphTargets.length > 0 ) {
 
 						material.morphTargets = true;
 						material.skinning = false;
@@ -3684,7 +3685,7 @@ THREE.ColladaLoader = function () {
 										} );
 
 									}
-									
+
 									texture.wrapS = cot.texOpts.wrapU ? THREE.RepeatWrapping : THREE.ClampToEdgeWrapping;
 									texture.wrapT = cot.texOpts.wrapV ? THREE.RepeatWrapping : THREE.ClampToEdgeWrapping;
 									texture.offset.x = cot.texOpts.offsetU;

+ 2 - 8
examples/webgl_loader_collada_kinematics.html

@@ -68,7 +68,7 @@
 				jointIndex = 0;
 				joint = kinematics.joints[jointIndex];
 				jointValue = joint.limits.min;
-				jointStep = makeJointStep();
+				jointStep = ( joint.limits.max - joint.limits.min ) / 100.0;
 
 				init();
 				animate();
@@ -161,7 +161,7 @@
 
 						joint = kinematics.joints[ jointIndex ];
 						jointValue = joint.limits.min;
-						jointStep = makeJointStep();
+						jointStep = ( joint.limits.max - joint.limits.min ) / 100.0;
 
 					}
 
@@ -172,12 +172,6 @@
 
 			};
 
-			function makeJointStep() {
-
-				return ( joint.limits.max - joint.limits.min ) / 100.0;
-
-			};
-
 			function onWindowResize() {
 
 				camera.aspect = window.innerWidth / window.innerHeight;