2
0
Эх сурвалжийг харах

MTLLoader: Simplified loadTexture.

Mr.doob 9 жил өмнө
parent
commit
76af4dbdb3

+ 5 - 17
examples/js/loaders/MTLLoader.js

@@ -406,27 +406,15 @@ THREE.MTLLoader.MaterialCreator.prototype = {
 		var loader = THREE.Loader.Handlers.get( url );
 		var manager = ( this.manager !== undefined ) ? this.manager : THREE.DefaultLoadingManager;
 
-		if ( loader !== null ) {
+		if ( loader === null ) {
 
-			texture = loader.load( url, onLoad );
-
-		} else {
-
-			texture = new THREE.Texture();
-
-			loader = new THREE.ImageLoader( manager );
-			loader.setCrossOrigin( this.crossOrigin );
-			loader.load( url, function ( image ) {
-
-				texture.image = image;
-				texture.needsUpdate = true;
-
-				if ( onLoad ) onLoad( texture );
-
-			}, onProgress, onError );
+			loader = new THREE.TextureLoader( manager );
 
 		}
 
+		loader.setCrossOrigin( this.crossOrigin );
+		texture = loader.load( url, onLoad, onProgress, onError );
+
 		if ( mapping !== undefined ) texture.mapping = mapping;
 
 		return texture;