Editor: Zip handling code clean up.

mrdoob · Aug 22, 2018 · 1e66ddc · 1e66ddc
1 parent f41e9a4
commit 1e66ddc
Showing 1 changed file with 11 additions and 25 deletions.
diff --git a/editor/js/Loader.js b/editor/js/Loader.js
@@ -614,25 +614,25 @@ var Loader = function ( editor ) {
 
 		zip.filter( function ( path, file ) {
 
-			var extension = file.name.split( '.' ).pop().toLowerCase();
+			var manager = new THREE.LoadingManager();
+			manager.setURLModifier( function ( url ) {
 
-			switch ( extension ) {
+				var file = zip.files[ url ];
 
-				case 'fbx':
+				if ( file ) {
 
-					var manager = new THREE.LoadingManager();
-					manager.setURLModifier( function ( url ) {
+					var blob = new Blob( [ file.asArrayBuffer() ], { type: 'application/octet-stream' } );
+					return URL.createObjectURL( blob );
 
-						var file = zip.files[ url ];
+				}
 
-						if ( file ) {
+			} );
 
-							var blob = new Blob( [ file.asArrayBuffer() ], { type: 'application/octet-stream' } );
-							return URL.createObjectURL( blob );
+			var extension = file.name.split( '.' ).pop().toLowerCase();
 
-						}
+			switch ( extension ) {
 
-					} );
+				case 'fbx':
 
 					var loader = new THREE.FBXLoader( manager );
 					var object = loader.parse( file.asArrayBuffer() );
@@ -654,20 +654,6 @@ var Loader = function ( editor ) {
 
 				case 'gltf':
 
-					var manager = new THREE.LoadingManager();
-					manager.setURLModifier( function ( url ) {
-
-						var file = zip.files[ url ];
-
-						if ( file ) {
-
-							var blob = new Blob( [ file.asArrayBuffer() ], { type: 'application/octet-stream' } );
-							return URL.createObjectURL( blob );
-
-						}
-
-					} );
-
 					var loader = new THREE.GLTFLoader( manager );
 					loader.parse( file.asText(), '', function ( result ) {