|
@@ -5,134 +5,127 @@
|
|
|
|
|
|
THREE.HDRCubeTextureLoader = function ( manager ) {
|
|
|
|
|
|
- this.manager = ( manager !== undefined ) ? manager : THREE.DefaultLoadingManager;
|
|
|
+ THREE.Loader.call( this, manager );
|
|
|
+
|
|
|
this.hdrLoader = new THREE.RGBELoader();
|
|
|
this.type = THREE.UnsignedByteType;
|
|
|
|
|
|
};
|
|
|
|
|
|
-THREE.HDRCubeTextureLoader.prototype.load = function ( urls, onLoad, onProgress, onError ) {
|
|
|
+THREE.HDRCubeTextureLoader.prototype = Object.assign( Object.create( THREE.Loader.prototype ), {
|
|
|
|
|
|
- if ( ! Array.isArray( urls ) ) {
|
|
|
+ constructor: THREE.HDRCubeTextureLoader,
|
|
|
|
|
|
- console.warn( 'THREE.HDRCubeTextureLoader signature has changed. Use .setDataType() instead.' );
|
|
|
+ load: function ( urls, onLoad, onProgress, onError ) {
|
|
|
|
|
|
- this.setDataType( urls );
|
|
|
+ if ( ! Array.isArray( urls ) ) {
|
|
|
|
|
|
- urls = onLoad;
|
|
|
- onLoad = onProgress;
|
|
|
- onProgress = onError;
|
|
|
- onError = arguments[ 4 ];
|
|
|
+ console.warn( 'THREE.HDRCubeTextureLoader signature has changed. Use .setDataType() instead.' );
|
|
|
|
|
|
- }
|
|
|
+ this.setDataType( urls );
|
|
|
|
|
|
- var texture = new THREE.CubeTexture();
|
|
|
+ urls = onLoad;
|
|
|
+ onLoad = onProgress;
|
|
|
+ onProgress = onError;
|
|
|
+ onError = arguments[ 4 ];
|
|
|
|
|
|
- texture.type = this.type;
|
|
|
+ }
|
|
|
|
|
|
- switch ( texture.type ) {
|
|
|
+ var texture = new THREE.CubeTexture();
|
|
|
|
|
|
- case THREE.UnsignedByteType:
|
|
|
+ texture.type = this.type;
|
|
|
|
|
|
- texture.encoding = THREE.RGBEEncoding;
|
|
|
- texture.format = THREE.RGBAFormat;
|
|
|
- texture.minFilter = THREE.NearestFilter;
|
|
|
- texture.magFilter = THREE.NearestFilter;
|
|
|
- texture.generateMipmaps = false;
|
|
|
- break;
|
|
|
+ switch ( texture.type ) {
|
|
|
|
|
|
- case THREE.FloatType:
|
|
|
+ case THREE.UnsignedByteType:
|
|
|
|
|
|
- texture.encoding = THREE.LinearEncoding;
|
|
|
- texture.format = THREE.RGBFormat;
|
|
|
- texture.minFilter = THREE.LinearFilter;
|
|
|
- texture.magFilter = THREE.LinearFilter;
|
|
|
- texture.generateMipmaps = false;
|
|
|
- break;
|
|
|
+ texture.encoding = THREE.RGBEEncoding;
|
|
|
+ texture.format = THREE.RGBAFormat;
|
|
|
+ texture.minFilter = THREE.NearestFilter;
|
|
|
+ texture.magFilter = THREE.NearestFilter;
|
|
|
+ texture.generateMipmaps = false;
|
|
|
+ break;
|
|
|
|
|
|
- case THREE.HalfFloatType:
|
|
|
+ case THREE.FloatType:
|
|
|
|
|
|
- texture.encoding = THREE.LinearEncoding;
|
|
|
- texture.format = THREE.RGBFormat;
|
|
|
- texture.minFilter = THREE.LinearFilter;
|
|
|
- texture.magFilter = THREE.LinearFilter;
|
|
|
- texture.generateMipmaps = false;
|
|
|
- break;
|
|
|
+ texture.encoding = THREE.LinearEncoding;
|
|
|
+ texture.format = THREE.RGBFormat;
|
|
|
+ texture.minFilter = THREE.LinearFilter;
|
|
|
+ texture.magFilter = THREE.LinearFilter;
|
|
|
+ texture.generateMipmaps = false;
|
|
|
+ break;
|
|
|
|
|
|
- }
|
|
|
+ case THREE.HalfFloatType:
|
|
|
|
|
|
- var scope = this;
|
|
|
+ texture.encoding = THREE.LinearEncoding;
|
|
|
+ texture.format = THREE.RGBFormat;
|
|
|
+ texture.minFilter = THREE.LinearFilter;
|
|
|
+ texture.magFilter = THREE.LinearFilter;
|
|
|
+ texture.generateMipmaps = false;
|
|
|
+ break;
|
|
|
|
|
|
- var loaded = 0;
|
|
|
+ }
|
|
|
|
|
|
- function loadHDRData( i, onLoad, onProgress, onError ) {
|
|
|
+ var scope = this;
|
|
|
|
|
|
- new THREE.FileLoader( scope.manager )
|
|
|
- .setPath( scope.path )
|
|
|
- .setResponseType( 'arraybuffer' )
|
|
|
- .load( urls[ i ], function ( buffer ) {
|
|
|
+ var loaded = 0;
|
|
|
|
|
|
- loaded ++;
|
|
|
+ function loadHDRData( i, onLoad, onProgress, onError ) {
|
|
|
|
|
|
- var texData = scope.hdrLoader._parser( buffer );
|
|
|
+ new THREE.FileLoader( scope.manager )
|
|
|
+ .setPath( scope.path )
|
|
|
+ .setResponseType( 'arraybuffer' )
|
|
|
+ .load( urls[ i ], function ( buffer ) {
|
|
|
|
|
|
- if ( ! texData ) return;
|
|
|
+ loaded ++;
|
|
|
|
|
|
- if ( texData.data !== undefined ) {
|
|
|
+ var texData = scope.hdrLoader._parser( buffer );
|
|
|
|
|
|
- var dataTexture = new THREE.DataTexture( texData.data, texData.width, texData.height );
|
|
|
+ if ( ! texData ) return;
|
|
|
|
|
|
- dataTexture.type = texture.type;
|
|
|
- dataTexture.encoding = texture.encoding;
|
|
|
- dataTexture.format = texture.format;
|
|
|
- dataTexture.minFilter = texture.minFilter;
|
|
|
- dataTexture.magFilter = texture.magFilter;
|
|
|
- dataTexture.generateMipmaps = texture.generateMipmaps;
|
|
|
+ if ( texData.data !== undefined ) {
|
|
|
|
|
|
- texture.images[ i ] = dataTexture;
|
|
|
+ var dataTexture = new THREE.DataTexture( texData.data, texData.width, texData.height );
|
|
|
|
|
|
- }
|
|
|
+ dataTexture.type = texture.type;
|
|
|
+ dataTexture.encoding = texture.encoding;
|
|
|
+ dataTexture.format = texture.format;
|
|
|
+ dataTexture.minFilter = texture.minFilter;
|
|
|
+ dataTexture.magFilter = texture.magFilter;
|
|
|
+ dataTexture.generateMipmaps = texture.generateMipmaps;
|
|
|
|
|
|
- if ( loaded === 6 ) {
|
|
|
+ texture.images[ i ] = dataTexture;
|
|
|
|
|
|
- texture.needsUpdate = true;
|
|
|
- if ( onLoad ) onLoad( texture );
|
|
|
+ }
|
|
|
|
|
|
- }
|
|
|
+ if ( loaded === 6 ) {
|
|
|
|
|
|
- }, onProgress, onError );
|
|
|
+ texture.needsUpdate = true;
|
|
|
+ if ( onLoad ) onLoad( texture );
|
|
|
|
|
|
- }
|
|
|
+ }
|
|
|
|
|
|
- for ( var i = 0; i < urls.length; i ++ ) {
|
|
|
+ }, onProgress, onError );
|
|
|
|
|
|
- loadHDRData( i, onLoad, onProgress, onError );
|
|
|
+ }
|
|
|
|
|
|
- }
|
|
|
+ for ( var i = 0; i < urls.length; i ++ ) {
|
|
|
|
|
|
- return texture;
|
|
|
+ loadHDRData( i, onLoad, onProgress, onError );
|
|
|
|
|
|
-};
|
|
|
+ }
|
|
|
|
|
|
-THREE.HDRCubeTextureLoader.prototype.setPath = function ( value ) {
|
|
|
+ return texture;
|
|
|
|
|
|
- this.path = value;
|
|
|
- return this;
|
|
|
+ },
|
|
|
|
|
|
-};
|
|
|
+ setDataType: function ( value ) {
|
|
|
|
|
|
-THREE.HDRCubeTextureLoader.prototype.setDataType = function ( value ) {
|
|
|
+ this.type = value;
|
|
|
+ this.hdrLoader.setDataType( value );
|
|
|
|
|
|
- this.type = value;
|
|
|
- this.hdrLoader.setDataType( value );
|
|
|
- return this;
|
|
|
+ return this;
|
|
|
|
|
|
-};
|
|
|
-
|
|
|
-THREE.HDRCubeTextureLoader.prototype.setType = function ( value ) {
|
|
|
-
|
|
|
- console.warn( 'THREE.HDRCubeTextureLoader: .setType() has been renamed to .setDataType().' );
|
|
|
-
|
|
|
- return this.setDataType( value );
|
|
|
+ }
|
|
|
|
|
|
-};
|
|
|
+} );
|