From f9f2154d36f8e853ef6f16a5efaf93534604de91 Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Wed, 21 Oct 2015 14:42:30 -0400 Subject: [PATCH] *TextureLoader: Added/Use setPath(). --- src/loaders/CompressedTextureLoader.js | 9 ++++++++- src/loaders/CubeTextureLoader.js | 7 +++++++ src/loaders/TextureLoader.js | 7 +++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/loaders/CompressedTextureLoader.js b/src/loaders/CompressedTextureLoader.js index 29dcc1a221..320141bac3 100644 --- a/src/loaders/CompressedTextureLoader.js +++ b/src/loaders/CompressedTextureLoader.js @@ -29,13 +29,14 @@ THREE.CompressedTextureLoader.prototype = { var loader = new THREE.XHRLoader( this.manager ); loader.setCrossOrigin( this.crossOrigin ); + loader.setPath( this.path ); loader.setResponseType( 'arraybuffer' ); if ( Array.isArray( url ) ) { var loaded = 0; - var loadTexture = function ( i ) { + function loadTexture( i ) { loader.load( url[ i ], function ( buffer ) { @@ -130,6 +131,12 @@ THREE.CompressedTextureLoader.prototype = { this.crossOrigin = value; + }, + + setPath: function ( value ) { + + this.path = value; + } }; diff --git a/src/loaders/CubeTextureLoader.js b/src/loaders/CubeTextureLoader.js index a664c295e0..fd76c4d334 100644 --- a/src/loaders/CubeTextureLoader.js +++ b/src/loaders/CubeTextureLoader.js @@ -18,6 +18,7 @@ THREE.CubeTextureLoader.prototype = { var loader = new THREE.ImageLoader(); loader.setCrossOrigin( this.crossOrigin ); + loader.setPath( this.path ); var loaded = 0; @@ -55,6 +56,12 @@ THREE.CubeTextureLoader.prototype = { this.crossOrigin = value; + }, + + setPath: function ( value ) { + + this.path = value; + } }; diff --git a/src/loaders/TextureLoader.js b/src/loaders/TextureLoader.js index 171a2461bf..663cfe229d 100644 --- a/src/loaders/TextureLoader.js +++ b/src/loaders/TextureLoader.js @@ -18,6 +18,7 @@ THREE.TextureLoader.prototype = { var loader = new THREE.ImageLoader( this.manager ); loader.setCrossOrigin( this.crossOrigin ); + loader.setPath( this.path ); loader.load( url, function ( image ) { texture.image = image; @@ -39,6 +40,12 @@ THREE.TextureLoader.prototype = { this.crossOrigin = value; + }, + + setPath: function ( value ) { + + this.path = value; + } }; -- GitLab