Browse Source

Clean up.

Mr.doob 9 years ago
parent
commit
de3ee0a7e6
2 changed files with 9 additions and 3 deletions
  1. 6 0
      src/materials/Material.js
  2. 3 3
      src/math/Quaternion.js

+ 6 - 0
src/materials/Material.js

@@ -197,13 +197,19 @@ THREE.Material.prototype = {
 		// TODO: Copied from Object3D.toJSON
 		// TODO: Copied from Object3D.toJSON
 
 
 		function extractFromCache ( cache ) {
 		function extractFromCache ( cache ) {
+
 			var values = [];
 			var values = [];
+
 			for ( var key in cache ) {
 			for ( var key in cache ) {
+
 				var data = cache[ key ];
 				var data = cache[ key ];
 				delete data.metadata;
 				delete data.metadata;
 				values.push( data );
 				values.push( data );
+
 			}
 			}
+
 			return values;
 			return values;
+
 		}
 		}
 
 
 		if ( isRoot ) {
 		if ( isRoot ) {

+ 3 - 3
src/math/Quaternion.js

@@ -296,7 +296,7 @@ THREE.Quaternion.prototype = {
 
 
 			return this;
 			return this;
 
 
-		}
+		};
 
 
 	}(),
 	}(),
 
 
@@ -522,12 +522,12 @@ Object.assign( THREE.Quaternion, {
 
 
 		// fuzz-free, array-based Quaternion SLERP operation
 		// fuzz-free, array-based Quaternion SLERP operation
 
 
-		var x0 = src0[   srcOffset0   ],
+		var x0 = src0[ srcOffset0 + 0 ],
 			y0 = src0[ srcOffset0 + 1 ],
 			y0 = src0[ srcOffset0 + 1 ],
 			z0 = src0[ srcOffset0 + 2 ],
 			z0 = src0[ srcOffset0 + 2 ],
 			w0 = src0[ srcOffset0 + 3 ],
 			w0 = src0[ srcOffset0 + 3 ],
 
 
-			x1 = src1[   srcOffset1   ],
+			x1 = src1[ srcOffset1 + 0 ],
 			y1 = src1[ srcOffset1 + 1 ],
 			y1 = src1[ srcOffset1 + 1 ],
 			z1 = src1[ srcOffset1 + 2 ],
 			z1 = src1[ srcOffset1 + 2 ],
 			w1 = src1[ srcOffset1 + 3 ];
 			w1 = src1[ srcOffset1 + 3 ];