super-three 0.136.0 → 0.141.0

package/examples/jsm/loaders/LUT3dlLoader.js

@@ -1,11 +1,11 @@
 // http://download.autodesk.com/us/systemdocs/help/2011/lustre/index.html?url=./files/WSc4e151a45a3b785a24c3d9a411df9298473-7ffd.htm,topicNumber=d0e9492
-
+// https://community.foundry.com/discuss/topic/103636/format-spec-for-3dl?mode=Post&postID=895258
 import {
 	Loader,
 	FileLoader,
 	DataTexture,
-	DataTexture3D,
-	RGBFormat,
+	Data3DTexture,
+	RGBAFormat,
 	UnsignedByteType,
 	ClampToEdgeWrapping,
 	LinearFilter,
@@ -69,7 +69,7 @@ export class LUT3dlLoader extends Loader {
 
 		}
 
-		const dataArray = new Array( size * size * size * 3 );
+		const dataArray = new Array( size * size * size * 4 );
 		let index = 0;
 		let maxOutputValue = 0.0;
 		for ( let i = 1, l = lines.length; i < l; i ++ ) {
@@ -88,21 +88,26 @@ export class LUT3dlLoader extends Loader {
 
 			// b grows first, then g, then r
 			const pixelIndex = bLayer * size * size + gLayer * size + rLayer;
-			dataArray[ 3 * pixelIndex + 0 ] = r;
-			dataArray[ 3 * pixelIndex + 1 ] = g;
-			dataArray[ 3 * pixelIndex + 2 ] = b;
+			dataArray[ 4 * pixelIndex + 0 ] = r;
+			dataArray[ 4 * pixelIndex + 1 ] = g;
+			dataArray[ 4 * pixelIndex + 2 ] = b;
+			dataArray[ 4 * pixelIndex + 3 ] = 1.0;
 			index += 1;
 
 		}
 
-		// Find the apparent bit depth of the stored RGB values and scale the
+		// Find the apparent bit depth of the stored RGB values and map the
 		// values to [ 0, 255 ].
 		const bits = Math.ceil( Math.log2( maxOutputValue ) );
 		const maxBitValue = Math.pow( 2.0, bits );
-		for ( let i = 0, l = dataArray.length; i < l; i ++ ) {
+		for ( let i = 0, l = dataArray.length; i < l; i += 4 ) {
 
-			const val = dataArray[ i ];
-			dataArray[ i ] = 255 * val / maxBitValue;
+			const r = dataArray[ i + 0 ];
+			const g = dataArray[ i + 1 ];
+			const b = dataArray[ i + 2 ];
+			dataArray[ i + 0 ] = 255 * r / maxBitValue; // r
+			dataArray[ i + 1 ] = 255 * g / maxBitValue; // g
+			dataArray[ i + 2 ] = 255 * b / maxBitValue; // b
 
 		}
 
@@ -111,7 +116,7 @@ export class LUT3dlLoader extends Loader {
 		texture.image.data = data;
 		texture.image.width = size;
 		texture.image.height = size * size;
-		texture.format = RGBFormat;
+		texture.format = RGBAFormat;
 		texture.type = UnsignedByteType;
 		texture.magFilter = LinearFilter;
 		texture.minFilter = LinearFilter;
@@ -120,12 +125,12 @@ export class LUT3dlLoader extends Loader {
 		texture.generateMipmaps = false;
 		texture.needsUpdate = true;
 
-		const texture3D = new DataTexture3D();
+		const texture3D = new Data3DTexture();
 		texture3D.image.data = data;
 		texture3D.image.width = size;
 		texture3D.image.height = size;
 		texture3D.image.depth = size;
-		texture3D.format = RGBFormat;
+		texture3D.format = RGBAFormat;
 		texture3D.type = UnsignedByteType;
 		texture3D.magFilter = LinearFilter;
 		texture3D.minFilter = LinearFilter;

package/examples/jsm/loaders/LUTCubeLoader.js

@@ -5,8 +5,7 @@ import {
 	FileLoader,
 	Vector3,
 	DataTexture,
-	DataTexture3D,
-	RGBFormat,
+	Data3DTexture,
 	UnsignedByteType,
 	ClampToEdgeWrapping,
 	LinearFilter,
@@ -77,7 +76,7 @@ export class LUTCubeLoader extends Loader {
 					// more precision than can be captured with Uint8Array.
 					const sizeToken = split[ 1 ];
 					size = parseFloat( sizeToken );
-					data = new Uint8Array( size * size * size * 3 );
+					data = new Uint8Array( size * size * size * 4 );
 					break;
 				case 'DOMAIN_MIN':
 					domainMin.x = parseFloat( split[ 1 ] );
@@ -107,7 +106,8 @@ export class LUTCubeLoader extends Loader {
 					data[ currIndex + 0 ] = r * 255;
 					data[ currIndex + 1 ] = g * 255;
 					data[ currIndex + 2 ] = b * 255;
-					currIndex += 3;
+					data[ currIndex + 3 ] = 255;
+					currIndex += 4;
 
 			}
 
@@ -117,7 +117,6 @@ export class LUTCubeLoader extends Loader {
 		texture.image.data = data;
 		texture.image.width = size;
 		texture.image.height = size * size;
-		texture.format = RGBFormat;
 		texture.type = UnsignedByteType;
 		texture.magFilter = LinearFilter;
 		texture.minFilter = LinearFilter;
@@ -126,12 +125,11 @@ export class LUTCubeLoader extends Loader {
 		texture.generateMipmaps = false;
 		texture.needsUpdate = true;
 
-		const texture3D = new DataTexture3D();
+		const texture3D = new Data3DTexture();
 		texture3D.image.data = data;
 		texture3D.image.width = size;
 		texture3D.image.height = size;
 		texture3D.image.depth = size;
-		texture3D.format = RGBFormat;
 		texture3D.type = UnsignedByteType;
 		texture3D.magFilter = LinearFilter;
 		texture3D.minFilter = LinearFilter;

package/examples/jsm/loaders/LWOLoader.js

@@ -350,6 +350,8 @@ class MaterialParser {
 
 		const materialType = this.getMaterialType( connections.attributes );
 
+		if ( materialType !== MeshPhongMaterial ) delete params.refractionRatio; // PBR materials do not support "refractionRatio"
+
 		return new materialType( params );
 
 	}
@@ -591,8 +593,6 @@ class MaterialParser {
 
 		if ( attributes[ 'Bump Height' ] ) params.bumpScale = attributes[ 'Bump Height' ].value * 0.1;
 
-		if ( attributes[ 'Refraction Index' ] ) params.refractionRatio = 0.98 / attributes[ 'Refraction Index' ].value;
-
 		this.parsePhysicalAttributes( params, attributes, maps );
 		this.parseStandardAttributes( params, attributes, maps );
 		this.parsePhongAttributes( params, attributes, maps );
@@ -643,6 +643,8 @@ class MaterialParser {
 
 	parsePhongAttributes( params, attributes, maps ) {
 
+		if ( attributes[ 'Refraction Index' ] ) params.refractionRatio = 0.98 / attributes[ 'Refraction Index' ].value;
+
 		if ( attributes.Diffuse ) params.color.multiplyScalar( attributes.Diffuse.value );
 
 		if ( attributes.Reflection ) {
@@ -1060,7 +1062,7 @@ function extractParentUrl( url, dir ) {
 
 	if ( index === - 1 ) return './';
 
-	return url.substr( 0, index );
+	return url.slice( 0, index );
 
 }
 

package/examples/jsm/loaders/LogLuvLoader.js

@@ -55,7 +55,7 @@ UTIF.decode = function ( buff, prm ) {
 	var bin = id == 'II' ? UTIF._binLE : UTIF._binBE;
 	bin.readUshort( data, offset ); offset += 2;
 
-	var ifdo = bin.readUint( data, offset ); offset += 4;
+	var ifdo = bin.readUint( data, offset );
 	var ifds = [];
 	while ( true ) {
 
@@ -339,7 +339,7 @@ UTIF._readIFD = function ( bin, data, offset, ifds, depth, prm ) {
 
 		ifd[ 't' + tag ] = arr;
 
-		if ( tag == 330 && ifd[ 't272' ] && ifd[ 't272' ][ 0 ] == 'DSLR-A100' ) { } else if ( tag == 330 || tag == 34665 || tag == 34853 || ( tag == 50740 && bin.readUshort( data, bin.readUint( arr, 0 ) ) < 300 ) || tag == 61440 ) {
+		if ( tag == 330 || tag == 34665 || tag == 34853 || ( tag == 50740 && bin.readUshort( data, bin.readUint( arr, 0 ) ) < 300 ) || tag == 61440 ) {
 
 			var oarr = tag == 50740 ? [ bin.readUint( arr, 0 ) ] : arr;
 			var subfd = [];

package/examples/jsm/loaders/MD2Loader.js

@@ -243,7 +243,7 @@ class MD2Loader extends Loader {
 
 			for ( let j = 0; j < 16; j ++ ) {
 
-				const character = data.getUint8( offset + j, true );
+				const character = data.getUint8( offset + j );
 				if ( character === 0 ) break;
 
 				string[ j ] = character;
@@ -260,10 +260,10 @@ class MD2Loader extends Loader {
 
 			for ( let j = 0; j < header.num_vertices; j ++ ) {
 
-				let x = data.getUint8( offset ++, true );
-				let y = data.getUint8( offset ++, true );
-				let z = data.getUint8( offset ++, true );
-				const n = _normalData[ data.getUint8( offset ++, true ) ];
+				let x = data.getUint8( offset ++ );
+				let y = data.getUint8( offset ++ );
+				let z = data.getUint8( offset ++ );
+				const n = _normalData[ data.getUint8( offset ++ ) ];
 
 				x = x * scale.x + translation.x;
 				y = y * scale.y + translation.y;

package/examples/jsm/loaders/MMDLoader.js

@@ -2080,6 +2080,8 @@ class MMDToonMaterial extends ShaderMaterial {
 
 		super();
 
+		this.isMMDToonMaterial = true;
+
 		this._matcapCombine = AddOperation;
 		this.emissiveIntensity = 1.0;
 		this.normalMapType = TangentSpaceNormalMap;
@@ -2133,7 +2135,6 @@ class MMDToonMaterial extends ShaderMaterial {
 		// merged from MeshToon/Phong/MatcapMaterial
 		const exposePropertyNames = [
 			'specular',
-			'shininess',
 			'opacity',
 			'diffuse',
 
@@ -2188,6 +2189,25 @@ class MMDToonMaterial extends ShaderMaterial {
 
 		}
 
+		// Special path for shininess to handle zero shininess properly
+		this._shininess = 30;
+		Object.defineProperty( this, 'shininess', {
+
+			get: function () {
+
+				return this._shininess;
+
+			},
+
+			set: function ( value ) {
+
+				this._shininess = value;
+				this.uniforms.shininess.value = Math.max( this._shininess, 1e-4 ); // To prevent pow( 0.0, 0.0 )
+
+			},
+
+		} );
+
 		Object.defineProperty(
 			this,
 			'color',
@@ -2219,6 +2239,4 @@ class MMDToonMaterial extends ShaderMaterial {
 
 }
 
-MMDToonMaterial.prototype.isMMDToonMaterial = true;
-
 export { MMDLoader };

package/examples/jsm/loaders/MTLLoader.js

@@ -8,7 +8,8 @@ import {
 	MeshPhongMaterial,
 	RepeatWrapping,
 	TextureLoader,
-	Vector2
+	Vector2,
+	sRGBEncoding
 } from 'three';
 
 /**
@@ -358,6 +359,12 @@ class MaterialCreator {
 			map.wrapS = scope.wrap;
 			map.wrapT = scope.wrap;
 
+			if ( mapType === 'map' || mapType === 'emissiveMap' ) {
+
+				map.encoding = sRGBEncoding;
+
+			}
+
 			params[ mapType ] = map;
 
 		}
@@ -377,21 +384,21 @@ class MaterialCreator {
 
 					// Diffuse color (color under white light) using RGB values
 
-					params.color = new Color().fromArray( value );
+					params.color = new Color().fromArray( value ).convertSRGBToLinear();
 
 					break;
 
 				case 'ks':
 
 					// Specular color (color when light is reflected from shiny surface) using RGB values
-					params.specular = new Color().fromArray( value );
+					params.specular = new Color().fromArray( value ).convertSRGBToLinear();
 
 					break;
 
 				case 'ke':
 
 					// Emissive using RGB values
-					params.emissive = new Color().fromArray( value );
+					params.emissive = new Color().fromArray( value ).convertSRGBToLinear();
 
 					break;
 

package/examples/jsm/loaders/NRRDLoader.js

@@ -173,8 +173,7 @@ class NRRDLoader extends Loader {
 
 					headerObject.isNrrd = true;
 
-				} else if ( l.match( /^#/ ) ) {
-				} else if ( m = l.match( /(.*):(.*)/ ) ) {
+				} else if ( ! l.match( /^#/ ) && ( m = l.match( /(.*):(.*)/ ) ) ) {
 
 					field = m[ 1 ].trim();
 					data = m[ 2 ].trim();

package/examples/jsm/loaders/OBJLoader.js

@@ -11,7 +11,8 @@ import {
 	MeshPhongMaterial,
 	Points,
 	PointsMaterial,
-	Vector3
+	Vector3,
+	Color
 } from 'three';
 
 // o object_name | g group_name
@@ -30,6 +31,8 @@ const _vC = new Vector3();
 const _ab = new Vector3();
 const _cb = new Vector3();
 
+const _color = new Color();
+
 function ParserState() {
 
 	const state = {
@@ -536,12 +539,13 @@ class OBJLoader extends Loader {
 						);
 						if ( data.length >= 7 ) {
 
-							state.colors.push(
+							_color.setRGB(
 								parseFloat( data[ 4 ] ),
 								parseFloat( data[ 5 ] ),
 								parseFloat( data[ 6 ] )
+							).convertSRGBToLinear();
 
-							);
+							state.colors.push( _color.r, _color.g, _color.b );
 
 						} else {
 
@@ -570,7 +574,7 @@ class OBJLoader extends Loader {
 
 			} else if ( lineFirstChar === 'f' ) {
 
-				const lineData = line.substr( 1 ).trim();
+				const lineData = line.slice( 1 ).trim();
 				const vertexData = lineData.split( /\s+/ );
 				const faceVertices = [];
 
@@ -633,7 +637,7 @@ class OBJLoader extends Loader {
 
 			} else if ( lineFirstChar === 'p' ) {
 
-				const lineData = line.substr( 1 ).trim();
+				const lineData = line.slice( 1 ).trim();
 				const pointData = lineData.split( ' ' );
 
 				state.addPointGeometry( pointData );
@@ -645,8 +649,8 @@ class OBJLoader extends Loader {
 				// g group_name
 
 				// WORKAROUND: https://bugs.chromium.org/p/v8/issues/detail?id=2869
-				// let name = result[ 0 ].substr( 1 ).trim();
-				const name = ( ' ' + result[ 0 ].substr( 1 ).trim() ).substr( 1 );
+				// let name = result[ 0 ].slice( 1 ).trim();
+				const name = ( ' ' + result[ 0 ].slice( 1 ).trim() ).slice( 1 );
 
 				state.startObject( name );
 

package/examples/jsm/loaders/PCDLoader.js

@@ -31,7 +31,7 @@ class PCDLoader extends Loader {
 
 			try {
 
-				onLoad( scope.parse( data, url ) );
+				onLoad( scope.parse( data ) );
 
 			} catch ( e ) {
 
@@ -53,7 +53,7 @@ class PCDLoader extends Loader {
 
 	}
 
-	parse( data, url ) {
+	parse( data ) {
 
 		// from https://gitlab.com/taketwo/three-pcd-loader/blob/master/decompress-lzf.js
 
@@ -114,11 +114,11 @@ class PCDLoader extends Loader {
 
 			const PCDheader = {};
 			const result1 = data.search( /[\r\n]DATA\s(\S*)\s/i );
-			const result2 = /[\r\n]DATA\s(\S*)\s/i.exec( data.substr( result1 - 1 ) );
+			const result2 = /[\r\n]DATA\s(\S*)\s/i.exec( data.slice( result1 - 1 ) );
 
 			PCDheader.data = result2[ 1 ];
 			PCDheader.headerLen = result2[ 0 ].length + result1;
-			PCDheader.str = data.substr( 0, PCDheader.headerLen );
+			PCDheader.str = data.slice( 0, PCDheader.headerLen );
 
 			// remove comments
 
@@ -141,8 +141,7 @@ class PCDLoader extends Loader {
 			if ( PCDheader.version !== null )
 				PCDheader.version = parseFloat( PCDheader.version[ 1 ] );
 
-			if ( PCDheader.fields !== null )
-				PCDheader.fields = PCDheader.fields[ 1 ].split( ' ' );
+			PCDheader.fields = ( PCDheader.fields !== null ) ? PCDheader.fields[ 1 ].split( ' ' ) : [];
 
 			if ( PCDheader.type !== null )
 				PCDheader.type = PCDheader.type[ 1 ].split( ' ' );
@@ -236,7 +235,7 @@ class PCDLoader extends Loader {
 		if ( PCDheader.data === 'ascii' ) {
 
 			const offset = PCDheader.offset;
-			const pcdData = textData.substr( PCDheader.headerLen );
+			const pcdData = textData.slice( PCDheader.headerLen );
 			const lines = pcdData.split( '\n' );
 
 			for ( let i = 0, l = lines.length; i < l; i ++ ) {
@@ -255,7 +254,22 @@ class PCDLoader extends Loader {
 
 				if ( offset.rgb !== undefined ) {
 
-					const rgb = parseFloat( line[ offset.rgb ] );
+					const rgb_field_index = PCDheader.fields.findIndex( ( field ) => field === 'rgb' );
+					const rgb_type = PCDheader.type[ rgb_field_index ];
+
+					const float = parseFloat( line[ offset.rgb ] );
+					let rgb = float;
+
+					if ( rgb_type === 'F' ) {
+
+						// treat float values as int
+						// https://github.com/daavoo/pyntcloud/pull/204/commits/7b4205e64d5ed09abe708b2e91b615690c24d518
+						const farr = new Float32Array( 1 );
+						farr[ 0 ] = float;
+						rgb = new Int32Array( farr.buffer )[ 0 ];
+
+					}
+
 					const r = ( rgb >> 16 ) & 0x0000ff;
 					const g = ( rgb >> 8 ) & 0x0000ff;
 					const b = ( rgb >> 0 ) & 0x0000ff;
@@ -303,9 +317,9 @@ class PCDLoader extends Loader {
 
 				if ( offset.rgb !== undefined ) {
 
-					color.push( dataview.getUint8( ( PCDheader.points * offset.rgb ) + PCDheader.size[ 3 ] * i + 0 ) / 255.0 );
-					color.push( dataview.getUint8( ( PCDheader.points * offset.rgb ) + PCDheader.size[ 3 ] * i + 1 ) / 255.0 );
 					color.push( dataview.getUint8( ( PCDheader.points * offset.rgb ) + PCDheader.size[ 3 ] * i + 2 ) / 255.0 );
+					color.push( dataview.getUint8( ( PCDheader.points * offset.rgb ) + PCDheader.size[ 3 ] * i + 1 ) / 255.0 );
+					color.push( dataview.getUint8( ( PCDheader.points * offset.rgb ) + PCDheader.size[ 3 ] * i + 0 ) / 255.0 );
 
 				}
 
@@ -384,13 +398,7 @@ class PCDLoader extends Loader {
 
 		// build point cloud
 
-		const mesh = new Points( geometry, material );
-		let name = url.split( '' ).reverse().join( '' );
-		name = /([^\/]*)/.exec( name );
-		name = name[ 1 ].split( '' ).reverse().join( '' );
-		mesh.name = name;
-
-		return mesh;
+		return new Points( geometry, material );
 
 	}
 

package/examples/jsm/loaders/PDBLoader.js

@@ -59,7 +59,7 @@ class PDBLoader extends Loader {
 
 		function capitalize( text ) {
 
-			return text.charAt( 0 ).toUpperCase() + text.substr( 1 ).toLowerCase();
+			return text.charAt( 0 ).toUpperCase() + text.slice( 1 ).toLowerCase();
 
 		}
 
@@ -71,7 +71,7 @@ class PDBLoader extends Loader {
 
 		function parseBond( start, length, satom, i ) {
 
-			const eatom = parseInt( lines[ i ].substr( start, length ) );
+			const eatom = parseInt( lines[ i ].slice( start, start + length ) );
 
 			if ( eatom ) {
 
@@ -183,18 +183,18 @@ class PDBLoader extends Loader {
 
 		for ( let i = 0, l = lines.length; i < l; i ++ ) {
 
-			if ( lines[ i ].substr( 0, 4 ) === 'ATOM' || lines[ i ].substr( 0, 6 ) === 'HETATM' ) {
+			if ( lines[ i ].slice( 0, 4 ) === 'ATOM' || lines[ i ].slice( 0, 6 ) === 'HETATM' ) {
 
-				const x = parseFloat( lines[ i ].substr( 30, 7 ) );
-				const y = parseFloat( lines[ i ].substr( 38, 7 ) );
-				const z = parseFloat( lines[ i ].substr( 46, 7 ) );
-				const index = parseInt( lines[ i ].substr( 6, 5 ) ) - 1;
+				const x = parseFloat( lines[ i ].slice( 30, 37 ) );
+				const y = parseFloat( lines[ i ].slice( 38, 45 ) );
+				const z = parseFloat( lines[ i ].slice( 46, 53 ) );
+				const index = parseInt( lines[ i ].slice( 6, 11 ) ) - 1;
 
-				let e = trim( lines[ i ].substr( 76, 2 ) ).toLowerCase();
+				let e = trim( lines[ i ].slice( 76, 78 ) ).toLowerCase();
 
 				if ( e === '' ) {
 
-					e = trim( lines[ i ].substr( 12, 2 ) ).toLowerCase();
+					e = trim( lines[ i ].slice( 12, 14 ) ).toLowerCase();
 
 				}
 
@@ -203,9 +203,9 @@ class PDBLoader extends Loader {
 				atoms.push( atomData );
 				_atomMap[ index ] = atomData;
 
-			} else if ( lines[ i ].substr( 0, 6 ) === 'CONECT' ) {
+			} else if ( lines[ i ].slice( 0, 6 ) === 'CONECT' ) {
 
-				const satom = parseInt( lines[ i ].substr( 6, 5 ) );
+				const satom = parseInt( lines[ i ].slice( 6, 11 ) );
 
 				parseBond( 11, 5, satom, i );
 				parseBond( 16, 5, satom, i );

package/examples/jsm/loaders/PLYLoader.js

@@ -3,7 +3,8 @@ import {
 	FileLoader,
 	Float32BufferAttribute,
 	Loader,
-	LoaderUtils
+	LoaderUtils,
+	Color
 } from 'three';
 
 /**
@@ -32,6 +33,7 @@ import {
  *
  */
 
+const _color = new Color();
 
 class PLYLoader extends Loader {
 
@@ -407,7 +409,13 @@ class PLYLoader extends Loader {
 
 				if ( attrR !== null && attrG !== null && attrB !== null ) {
 
-					buffer.colors.push( element[ attrR ] / 255.0, element[ attrG ] / 255.0, element[ attrB ] / 255.0 );
+					_color.setRGB(
+						element[ attrR ] / 255.0,
+						element[ attrG ] / 255.0,
+						element[ attrB ] / 255.0
+					).convertSRGBToLinear();
+
+					buffer.colors.push( _color.r, _color.g, _color.b );
 
 				}
 

package/examples/jsm/loaders/RGBELoader.js

@@ -4,8 +4,7 @@ import {
 	FloatType,
 	HalfFloatType,
 	LinearEncoding,
-	LinearFilter,
-	RGBFormat,
+	LinearFilter
 } from 'three';
 
 // https://github.com/mrdoob/three.js/issues/5552
@@ -169,13 +168,13 @@ class RGBELoader extends DataTextureLoader {
 
 					if ( match = line.match( gamma_re ) ) {
 
-						header.gamma = parseFloat( match[ 1 ], 10 );
+						header.gamma = parseFloat( match[ 1 ] );
 
 					}
 
 					if ( match = line.match( exposure_re ) ) {
 
-						header.exposure = parseFloat( match[ 1 ], 10 );
+						header.exposure = parseFloat( match[ 1 ] );
 
 					}
 
@@ -342,6 +341,7 @@ class RGBELoader extends DataTextureLoader {
 			destArray[ destOffset + 0 ] = sourceArray[ sourceOffset + 0 ] * scale;
 			destArray[ destOffset + 1 ] = sourceArray[ sourceOffset + 1 ] * scale;
 			destArray[ destOffset + 2 ] = sourceArray[ sourceOffset + 2 ] * scale;
+			destArray[ destOffset + 3 ] = 1;
 
 		};
 
@@ -354,6 +354,7 @@ class RGBELoader extends DataTextureLoader {
 			destArray[ destOffset + 0 ] = DataUtils.toHalfFloat( Math.min( sourceArray[ sourceOffset + 0 ] * scale, 65504 ) );
 			destArray[ destOffset + 1 ] = DataUtils.toHalfFloat( Math.min( sourceArray[ sourceOffset + 1 ] * scale, 65504 ) );
 			destArray[ destOffset + 2 ] = DataUtils.toHalfFloat( Math.min( sourceArray[ sourceOffset + 2 ] * scale, 65504 ) );
+			destArray[ destOffset + 3 ] = DataUtils.toHalfFloat( 1 );
 
 		};
 
@@ -369,7 +370,7 @@ class RGBELoader extends DataTextureLoader {
 
 			if ( RGBE_RETURN_FAILURE !== image_rgba_data ) {
 
-				let data, format, type;
+				let data, type;
 				let numElements;
 
 				switch ( this.type ) {
@@ -377,32 +378,30 @@ class RGBELoader extends DataTextureLoader {
 					case FloatType:
 
 						numElements = image_rgba_data.length / 4;
-						const floatArray = new Float32Array( numElements * 3 );
+						const floatArray = new Float32Array( numElements * 4 );
 
 						for ( let j = 0; j < numElements; j ++ ) {
 
-							RGBEByteToRGBFloat( image_rgba_data, j * 4, floatArray, j * 3 );
+							RGBEByteToRGBFloat( image_rgba_data, j * 4, floatArray, j * 4 );
 
 						}
 
 						data = floatArray;
-						format = RGBFormat;
 						type = FloatType;
 						break;
 
 					case HalfFloatType:
 
 						numElements = image_rgba_data.length / 4;
-						const halfArray = new Uint16Array( numElements * 3 );
+						const halfArray = new Uint16Array( numElements * 4 );
 
 						for ( let j = 0; j < numElements; j ++ ) {
 
-							RGBEByteToRGBHalf( image_rgba_data, j * 4, halfArray, j * 3 );
+							RGBEByteToRGBHalf( image_rgba_data, j * 4, halfArray, j * 4 );
 
 						}
 
 						data = halfArray;
-						format = RGBFormat;
 						type = HalfFloatType;
 						break;
 
@@ -419,7 +418,6 @@ class RGBELoader extends DataTextureLoader {
 					header: rgbe_header_info.string,
 					gamma: rgbe_header_info.gamma,
 					exposure: rgbe_header_info.exposure,
-					format: format,
 					type: type
 				};
 
@@ -445,14 +443,6 @@ class RGBELoader extends DataTextureLoader {
 			switch ( texture.type ) {
 
 				case FloatType:
-
-					texture.encoding = LinearEncoding;
-					texture.minFilter = LinearFilter;
-					texture.magFilter = LinearFilter;
-					texture.generateMipmaps = false;
-					texture.flipY = true;
-					break;
-
 				case HalfFloatType:
 
 					texture.encoding = LinearEncoding;
@@ -460,6 +450,7 @@ class RGBELoader extends DataTextureLoader {
 					texture.magFilter = LinearFilter;
 					texture.generateMipmaps = false;
 					texture.flipY = true;
+			
 					break;
 
 			}