Skip to content

Commit 1e66ddc

Browse files
committed
Editor: Zip handling code clean up.
1 parent f41e9a4 commit 1e66ddc

File tree

1 file changed

+11
-25
lines changed

1 file changed

+11
-25
lines changed

editor/js/Loader.js

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -614,25 +614,25 @@ var Loader = function ( editor ) {
614614

615615
zip.filter( function ( path, file ) {
616616

617-
var extension = file.name.split( '.' ).pop().toLowerCase();
617+
var manager = new THREE.LoadingManager();
618+
manager.setURLModifier( function ( url ) {
618619

619-
switch ( extension ) {
620+
var file = zip.files[ url ];
620621

621-
case 'fbx':
622+
if ( file ) {
622623

623-
var manager = new THREE.LoadingManager();
624-
manager.setURLModifier( function ( url ) {
624+
var blob = new Blob( [ file.asArrayBuffer() ], { type: 'application/octet-stream' } );
625+
return URL.createObjectURL( blob );
625626

626-
var file = zip.files[ url ];
627+
}
627628

628-
if ( file ) {
629+
} );
629630

630-
var blob = new Blob( [ file.asArrayBuffer() ], { type: 'application/octet-stream' } );
631-
return URL.createObjectURL( blob );
631+
var extension = file.name.split( '.' ).pop().toLowerCase();
632632

633-
}
633+
switch ( extension ) {
634634

635-
} );
635+
case 'fbx':
636636

637637
var loader = new THREE.FBXLoader( manager );
638638
var object = loader.parse( file.asArrayBuffer() );
@@ -654,20 +654,6 @@ var Loader = function ( editor ) {
654654

655655
case 'gltf':
656656

657-
var manager = new THREE.LoadingManager();
658-
manager.setURLModifier( function ( url ) {
659-
660-
var file = zip.files[ url ];
661-
662-
if ( file ) {
663-
664-
var blob = new Blob( [ file.asArrayBuffer() ], { type: 'application/octet-stream' } );
665-
return URL.createObjectURL( blob );
666-
667-
}
668-
669-
} );
670-
671657
var loader = new THREE.GLTFLoader( manager );
672658
loader.parse( file.asText(), '', function ( result ) {
673659

0 commit comments

Comments
 (0)