super-three 0.137.0 → 0.141.0

package/examples/js/loaders/lwo/LWO2Parser.js

@@ -12,8 +12,8 @@
 
 			this.IFF.debugger.offset = this.IFF.reader.offset;
 			this.IFF.debugger.closeForms();
-			var blockID = this.IFF.reader.getIDTag();
-			var length = this.IFF.reader.getUint32(); // size of data in bytes
+			const blockID = this.IFF.reader.getIDTag();
+			let length = this.IFF.reader.getUint32(); // size of data in bytes
 
 			if ( length > this.IFF.reader.dv.byteLength - this.IFF.reader.offset ) {
 
@@ -247,7 +247,7 @@
 					break;
 
 				case 'IMAG':
-					var index = this.IFF.reader.getVariableLengthIndex();
+					const index = this.IFF.reader.getVariableLengthIndex();
 					this.IFF.currentForm.imageIndex = index;
 					break;
 					// Texture Mapping Form
@@ -315,7 +315,7 @@
 					// LWO2 Spec chunks: these are needed since the SURF FORMs are often in LWO2 format
 
 				case 'SMAN':
-					var maxSmoothingAngle = this.IFF.reader.getFloat32();
+					const maxSmoothingAngle = this.IFF.reader.getFloat32();
 					this.IFF.currentSurface.attributes.smooth = maxSmoothingAngle < 0 ? false : true;
 					break;
 					// LWO2: Basic Surface Parameters

package/examples/js/loaders/lwo/LWO3Parser.js

@@ -12,8 +12,8 @@
 
 			this.IFF.debugger.offset = this.IFF.reader.offset;
 			this.IFF.debugger.closeForms();
-			var blockID = this.IFF.reader.getIDTag();
-			var length = this.IFF.reader.getUint32(); // size of data in bytes
+			const blockID = this.IFF.reader.getIDTag();
+			const length = this.IFF.reader.getUint32(); // size of data in bytes
 
 			this.IFF.debugger.dataOffset = this.IFF.reader.offset;
 			this.IFF.debugger.length = length; // Data types may be found in either LWO2 OR LWO3 spec
@@ -212,7 +212,7 @@
 					break;
 
 				case 'IMAG':
-					var index = this.IFF.reader.getVariableLengthIndex();
+					const index = this.IFF.reader.getVariableLengthIndex();
 					this.IFF.currentForm.imageIndex = index;
 					break;
 					// Texture Mapping Form
@@ -280,7 +280,7 @@
 					// LWO2 Spec chunks: these are needed since the SURF FORMs are often in LWO2 format
 
 				case 'SMAN':
-					var maxSmoothingAngle = this.IFF.reader.getFloat32();
+					const maxSmoothingAngle = this.IFF.reader.getFloat32();
 					this.IFF.currentSurface.attributes.smooth = maxSmoothingAngle < 0 ? false : true;
 					break;
 					// LWO2: Basic Surface Parameters

package/examples/js/math/ConvexHull.js

@@ -73,24 +73,15 @@
 
 				if ( geometry !== undefined ) {
 
-					if ( geometry.isGeometry ) {
+					const attribute = geometry.attributes.position;
 
-						console.error( 'THREE.ConvexHull no longer supports Geometry. Use THREE.BufferGeometry instead.' );
-						return;
+					if ( attribute !== undefined ) {
 
-					} else if ( geometry.isBufferGeometry ) {
+						for ( let i = 0, l = attribute.count; i < l; i ++ ) {
 
-						const attribute = geometry.attributes.position;
-
-						if ( attribute !== undefined ) {
-
-							for ( let i = 0, l = attribute.count; i < l; i ++ ) {
-
-								const point = new THREE.Vector3();
-								point.fromBufferAttribute( attribute, i ).applyMatrix4( node.matrixWorld );
-								points.push( point );
-
-							}
+							const point = new THREE.Vector3();
+							point.fromBufferAttribute( attribute, i ).applyMatrix4( node.matrixWorld );
+							points.push( point );
 
 						}
 

package/examples/js/math/Lut.js

@@ -4,6 +4,7 @@
 
 		constructor( colormap, count = 32 ) {
 
+			this.isLut = true;
 			this.lut = [];
 			this.map = [];
 			this.n = 0;
@@ -44,27 +45,35 @@
 			this.map = ColorMapKeywords[ colormap ] || ColorMapKeywords.rainbow;
 			this.n = count;
 			const step = 1.0 / this.n;
-			this.lut.length = 0;
+			const minColor = new THREE.Color();
+			const maxColor = new THREE.Color();
+			this.lut.length = 0; // sample at 0
 
-			for ( let i = 0; i <= 1; i += step ) {
+			this.lut.push( new THREE.Color( this.map[ 0 ][ 1 ] ) ); // sample at 1/n, ..., (n-1)/n
+
+			for ( let i = 1; i < count; i ++ ) {
+
+				const alpha = i * step;
 
 				for ( let j = 0; j < this.map.length - 1; j ++ ) {
 
-					if ( i >= this.map[ j ][ 0 ] && i < this.map[ j + 1 ][ 0 ] ) {
+					if ( alpha > this.map[ j ][ 0 ] && alpha <= this.map[ j + 1 ][ 0 ] ) {
 
 						const min = this.map[ j ][ 0 ];
 						const max = this.map[ j + 1 ][ 0 ];
-						const minColor = new THREE.Color( this.map[ j ][ 1 ] );
-						const maxColor = new THREE.Color( this.map[ j + 1 ][ 1 ] );
-						const color = minColor.lerp( maxColor, ( i - min ) / ( max - min ) );
+						minColor.set( this.map[ j ][ 1 ] );
+						maxColor.set( this.map[ j + 1 ][ 1 ] );
+						const color = new THREE.Color().lerpColors( minColor, maxColor, ( alpha - min ) / ( max - min ) );
 						this.lut.push( color );
 
 					}
 
 				}
 
-			}
+			} // sample at 1
 
+
+			this.lut.push( new THREE.Color( this.map[ this.map.length - 1 ][ 1 ] ) );
 			return this;
 
 		}
@@ -82,19 +91,9 @@
 
 		getColor( alpha ) {
 
-			if ( alpha <= this.minV ) {
-
-				alpha = this.minV;
-
-			} else if ( alpha >= this.maxV ) {
-
-				alpha = this.maxV;
-
-			}
-
+			alpha = THREE.MathUtils.clamp( alpha, this.minV, this.maxV );
 			alpha = ( alpha - this.minV ) / ( this.maxV - this.minV );
-			let colorPosition = Math.round( alpha * this.n );
-			colorPosition == this.n ? colorPosition -= 1 : colorPosition;
+			const colorPosition = Math.round( alpha * this.n );
 			return this.lut[ colorPosition ];
 
 		}
@@ -125,6 +124,9 @@
 			const data = imageData.data;
 			let k = 0;
 			const step = 1.0 / this.n;
+			const minColor = new THREE.Color();
+			const maxColor = new THREE.Color();
+			const finalColor = new THREE.Color();
 
 			for ( let i = 1; i >= 0; i -= step ) {
 
@@ -134,12 +136,12 @@
 
 						const min = this.map[ j - 1 ][ 0 ];
 						const max = this.map[ j ][ 0 ];
-						const minColor = new THREE.Color( this.map[ j - 1 ][ 1 ] );
-						const maxColor = new THREE.Color( this.map[ j ][ 1 ] );
-						const color = minColor.lerp( maxColor, ( i - min ) / ( max - min ) );
-						data[ k * 4 ] = Math.round( color.r * 255 );
-						data[ k * 4 + 1 ] = Math.round( color.g * 255 );
-						data[ k * 4 + 2 ] = Math.round( color.b * 255 );
+						minColor.set( this.map[ j - 1 ][ 1 ] );
+						maxColor.set( this.map[ j ][ 1 ] );
+						finalColor.lerpColors( minColor, maxColor, ( i - min ) / ( max - min ) );
+						data[ k * 4 ] = Math.round( finalColor.r * 255 );
+						data[ k * 4 + 1 ] = Math.round( finalColor.g * 255 );
+						data[ k * 4 + 2 ] = Math.round( finalColor.b * 255 );
 						data[ k * 4 + 3 ] = 255;
 						k += 1;
 
@@ -156,7 +158,6 @@
 
 	}
 
-	Lut.prototype.isLut = true;
 	const ColorMapKeywords = {
 		'rainbow': [[ 0.0, 0x0000FF ], [ 0.2, 0x00FFFF ], [ 0.5, 0x00FF00 ], [ 0.8, 0xFFFF00 ], [ 1.0, 0xFF0000 ]],
 		'cooltowarm': [[ 0.0, 0x3C4EC2 ], [ 0.2, 0x9BBCFF ], [ 0.5, 0xDCDCDC ], [ 0.8, 0xF6A385 ], [ 1.0, 0xB40426 ]],

package/examples/js/misc/MorphAnimMesh.js

@@ -54,9 +54,9 @@
 
 		}
 
-		copy( source ) {
+		copy( source, recursive ) {
 
-			super.copy( source );
+			super.copy( source, recursive );
 			this.mixer = new THREE.AnimationMixer( this );
 			return this;
 

package/examples/js/misc/ProgressiveLightMap.js

@@ -315,7 +315,7 @@
 
 			};
 
-			this.blurringPlane = new THREE.Mesh( new THREE.PlaneBufferGeometry( 1, 1 ), blurMaterial );
+			this.blurringPlane = new THREE.Mesh( new THREE.PlaneGeometry( 1, 1 ), blurMaterial );
 			this.blurringPlane.name = 'Blurring Plane';
 			this.blurringPlane.frustumCulled = false;
 			this.blurringPlane.renderOrder = 0;

package/examples/js/misc/Volume.js

@@ -157,7 +157,7 @@
    *                      If changed, geometryNeedsUpdate is automatically set to true on all the slices associated to this volume
    */
 
-		var lowerThreshold = - Infinity;
+		let lowerThreshold = - Infinity;
 		Object.defineProperty( this, 'lowerThreshold', {
 			get: function () {
 
@@ -180,7 +180,7 @@
    *                      If changed, geometryNeedsUpdate is automatically set to true on all the slices associated to this volume
    */
 
-		var upperThreshold = Infinity;
+		let upperThreshold = Infinity;
 		Object.defineProperty( this, 'upperThreshold', {
 			get: function () {
 
@@ -248,9 +248,9 @@
    */
 		reverseAccess: function ( index ) {
 
-			var z = Math.floor( index / ( this.yLength * this.xLength ) );
-			var y = Math.floor( ( index - z * this.yLength * this.xLength ) / this.xLength );
-			var x = index - z * this.yLength * this.xLength - y * this.xLength;
+			const z = Math.floor( index / ( this.yLength * this.xLength ) );
+			const y = Math.floor( ( index - z * this.yLength * this.xLength ) / this.xLength );
+			const x = index - z * this.yLength * this.xLength - y * this.xLength;
 			return [ x, y, z ];
 
 		},
@@ -267,10 +267,10 @@
    */
 		map: function ( functionToMap, context ) {
 
-			var length = this.data.length;
+			const length = this.data.length;
 			context = context || this;
 
-			for ( var i = 0; i < length; i ++ ) {
+			for ( let i = 0; i < length; i ++ ) {
 
 				this.data[ i ] = functionToMap.call( context, this.data[ i ], i, this.data );
 
@@ -289,21 +289,13 @@
    */
 		extractPerpendicularPlane: function ( axis, RASIndex ) {
 
-			var iLength,
-				jLength,
-				sliceAccess,
-				planeMatrix = new THREE.Matrix4().identity(),
-				volume = this,
-				planeWidth,
-				planeHeight,
-				firstSpacing,
-				secondSpacing,
-				positionOffset,
-				IJKIndex;
-			var axisInIJK = new THREE.Vector3(),
+			let firstSpacing, secondSpacing, positionOffset, IJKIndex;
+			const axisInIJK = new THREE.Vector3(),
 				firstDirection = new THREE.Vector3(),
-				secondDirection = new THREE.Vector3();
-			var dimensions = new THREE.Vector3( this.xLength, this.yLength, this.zLength );
+				secondDirection = new THREE.Vector3(),
+				planeMatrix = new THREE.Matrix4().identity(),
+				volume = this;
+			const dimensions = new THREE.Vector3( this.xLength, this.yLength, this.zLength );
 
 			switch ( axis ) {
 
@@ -346,45 +338,44 @@
 			}
 
 			firstDirection.applyMatrix4( volume.inverseMatrix ).normalize();
-			firstDirection.argVar = 'i';
+			firstDirection.arglet = 'i';
 			secondDirection.applyMatrix4( volume.inverseMatrix ).normalize();
-			secondDirection.argVar = 'j';
+			secondDirection.arglet = 'j';
 			axisInIJK.applyMatrix4( volume.inverseMatrix ).normalize();
-			iLength = Math.floor( Math.abs( firstDirection.dot( dimensions ) ) );
-			jLength = Math.floor( Math.abs( secondDirection.dot( dimensions ) ) );
-			planeWidth = Math.abs( iLength * firstSpacing );
-			planeHeight = Math.abs( jLength * secondSpacing );
+			const iLength = Math.floor( Math.abs( firstDirection.dot( dimensions ) ) );
+			const jLength = Math.floor( Math.abs( secondDirection.dot( dimensions ) ) );
+			const planeWidth = Math.abs( iLength * firstSpacing );
+			const planeHeight = Math.abs( jLength * secondSpacing );
 			IJKIndex = Math.abs( Math.round( IJKIndex.applyMatrix4( volume.inverseMatrix ).dot( axisInIJK ) ) );
-			var base = [ new THREE.Vector3( 1, 0, 0 ), new THREE.Vector3( 0, 1, 0 ), new THREE.Vector3( 0, 0, 1 ) ];
-			var iDirection = [ firstDirection, secondDirection, axisInIJK ].find( function ( x ) {
+			const base = [ new THREE.Vector3( 1, 0, 0 ), new THREE.Vector3( 0, 1, 0 ), new THREE.Vector3( 0, 0, 1 ) ];
+			const iDirection = [ firstDirection, secondDirection, axisInIJK ].find( function ( x ) {
 
 				return Math.abs( x.dot( base[ 0 ] ) ) > 0.9;
 
 			} );
-			var jDirection = [ firstDirection, secondDirection, axisInIJK ].find( function ( x ) {
+			const jDirection = [ firstDirection, secondDirection, axisInIJK ].find( function ( x ) {
 
 				return Math.abs( x.dot( base[ 1 ] ) ) > 0.9;
 
 			} );
-			var kDirection = [ firstDirection, secondDirection, axisInIJK ].find( function ( x ) {
+			const kDirection = [ firstDirection, secondDirection, axisInIJK ].find( function ( x ) {
 
 				return Math.abs( x.dot( base[ 2 ] ) ) > 0.9;
 
 			} );
 
-			sliceAccess = function ( i, j ) {
+			function sliceAccess( i, j ) {
 
-				var accessI, accessJ, accessK;
-				var si = iDirection === axisInIJK ? IJKIndex : iDirection.argVar === 'i' ? i : j;
-				var sj = jDirection === axisInIJK ? IJKIndex : jDirection.argVar === 'i' ? i : j;
-				var sk = kDirection === axisInIJK ? IJKIndex : kDirection.argVar === 'i' ? i : j; // invert indices if necessary
+				const si = iDirection === axisInIJK ? IJKIndex : iDirection.arglet === 'i' ? i : j;
+				const sj = jDirection === axisInIJK ? IJKIndex : jDirection.arglet === 'i' ? i : j;
+				const sk = kDirection === axisInIJK ? IJKIndex : kDirection.arglet === 'i' ? i : j; // invert indices if necessary
 
-				var accessI = iDirection.dot( base[ 0 ] ) > 0 ? si : volume.xLength - 1 - si;
-				var accessJ = jDirection.dot( base[ 1 ] ) > 0 ? sj : volume.yLength - 1 - sj;
-				var accessK = kDirection.dot( base[ 2 ] ) > 0 ? sk : volume.zLength - 1 - sk;
+				const accessI = iDirection.dot( base[ 0 ] ) > 0 ? si : volume.xLength - 1 - si;
+				const accessJ = jDirection.dot( base[ 1 ] ) > 0 ? sj : volume.yLength - 1 - sj;
+				const accessK = kDirection.dot( base[ 2 ] ) > 0 ? sk : volume.zLength - 1 - sk;
 				return volume.access( accessI, accessJ, accessK );
 
-			};
+			}
 
 			return {
 				iLength: iLength,
@@ -407,7 +398,7 @@
    */
 		extractSlice: function ( axis, index ) {
 
-			var slice = new THREE.VolumeSlice( this, index, axis );
+			const slice = new THREE.VolumeSlice( this, index, axis );
 			this.sliceList.push( slice );
 			return slice;
 
@@ -437,17 +428,17 @@
    */
 		computeMinMax: function () {
 
-			var min = Infinity;
-			var max = - Infinity; // buffer the length
+			let min = Infinity;
+			let max = - Infinity; // buffer the length
 
-			var datasize = this.data.length;
-			var i = 0;
+			const datasize = this.data.length;
+			let i = 0;
 
 			for ( i = 0; i < datasize; i ++ ) {
 
 				if ( ! isNaN( this.data[ i ] ) ) {
 
-					var value = this.data[ i ];
+					const value = this.data[ i ];
 					min = Math.min( min, value );
 					max = Math.max( max, value );
 

package/examples/js/misc/VolumeSlice.js

@@ -11,7 +11,7 @@
 
 	function VolumeSlice( volume, index, axis ) {
 
-		var slice = this;
+		const slice = this;
 		/**
    * @member {Volume} volume The associated volume
    */
@@ -60,10 +60,10 @@
 
 		this.canvasBuffer = document.createElement( 'canvas' );
 		this.updateGeometry();
-		var canvasMap = new THREE.Texture( this.canvas );
+		const canvasMap = new THREE.Texture( this.canvas );
 		canvasMap.minFilter = THREE.LinearFilter;
 		canvasMap.wrapS = canvasMap.wrapT = THREE.ClampToEdgeWrapping;
-		var material = new THREE.MeshBasicMaterial( {
+		const material = new THREE.MeshBasicMaterial( {
 			map: canvasMap,
 			side: THREE.DoubleSide,
 			transparent: true
@@ -113,33 +113,33 @@
 
 			}
 
-			var iLength = this.iLength,
+			const iLength = this.iLength,
 				jLength = this.jLength,
 				sliceAccess = this.sliceAccess,
 				volume = this.volume,
 				canvas = this.canvasBuffer,
 				ctx = this.ctxBuffer; // get the imageData and pixel array from the canvas
 
-			var imgData = ctx.getImageData( 0, 0, iLength, jLength );
-			var data = imgData.data;
-			var volumeData = volume.data;
-			var upperThreshold = volume.upperThreshold;
-			var lowerThreshold = volume.lowerThreshold;
-			var windowLow = volume.windowLow;
-			var windowHigh = volume.windowHigh; // manipulate some pixel elements
+			const imgData = ctx.getImageData( 0, 0, iLength, jLength );
+			const data = imgData.data;
+			const volumeData = volume.data;
+			const upperThreshold = volume.upperThreshold;
+			const lowerThreshold = volume.lowerThreshold;
+			const windowLow = volume.windowLow;
+			const windowHigh = volume.windowHigh; // manipulate some pixel elements
 
-			var pixelCount = 0;
+			let pixelCount = 0;
 
 			if ( volume.dataType === 'label' ) {
 
 				//this part is currently useless but will be used when colortables will be handled
-				for ( var j = 0; j < jLength; j ++ ) {
+				for ( let j = 0; j < jLength; j ++ ) {
 
-					for ( var i = 0; i < iLength; i ++ ) {
+					for ( let i = 0; i < iLength; i ++ ) {
 
-						var label = volumeData[ sliceAccess( i, j ) ];
+						let label = volumeData[ sliceAccess( i, j ) ];
 						label = label >= this.colorMap.length ? label % this.colorMap.length + 1 : label;
-						var color = this.colorMap[ label ];
+						const color = this.colorMap[ label ];
 						data[ 4 * pixelCount ] = color >> 24 & 0xff;
 						data[ 4 * pixelCount + 1 ] = color >> 16 & 0xff;
 						data[ 4 * pixelCount + 2 ] = color >> 8 & 0xff;
@@ -152,12 +152,12 @@
 
 			} else {
 
-				for ( var j = 0; j < jLength; j ++ ) {
+				for ( let j = 0; j < jLength; j ++ ) {
 
-					for ( var i = 0; i < iLength; i ++ ) {
+					for ( let i = 0; i < iLength; i ++ ) {
 
-						var value = volumeData[ sliceAccess( i, j ) ];
-						var alpha = 0xff; //apply threshold
+						let value = volumeData[ sliceAccess( i, j ) ];
+						let alpha = 0xff; //apply threshold
 
 						alpha = upperThreshold >= value ? lowerThreshold <= value ? alpha : 0 : 0; //apply window level
 
@@ -188,7 +188,7 @@
    */
 		updateGeometry: function () {
 
-			var extracted = this.volume.extractPerpendicularPlane( this.axis, this.index );
+			const extracted = this.volume.extractPerpendicularPlane( this.axis, this.index );
 			this.sliceAccess = extracted.sliceAccess;
 			this.jLength = extracted.jLength;
 			this.iLength = extracted.iLength;

package/examples/js/modifiers/EdgeSplitModifier.js

@@ -139,13 +139,6 @@
 
 			}
 
-			if ( geometry.isGeometry === true ) {
-
-				console.error( 'THREE.EdgeSplitModifier no longer supports THREE.Geometry. Use THREE.BufferGeometry instead.' );
-				return;
-
-			}
-
 			let hadNormals = false;
 			let oldNormals = null;
 

package/examples/js/modifiers/SimplifyModifier.js

@@ -15,13 +15,6 @@
 
 		modify( geometry, count ) {
 
-			if ( geometry.isGeometry === true ) {
-
-				console.error( 'THREE.SimplifyModifier no longer supports Geometry. Use THREE.BufferGeometry instead.' );
-				return;
-
-			}
-
 			geometry = geometry.clone();
 			const attributes = geometry.attributes; // this modifier can only process indexed and non-indexed geomtries with a position attribute
 
@@ -141,7 +134,7 @@
 
 	function removeFromArray( array, object ) {
 
-		var k = array.indexOf( object );
+		const k = array.indexOf( object );
 		if ( k > - 1 ) array.splice( k, 1 );
 
 	}

package/examples/js/modifiers/TessellateModifier.js

@@ -15,13 +15,6 @@
 
 		modify( geometry ) {
 
-			if ( geometry.isGeometry === true ) {
-
-				console.error( 'THREE.TessellateModifier no longer supports Geometry. Use THREE.BufferGeometry instead.' );
-				return geometry;
-
-			}
-
 			if ( geometry.index !== null ) {
 
 				geometry = geometry.toNonIndexed();

package/examples/js/objects/Lensflare.js

@@ -8,6 +8,7 @@
 				opacity: 0,
 				transparent: true
 			} ) );
+			this.isLensflare = true;
 			this.type = 'Lensflare';
 			this.frustumCulled = false;
 			this.renderOrder = Infinity; //
@@ -232,9 +233,8 @@
 
 		}
 
-	}
+	} //
 
-	Lensflare.prototype.isLensflare = true; //
 
 	class LensflareElement {
 

package/examples/js/objects/LightningStorm.js

@@ -50,7 +50,8 @@
 
 		constructor( stormParams = {} ) {
 
-			super(); // Parameters
+			super();
+			this.isLightningStorm = true; // Parameters
 
 			this.stormParams = stormParams;
 			stormParams.size = stormParams.size !== undefined ? stormParams.size : 1000.0;
@@ -176,9 +177,9 @@
 
 		}
 
-		copy( source ) {
+		copy( source, recursive ) {
 
-			super.copy( source );
+			super.copy( source, recursive );
 			this.stormParams.size = source.stormParams.size;
 			this.stormParams.minHeight = source.stormParams.minHeight;
 			this.stormParams.maxHeight = source.stormParams.maxHeight;
@@ -203,8 +204,6 @@
 
 	}
 
-	LightningStorm.prototype.isLightningStorm = true;
-
 	THREE.LightningStorm = LightningStorm;
 
 } )();