Forráskód Böngészése

Reverting ObjectLoader.load() change.
Sorry @elephantatwork, I think this logic should be outside.

Mr.doob 10 éve
szülő
commit
d2da5ae87e
1 módosított fájl, 10 hozzáadás és 18 törlés
  1. 10 18
      src/loaders/ObjectLoader.js

+ 10 - 18
src/loaders/ObjectLoader.js

@@ -15,29 +15,21 @@ THREE.ObjectLoader.prototype = {
 
 	load: function ( url, onLoad, onProgress, onError ) {
 
-		if(typeof url !==  "string" ){
+		if ( this.texturePath === '' ) {
 
-			this.parse(url.scene, onLoad);
+			this.texturePath = url.substring( 0, url.lastIndexOf( '/' ) + 1 );
 
+		}
 
-		}else{
-
-			if ( this.texturePath === '' ) {
-
-				this.texturePath = url.substring( 0, url.lastIndexOf( '/' ) + 1 );
-
-			}
-
-			var scope = this;
+		var scope = this;
 
-			var loader = new THREE.XHRLoader( scope.manager );
-			loader.setCrossOrigin( this.crossOrigin );
-			loader.load( url, function ( text ) {
+		var loader = new THREE.XHRLoader( scope.manager );
+		loader.setCrossOrigin( this.crossOrigin );
+		loader.load( url, function ( text ) {
 
-				scope.parse( JSON.parse( text ), onLoad );
+			scope.parse( JSON.parse( text ), onLoad );
 
-			}, onProgress, onError );
-		}
+		}, onProgress, onError );
 
 	},
 
@@ -72,7 +64,7 @@ THREE.ObjectLoader.prototype = {
 			if ( onLoad !== undefined ) onLoad( object );
 
 		}
-		console.log(object);
+
 		return object;
 
 	},