Bladeren bron

Fixed jquery dependency in OBJMTLLoader. Fixed variable redeclaration in OBJLoader. Fixed unreachable code in GeometryExporter warnings.

This Closure compiling of JS files from the examples already starts to be useful ;)
alteredq 13 jaren geleden
bovenliggende
commit
8109156a64

+ 5 - 5
examples/js/exporters/GeometryExporter.js

@@ -66,18 +66,18 @@ THREE.GeometryExporter.prototype = {
 
 
 			}
 			}
 
 
+			/*
 			if ( hasFaceUv ) {
 			if ( hasFaceUv ) {
 
 
-				/*
 				var uv = geometry.faceUvs[ 0 ][ i ];
 				var uv = geometry.faceUvs[ 0 ][ i ];
 				uvs[ 0 ].push( uv.u, uv.v );
 				uvs[ 0 ].push( uv.u, uv.v );
-				*/
 
 
 			}
 			}
+			*/
 
 
+			/*
 			if ( hasFaceVertexUv ) {
 			if ( hasFaceVertexUv ) {
 
 
-				/*
 				var uvs = geometry.faceVertexUvs[ 0 ][ i ];
 				var uvs = geometry.faceVertexUvs[ 0 ][ i ];
 
 
 				if ( isTriangle ) {
 				if ( isTriangle ) {
@@ -98,9 +98,9 @@ THREE.GeometryExporter.prototype = {
 					);
 					);
 
 
 				}
 				}
-				*/
 
 
 			}
 			}
+			*/
 
 
 			if ( hasFaceNormal ) {
 			if ( hasFaceNormal ) {
 
 
@@ -146,7 +146,7 @@ THREE.GeometryExporter.prototype = {
 
 
 				var hash = x.toString() + y.toString() + z.toString();
 				var hash = x.toString() + y.toString() + z.toString();
 
 
-				if ( normalsHash[ hash ] !== undefined ) { 
+				if ( normalsHash[ hash ] !== undefined ) {
 
 
 					return normalsHash[ hash ];
 					return normalsHash[ hash ];
 
 

+ 3 - 3
examples/js/loaders/OBJLoader.js

@@ -122,11 +122,11 @@ THREE.OBJLoader.prototype = {
 
 
 		}
 		}
 
 
-		var data = data.split( '\no ');
+		var splitData = data.split( '\no ' );
 
 
-		for ( var i = 0, l = data.length; i < l; i ++ ) {
+		for ( var i = 0, l = splitData.length; i < l; i ++ ) {
 
 
-			var object = data[ i ];
+			var object = splitData[ i ];
 
 
 			var geometry = new THREE.Geometry();
 			var geometry = new THREE.Geometry();
 
 

+ 10 - 9
examples/js/loaders/OBJMTLLoader.js

@@ -474,34 +474,35 @@ THREE.OBJMTLLoader.prototype = {
 			} else if ( line.startsWith( "o " ) ) {
 			} else if ( line.startsWith( "o " ) ) {
 
 
 				// Object
 				// Object
+
 				var object_name = line.substring(2);
 				var object_name = line.substring(2);
-				//object_name = $.trim(object_name);
+				object_name = object_name.trim();
 
 
-			} else if (line.startsWith("s ")) {
+			} else if ( line.startsWith( "s ") ) {
 
 
 				// Smooth shading
 				// Smooth shading
 
 
-			} else if (line.startsWith("mtllib ")) {
+			} else if ( line.startsWith( "mtllib ") ) {
 
 
 				// mtl file
 				// mtl file
 
 
-				if (mtllibCallback) {
+				if ( mtllibCallback ) {
 
 
-					var mtlfile = line.substring(7);
-					mtlfile = $.trim(mtlfile);
-					mtllibCallback(mtlfile);
+					var mtlfile = line.substring( 7 );
+					mtlfile = mtlfile.trim();
+					mtllibCallback( mtlfile );
 
 
 				}
 				}
 
 
 			} else {
 			} else {
 
 
-				console.error("Unhandled line " + line);
+				console.error( "Unhandled line " + line );
 
 
 			}
 			}
 
 
 		}
 		}
 
 
-		finalize_mesh(final_model, cur_mesh);
+		finalize_mesh( final_model, cur_mesh );
 
 
 		return final_model;
 		return final_model;