|
@@ -401,37 +401,38 @@ THREE.MTLLoader.MaterialCreator.prototype = {
|
|
this.materials[ materialName ] = new THREE.MeshPhongMaterial( params );
|
|
this.materials[ materialName ] = new THREE.MeshPhongMaterial( params );
|
|
return this.materials[ materialName ];
|
|
return this.materials[ materialName ];
|
|
|
|
|
|
- }
|
|
|
|
|
|
+ },
|
|
|
|
|
|
-};
|
|
|
|
|
|
|
|
-THREE.MTLLoader.MaterialCreator.prototype.loadTexture = function ( url, mapping, onLoad, onError ) {
|
|
|
|
|
|
+ loadTexture: function ( url, mapping, onLoad, onError ) {
|
|
|
|
|
|
- var isCompressed = /\.dds$/i.test( url );
|
|
|
|
|
|
+ var isCompressed = /\.dds$/i.test( url );
|
|
|
|
|
|
- if ( isCompressed ) {
|
|
|
|
|
|
+ if ( isCompressed ) {
|
|
|
|
|
|
- var texture = THREE.ImageUtils.loadCompressedTexture( url, mapping, onLoad, onError );
|
|
|
|
|
|
+ var texture = THREE.ImageUtils.loadCompressedTexture( url, mapping, onLoad, onError );
|
|
|
|
|
|
- } else {
|
|
|
|
|
|
+ } else {
|
|
|
|
|
|
- var image = new Image();
|
|
|
|
- var texture = new THREE.Texture( image, mapping );
|
|
|
|
|
|
+ var image = new Image();
|
|
|
|
+ var texture = new THREE.Texture( image, mapping );
|
|
|
|
|
|
- var loader = new THREE.ImageLoader();
|
|
|
|
- loader.crossOrigin = this.crossOrigin;
|
|
|
|
- loader.load( url, function ( image ) {
|
|
|
|
|
|
+ var loader = new THREE.ImageLoader();
|
|
|
|
+ loader.crossOrigin = this.crossOrigin;
|
|
|
|
+ loader.load( url, function ( image ) {
|
|
|
|
|
|
- texture.image = THREE.MTLLoader.ensurePowerOfTwo_( image );
|
|
|
|
- texture.needsUpdate = true;
|
|
|
|
|
|
+ texture.image = THREE.MTLLoader.ensurePowerOfTwo_( image );
|
|
|
|
+ texture.needsUpdate = true;
|
|
|
|
|
|
- if ( onLoad ) onLoad( texture );
|
|
|
|
|
|
+ if ( onLoad ) onLoad( texture );
|
|
|
|
|
|
- } );
|
|
|
|
|
|
+ } );
|
|
|
|
|
|
- }
|
|
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return texture;
|
|
|
|
|
|
- return texture;
|
|
|
|
|
|
+ }
|
|
|
|
|
|
};
|
|
};
|
|
|
|
|