super-three 0.141.0 → 0.147.0

package/examples/jsm/math/ConvexHull.js

@@ -122,7 +122,7 @@ class ConvexHull {
 
 	intersectRay( ray, target ) {
 
-		// based on "Fast Ray-Convex Polyhedron Intersection"  by Eric Haines, GRAPHICS GEMS II
+		// based on "Fast Ray-Convex Polyhedron Intersection" by Eric Haines, GRAPHICS GEMS II
 
 		const faces = this.faces;
 
@@ -156,7 +156,7 @@ class ConvexHull {
 
 			if ( vD > 0 ) {
 
-				//  plane faces away from the ray, so this plane is a back-face
+				// plane faces away from the ray, so this plane is a back-face
 
 				tFar = Math.min( t, tFar );
 
@@ -263,7 +263,7 @@ class ConvexHull {
 
 	}
 
-	// Removes all the visible vertices that a given face is able to see which are stored in the 'assigned' vertext list
+	// Removes all the visible vertices that a given face is able to see which are stored in the 'assigned' vertex list
 
 	removeAllVerticesFromFace( face ) {
 
@@ -1268,4 +1268,4 @@ class VertexList {
 
 }
 
-export { ConvexHull };
+export { ConvexHull, Face, HalfEdge, VertexNode, VertexList };

package/examples/jsm/math/Octree.js

@@ -49,7 +49,7 @@ class Octree {
 
 		this.box = this.bounds.clone();
 
-		// offset small ammount to account for regular grid
+		// offset small amount to account for regular grid
 		this.box.min.x -= 0.01;
 		this.box.min.y -= 0.01;
 		this.box.min.z -= 0.01;

package/examples/jsm/misc/GPUComputationRenderer.js

@@ -3,8 +3,10 @@ import {
 	ClampToEdgeWrapping,
 	DataTexture,
 	FloatType,
+	LinearEncoding,
 	Mesh,
 	NearestFilter,
+	NoToneMapping,
 	PlaneGeometry,
 	RGBAFormat,
 	Scene,
@@ -288,6 +290,32 @@ class GPUComputationRenderer {
 
 		};
 
+		this.dispose = function () {
+
+			mesh.geometry.dispose();
+			mesh.material.dispose();
+
+			const variables = this.variables;
+
+			for ( let i = 0; i < variables.length; i ++ ) {
+
+				const variable = variables[ i ];
+
+				variable.initialValueTexture?.dispose();
+
+				const renderTargets = variable.renderTargets;
+
+				for ( let j = 0; j < renderTargets.length; j ++ ) {
+
+					const renderTarget = renderTargets[ j ];
+					renderTarget.dispose();
+
+				}
+
+			}
+
+		};
+
 		function addResolutionDefine( materialShader ) {
 
 			materialShader.defines.resolution = 'vec2( ' + sizeX.toFixed( 1 ) + ', ' + sizeY.toFixed( 1 ) + ' )';
@@ -369,11 +397,26 @@ class GPUComputationRenderer {
 
 			const currentRenderTarget = renderer.getRenderTarget();
 
+			const currentXrEnabled = renderer.xr.enabled;
+			const currentShadowAutoUpdate = renderer.shadowMap.autoUpdate;
+			const currentOutputEncoding = renderer.outputEncoding;
+			const currentToneMapping = renderer.toneMapping;
+
+			renderer.xr.enabled = false; // Avoid camera modification
+			renderer.shadowMap.autoUpdate = false; // Avoid re-computing shadows
+			renderer.outputEncoding = LinearEncoding;
+			renderer.toneMapping = NoToneMapping;
+
 			mesh.material = material;
 			renderer.setRenderTarget( output );
 			renderer.render( scene, camera );
 			mesh.material = passThruShader;
 
+			renderer.xr.enabled = currentXrEnabled;
+			renderer.shadowMap.autoUpdate = currentShadowAutoUpdate;
+			renderer.outputEncoding = currentOutputEncoding;
+			renderer.toneMapping = currentToneMapping;
+
 			renderer.setRenderTarget( currentRenderTarget );
 
 		};

package/examples/jsm/misc/Volume.js

@@ -17,190 +17,188 @@ import { VolumeSlice } from '../misc/VolumeSlice.js';
  * @param   {string}        type            The type of data (uint8, uint16, ...)
  * @param   {ArrayBuffer}   arrayBuffer     The buffer with volume data
  */
-function Volume( xLength, yLength, zLength, type, arrayBuffer ) {
+class Volume {
+
+	constructor( xLength, yLength, zLength, type, arrayBuffer ) {
+
+		if ( xLength !== undefined ) {
+
+			/**
+			 * @member {number} xLength Width of the volume in the IJK coordinate system
+			 */
+			this.xLength = Number( xLength ) || 1;
+			/**
+			 * @member {number} yLength Height of the volume in the IJK coordinate system
+			 */
+			this.yLength = Number( yLength ) || 1;
+			/**
+			 * @member {number} zLength Depth of the volume in the IJK coordinate system
+			 */
+			this.zLength = Number( zLength ) || 1;
+			/**
+			 * @member {Array<string>} The order of the Axis dictated by the NRRD header
+			 */
+			this.axisOrder = [ 'x', 'y', 'z' ];
+			/**
+			 * @member {TypedArray} data Data of the volume
+			 */
+
+			switch ( type ) {
+
+				case 'Uint8' :
+				case 'uint8' :
+				case 'uchar' :
+				case 'unsigned char' :
+				case 'uint8_t' :
+					this.data = new Uint8Array( arrayBuffer );
+					break;
+				case 'Int8' :
+				case 'int8' :
+				case 'signed char' :
+				case 'int8_t' :
+					this.data = new Int8Array( arrayBuffer );
+					break;
+				case 'Int16' :
+				case 'int16' :
+				case 'short' :
+				case 'short int' :
+				case 'signed short' :
+				case 'signed short int' :
+				case 'int16_t' :
+					this.data = new Int16Array( arrayBuffer );
+					break;
+				case 'Uint16' :
+				case 'uint16' :
+				case 'ushort' :
+				case 'unsigned short' :
+				case 'unsigned short int' :
+				case 'uint16_t' :
+					this.data = new Uint16Array( arrayBuffer );
+					break;
+				case 'Int32' :
+				case 'int32' :
+				case 'int' :
+				case 'signed int' :
+				case 'int32_t' :
+					this.data = new Int32Array( arrayBuffer );
+					break;
+				case 'Uint32' :
+				case 'uint32' :
+				case 'uint' :
+				case 'unsigned int' :
+				case 'uint32_t' :
+					this.data = new Uint32Array( arrayBuffer );
+					break;
+				case 'longlong' :
+				case 'long long' :
+				case 'long long int' :
+				case 'signed long long' :
+				case 'signed long long int' :
+				case 'int64' :
+				case 'int64_t' :
+				case 'ulonglong' :
+				case 'unsigned long long' :
+				case 'unsigned long long int' :
+				case 'uint64' :
+				case 'uint64_t' :
+					throw new Error( 'Error in Volume constructor : this type is not supported in JavaScript' );
+					break;
+				case 'Float32' :
+				case 'float32' :
+				case 'float' :
+					this.data = new Float32Array( arrayBuffer );
+					break;
+				case 'Float64' :
+				case 'float64' :
+				case 'double' :
+					this.data = new Float64Array( arrayBuffer );
+					break;
+				default :
+					this.data = new Uint8Array( arrayBuffer );
 
-	if ( arguments.length > 0 ) {
+			}
+
+			if ( this.data.length !== this.xLength * this.yLength * this.zLength ) {
+
+				throw new Error( 'Error in Volume constructor, lengths are not matching arrayBuffer size' );
+
+			}
+
+		}
 
 		/**
-		 * @member {number} xLength Width of the volume in the IJK coordinate system
+		 * @member {Array}  spacing Spacing to apply to the volume from IJK to RAS coordinate system
 		 */
-		this.xLength = Number( xLength ) || 1;
+		this.spacing = [ 1, 1, 1 ];
 		/**
-		 * @member {number} yLength Height of the volume in the IJK coordinate system
+		 * @member {Array}  offset Offset of the volume in the RAS coordinate system
 		 */
-		this.yLength = Number( yLength ) || 1;
+		this.offset = [ 0, 0, 0 ];
 		/**
-		 * @member {number} zLength Depth of the volume in the IJK coordinate system
+		 * @member {Martrix3} matrix The IJK to RAS matrix
 		 */
-		this.zLength = Number( zLength ) || 1;
+		this.matrix = new Matrix3();
+		this.matrix.identity();
 		/**
-		 * @member {Array<string>} The order of the Axis dictated by the NRRD header
+		 * @member {Martrix3} inverseMatrix The RAS to IJK matrix
 		 */
-		this.axisOrder = [ 'x', 'y', 'z' ];
 		/**
-		 * @member {TypedArray} data Data of the volume
+		 * @member {number} lowerThreshold The voxels with values under this threshold won't appear in the slices.
+		 *                      If changed, geometryNeedsUpdate is automatically set to true on all the slices associated to this volume
 		 */
+		let lowerThreshold = - Infinity;
+		Object.defineProperty( this, 'lowerThreshold', {
+			get: function () {
 
-		switch ( type ) {
-
-			case 'Uint8' :
-			case 'uint8' :
-			case 'uchar' :
-			case 'unsigned char' :
-			case 'uint8_t' :
-				this.data = new Uint8Array( arrayBuffer );
-				break;
-			case 'Int8' :
-			case 'int8' :
-			case 'signed char' :
-			case 'int8_t' :
-				this.data = new Int8Array( arrayBuffer );
-				break;
-			case 'Int16' :
-			case 'int16' :
-			case 'short' :
-			case 'short int' :
-			case 'signed short' :
-			case 'signed short int' :
-			case 'int16_t' :
-				this.data = new Int16Array( arrayBuffer );
-				break;
-			case 'Uint16' :
-			case 'uint16' :
-			case 'ushort' :
-			case 'unsigned short' :
-			case 'unsigned short int' :
-			case 'uint16_t' :
-				this.data = new Uint16Array( arrayBuffer );
-				break;
-			case 'Int32' :
-			case 'int32' :
-			case 'int' :
-			case 'signed int' :
-			case 'int32_t' :
-				this.data = new Int32Array( arrayBuffer );
-				break;
-			case 'Uint32' :
-			case 'uint32' :
-			case 'uint' :
-			case 'unsigned int' :
-			case 'uint32_t' :
-				this.data = new Uint32Array( arrayBuffer );
-				break;
-			case 'longlong' :
-			case 'long long' :
-			case 'long long int' :
-			case 'signed long long' :
-			case 'signed long long int' :
-			case 'int64' :
-			case 'int64_t' :
-			case 'ulonglong' :
-			case 'unsigned long long' :
-			case 'unsigned long long int' :
-			case 'uint64' :
-			case 'uint64_t' :
-				throw new Error( 'Error in Volume constructor : this type is not supported in JavaScript' );
-				break;
-			case 'Float32' :
-			case 'float32' :
-			case 'float' :
-				this.data = new Float32Array( arrayBuffer );
-				break;
-			case 'Float64' :
-			case 'float64' :
-			case 'double' :
-				this.data = new Float64Array( arrayBuffer );
-				break;
-			default :
-				this.data = new Uint8Array( arrayBuffer );
-
-		}
-
-		if ( this.data.length !== this.xLength * this.yLength * this.zLength ) {
-
-			throw new Error( 'Error in Volume constructor, lengths are not matching arrayBuffer size' );
-
-		}
-
-	}
-
-	/**
-	 * @member {Array}  spacing Spacing to apply to the volume from IJK to RAS coordinate system
-	 */
-	this.spacing = [ 1, 1, 1 ];
-	/**
-	 * @member {Array}  offset Offset of the volume in the RAS coordinate system
-	 */
-	this.offset = [ 0, 0, 0 ];
-	/**
-	 * @member {Martrix3} matrix The IJK to RAS matrix
-	 */
-	this.matrix = new Matrix3();
-	this.matrix.identity();
-	/**
-	 * @member {Martrix3} inverseMatrix The RAS to IJK matrix
-	 */
-	/**
-	 * @member {number} lowerThreshold The voxels with values under this threshold won't appear in the slices.
-	 *                      If changed, geometryNeedsUpdate is automatically set to true on all the slices associated to this volume
-	 */
-	let lowerThreshold = - Infinity;
-	Object.defineProperty( this, 'lowerThreshold', {
-		get: function () {
-
-			return lowerThreshold;
-
-		},
-		set: function ( value ) {
+				return lowerThreshold;
 
-			lowerThreshold = value;
-			this.sliceList.forEach( function ( slice ) {
+			},
+			set: function ( value ) {
 
-				slice.geometryNeedsUpdate = true;
+				lowerThreshold = value;
+				this.sliceList.forEach( function ( slice ) {
 
-			} );
-
-		}
-	} );
-	/**
-	 * @member {number} upperThreshold The voxels with values over this threshold won't appear in the slices.
-	 *                      If changed, geometryNeedsUpdate is automatically set to true on all the slices associated to this volume
-	 */
-	let upperThreshold = Infinity;
-	Object.defineProperty( this, 'upperThreshold', {
-		get: function () {
+					slice.geometryNeedsUpdate = true;
 
-			return upperThreshold;
+				} );
 
-		},
-		set: function ( value ) {
+			}
+		} );
+		/**
+		 * @member {number} upperThreshold The voxels with values over this threshold won't appear in the slices.
+		 *                      If changed, geometryNeedsUpdate is automatically set to true on all the slices associated to this volume
+		 */
+		let upperThreshold = Infinity;
+		Object.defineProperty( this, 'upperThreshold', {
+			get: function () {
 
-			upperThreshold = value;
-			this.sliceList.forEach( function ( slice ) {
+				return upperThreshold;
 
-				slice.geometryNeedsUpdate = true;
+			},
+			set: function ( value ) {
 
-			} );
+				upperThreshold = value;
+				this.sliceList.forEach( function ( slice ) {
 
-		}
-	} );
+					slice.geometryNeedsUpdate = true;
 
+				} );
 
-	/**
-	 * @member {Array} sliceList The list of all the slices associated to this volume
-	 */
-	this.sliceList = [];
+			}
+		} );
 
 
-	/**
-	 * @member {Array} RASDimensions This array holds the dimensions of the volume in the RAS space
-	 */
+		/**
+		 * @member {Array} sliceList The list of all the slices associated to this volume
+		 */
+		this.sliceList = [];
 
-}
 
-Volume.prototype = {
+		/**
+		 * @member {Array} RASDimensions This array holds the dimensions of the volume in the RAS space
+		 */
 
-	constructor: Volume,
+	}
 
 	/**
 	 * @member {Function} getData Shortcut for data[access(i,j,k)]
@@ -210,11 +208,11 @@ Volume.prototype = {
 	 * @param {number} k    Third coordinate
 	 * @returns {number}  value in the data array
 	 */
-	getData: function ( i, j, k ) {
+	getData( i, j, k ) {
 
 		return this.data[ k * this.xLength * this.yLength + j * this.xLength + i ];
 
-	},
+	}
 
 	/**
 	 * @member {Function} access compute the index in the data array corresponding to the given coordinates in IJK system
@@ -224,11 +222,11 @@ Volume.prototype = {
 	 * @param {number} k    Third coordinate
 	 * @returns {number}  index
 	 */
-	access: function ( i, j, k ) {
+	access( i, j, k ) {
 
 		return k * this.xLength * this.yLength + j * this.xLength + i;
 
-	},
+	}
 
 	/**
 	 * @member {Function} reverseAccess Retrieve the IJK coordinates of the voxel corresponding of the given index in the data
@@ -236,14 +234,14 @@ Volume.prototype = {
 	 * @param {number} index index of the voxel
 	 * @returns {Array}  [x,y,z]
 	 */
-	reverseAccess: function ( index ) {
+	reverseAccess( index ) {
 
 		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 ];
 
-	},
+	}
 
 	/**
 	 * @member {Function} map Apply a function to all the voxels, be careful, the value will be replaced
@@ -255,7 +253,7 @@ Volume.prototype = {
 	 * @param {Object}   context    You can specify a context in which call the function, default if this Volume
 	 * @returns {Volume}   this
 	 */
-	map: function ( functionToMap, context ) {
+	map( functionToMap, context ) {
 
 		const length = this.data.length;
 		context = context || this;
@@ -268,7 +266,7 @@ Volume.prototype = {
 
 		return this;
 
-	},
+	}
 
 	/**
 	 * @member {Function} extractPerpendicularPlane Compute the orientation of the slice and returns all the information relative to the geometry such as sliceAccess, the plane matrix (orientation and position in RAS coordinate) and the dimensions of the plane in both coordinate system.
@@ -277,7 +275,7 @@ Volume.prototype = {
 	 * @param {number}            index the index of the slice
 	 * @returns {Object} an object containing all the usefull information on the geometry of the slice
 	 */
-	extractPerpendicularPlane: function ( axis, RASIndex ) {
+	extractPerpendicularPlane( axis, RASIndex ) {
 
 		let firstSpacing,
 			secondSpacing,
@@ -387,7 +385,7 @@ Volume.prototype = {
 			planeHeight: planeHeight
 		};
 
-	},
+	}
 
 	/**
 	 * @member {Function} extractSlice Returns a slice corresponding to the given axis and index
@@ -397,13 +395,13 @@ Volume.prototype = {
 	 * @param {number}            index the index of the slice
 	 * @returns {VolumeSlice} the extracted slice
 	 */
-	extractSlice: function ( axis, index ) {
+	extractSlice( axis, index ) {
 
 		const slice = new VolumeSlice( this, index, axis );
 		this.sliceList.push( slice );
 		return slice;
 
-	},
+	}
 
 	/**
 	 * @member {Function} repaintAllSlices Call repaint on all the slices extracted from this volume
@@ -411,7 +409,7 @@ Volume.prototype = {
 	 * @memberof Volume
 	 * @returns {Volume} this
 	 */
-	repaintAllSlices: function () {
+	repaintAllSlices() {
 
 		this.sliceList.forEach( function ( slice ) {
 
@@ -421,14 +419,14 @@ Volume.prototype = {
 
 		return this;
 
-	},
+	}
 
 	/**
 	 * @member {Function} computeMinMax Compute the minimum and the maximum of the data in the volume
 	 * @memberof Volume
 	 * @returns {Array} [min,max]
 	 */
-	computeMinMax: function () {
+	computeMinMax() {
 
 		let min = Infinity;
 		let max = - Infinity;
@@ -457,6 +455,6 @@ Volume.prototype = {
 
 	}
 
-};
+}
 
 export { Volume };