diff --git a/editor/js/Loader.js b/editor/js/Loader.js index 6c7cff22c43a0c73e3c009abd0d26edd22ca5e00..5a8f74c654ae5815b7752861d7badd20d36597ab 100644 --- 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 ) {