Pārlūkot izejas kodu

Merge pull request #11771 from Mugen87/fbx

FBXLoader: Clean up
Mr.doob 8 gadi atpakaļ
vecāks
revīzija
d2801bd835
1 mainītis faili ar 2 papildinājumiem un 6 dzēšanām
  1. 2 6
      examples/js/loaders/FBXLoader.js

+ 2 - 6
examples/js/loaders/FBXLoader.js

@@ -48,9 +48,7 @@
 
 			var self = this;
 
-			var resourceDirectory = url.split( /[\\\/]/ );
-			resourceDirectory.pop();
-			resourceDirectory = resourceDirectory.join( '/' ) + '/';
+			var resourceDirectory = THREE.Loader.prototype.extractUrlBase( url );
 
 			var loader = new THREE.FileLoader( this.manager );
 			loader.setResponseType( 'arraybuffer' );
@@ -100,15 +98,13 @@
 
 				if ( ! isFbxFormatASCII( FBXText ) ) {
 
-					self.manager.itemError( url );
 					throw new Error( 'FBXLoader: Unknown format.' );
 
 				}
 
 				if ( getFbxVersion( FBXText ) < 7000 ) {
 
-					self.manager.itemError( url );
-					throw new Error( 'FBXLoader: FBX version not supported for file at ' + url + ', FileVersion: ' + getFbxVersion( FBXText ) );
+					throw new Error( 'FBXLoader: FBX version not supported, FileVersion: ' + getFbxVersion( FBXText ) );
 
 				}