@needle-tools/three 0.146.9 → 0.153.0

package/examples/jsm/loaders/lwo/IFFParser.js

@@ -32,7 +32,6 @@
  *
  **/
 
-import { LoaderUtils } from 'three';
 import { LWO2Parser } from './LWO2Parser.js';
 import { LWO3Parser } from './LWO3Parser.js';
 
@@ -908,6 +907,8 @@ function DataViewReader( buffer ) {
 
 	this.dv = new DataView( buffer );
 	this.offset = 0;
+	this._textDecoder = new TextDecoder();
+	this._bytes = new Uint8Array( buffer );
 
 }
 
@@ -1065,35 +1066,34 @@ DataViewReader.prototype = {
 
 		if ( size === 0 ) return;
 
-		// note: safari 9 doesn't support Uint8Array.indexOf; create intermediate array instead
-		var a = [];
-
-		if ( size ) {
+		const start = this.offset;
 
-			for ( var i = 0; i < size; i ++ ) {
+		let result;
+		let length;
 
-				a[ i ] = this.getUint8();
+		if ( size ) {
 
-			}
+			length = size;
+			result = this._textDecoder.decode( new Uint8Array( this.dv.buffer, start, size ) );
 
 		} else {
 
-			var currentChar;
-			var len = 0;
-
-			while ( currentChar !== 0 ) {
+			// use 1:1 mapping of buffer to avoid redundant new array creation.
+			length = this._bytes.indexOf( 0, start ) - start;
 
-				currentChar = this.getUint8();
-				if ( currentChar !== 0 ) a.push( currentChar );
-				len ++;
+			result = this._textDecoder.decode( new Uint8Array( this.dv.buffer, start, length ) );
 
-			}
+			// account for null byte in length
+			length ++;
 
-			if ( ! isEven( len + 1 ) ) this.getUint8(); // if string with terminating nullbyte is uneven, extra nullbyte is added
+			// if string with terminating nullbyte is uneven, extra nullbyte is added, skip that too
+			length += length % 2;
 
 		}
 
-		return LoaderUtils.decodeText( new Uint8Array( a ) );
+		this.skip( length );
+
+		return result;
 
 	},
 
@@ -1211,7 +1211,7 @@ function stringOffset( string ) {
 // printBuffer( this.reader.dv.buffer, this.reader.offset, length );
 function printBuffer( buffer, from, to ) {
 
-	console.log( LoaderUtils.decodeText( new Uint8Array( buffer, from, to ) ) );
+	console.log( new TextDecoder().decode( new Uint8Array( buffer, from, to ) ) );
 
 }
 

package/examples/jsm/materials/MeshGouraudMaterial.js

@@ -37,7 +37,6 @@ const GouraudShader = {
 
 		#include <common>
 		#include <uv_pars_vertex>
-		#include <uv2_pars_vertex>
 		#include <envmap_pars_vertex>
 		#include <bsdfs>
 		#include <lights_pars_begin>
@@ -52,7 +51,6 @@ const GouraudShader = {
 		void main() {
 
 			#include <uv_vertex>
-			#include <uv2_vertex>
 			#include <color_vertex>
 			#include <morphcolor_vertex>
 
@@ -221,7 +219,6 @@ const GouraudShader = {
 		#include <dithering_pars_fragment>
 		#include <color_pars_fragment>
 		#include <uv_pars_fragment>
-		#include <uv2_pars_fragment>
 		#include <map_pars_fragment>
 		#include <alphamap_pars_fragment>
 		#include <alphatest_pars_fragment>

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 ) {
 

package/examples/jsm/math/Lut.js

@@ -1,5 +1,6 @@
 import {
 	Color,
+	LinearSRGBColorSpace,
 	MathUtils
 } from 'three';
 
@@ -75,8 +76,8 @@ class Lut {
 					const min = this.map[ j ][ 0 ];
 					const max = this.map[ j + 1 ][ 0 ];
 
-					minColor.set( this.map[ j ][ 1 ] );
-					maxColor.set( this.map[ j + 1 ][ 1 ] );
+					minColor.setHex( this.map[ j ][ 1 ], LinearSRGBColorSpace );
+					maxColor.setHex( this.map[ j + 1 ][ 1 ], LinearSRGBColorSpace );
 
 					const color = new Color().lerpColors( minColor, maxColor, ( alpha - min ) / ( max - min ) );
 
@@ -165,8 +166,8 @@ class Lut {
 					const min = this.map[ j - 1 ][ 0 ];
 					const max = this.map[ j ][ 0 ];
 
-					minColor.set( this.map[ j - 1 ][ 1 ] );
-					maxColor.set( this.map[ j ][ 1 ] );
+					minColor.setHex( this.map[ j - 1 ][ 1 ], LinearSRGBColorSpace );
+					maxColor.setHex( this.map[ j ][ 1 ], LinearSRGBColorSpace );
 
 					finalColor.lerpColors( minColor, maxColor, ( i - min ) / ( max - min ) );
 

package/examples/jsm/math/MeshSurfaceSampler.js

@@ -23,12 +23,6 @@ class MeshSurfaceSampler {
 
 		let geometry = mesh.geometry;
 
-		if ( ! geometry.isBufferGeometry || geometry.attributes.position.itemSize !== 3 ) {
-
-			throw new Error( 'THREE.MeshSurfaceSampler: Requires BufferGeometry triangle mesh.' );
-
-		}
-
 		if ( geometry.index ) {
 
 			console.warn( 'THREE.MeshSurfaceSampler: Converting geometry to non-indexed BufferGeometry.' );
@@ -114,11 +108,15 @@ class MeshSurfaceSampler {
 
 	sample( targetPosition, targetNormal, targetColor ) {
 
-		const cumulativeTotal = this.distribution[ this.distribution.length - 1 ];
+		const faceIndex = this.sampleFaceIndex();
+		return this.sampleFace( faceIndex, targetPosition, targetNormal, targetColor );
 
-		const faceIndex = this.binarySearch( this.randomFunction() * cumulativeTotal );
+	}
 
-		return this.sampleFace( faceIndex, targetPosition, targetNormal, targetColor );
+	sampleFaceIndex() {
+
+		const cumulativeTotal = this.distribution[ this.distribution.length - 1 ];
+		return this.binarySearch( this.randomFunction() * cumulativeTotal );
 
 	}
 

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/ConvexObjectBreaker.js

@@ -19,7 +19,7 @@ import { ConvexGeometry } from '../geometries/ConvexGeometry.js';
  *
  * Requisites for the object:
  *
- *  - Mesh object must have a BufferGeometry (not Geometry) and a Material
+ *  - Mesh object must have a buffer geometry and a material
  *
  *  - Vertex normals must be planar (not smoothed)
  *
@@ -70,16 +70,10 @@ class ConvexObjectBreaker {
 
 	prepareBreakableObject( object, mass, velocity, angularVelocity, breakable ) {
 
-		// object is a Object3d (normally a Mesh), must have a BufferGeometry, and it must be convex.
+		// object is a Object3d (normally a Mesh), must have a buffer geometry, and it must be convex.
 		// Its material property is propagated to its children (sub-pieces)
 		// mass must be > 0
 
-		if ( ! object.geometry.isBufferGeometry ) {
-
-			console.error( 'THREE.ConvexObjectBreaker.prepareBreakableObject(): Parameter object must have a BufferGeometry.' );
-
-		}
-
 		const userData = object.userData;
 		userData.mass = mass;
 		userData.velocity = velocity.clone();

package/examples/jsm/misc/GPUComputationRenderer.js

@@ -3,7 +3,7 @@ import {
 	ClampToEdgeWrapping,
 	DataTexture,
 	FloatType,
-	LinearEncoding,
+	LinearSRGBColorSpace,
 	Mesh,
 	NearestFilter,
 	NoToneMapping,
@@ -301,7 +301,7 @@ class GPUComputationRenderer {
 
 				const variable = variables[ i ];
 
-				variable.initialValueTexture?.dispose();
+				if ( variable.initialValueTexture ) variable.initialValueTexture.dispose();
 
 				const renderTargets = variable.renderTargets;
 
@@ -332,6 +332,7 @@ class GPUComputationRenderer {
 			uniforms = uniforms || {};
 
 			const material = new ShaderMaterial( {
+				name: 'GPUComputationShader',
 				uniforms: uniforms,
 				vertexShader: getPassThroughVertexShader(),
 				fragmentShader: computeFragmentShader
@@ -399,12 +400,12 @@ class GPUComputationRenderer {
 
 			const currentXrEnabled = renderer.xr.enabled;
 			const currentShadowAutoUpdate = renderer.shadowMap.autoUpdate;
-			const currentOutputEncoding = renderer.outputEncoding;
+			const currentOutputColorSpace = renderer.outputColorSpace;
 			const currentToneMapping = renderer.toneMapping;
 
 			renderer.xr.enabled = false; // Avoid camera modification
 			renderer.shadowMap.autoUpdate = false; // Avoid re-computing shadows
-			renderer.outputEncoding = LinearEncoding;
+			renderer.outputColorSpace = LinearSRGBColorSpace;
 			renderer.toneMapping = NoToneMapping;
 
 			mesh.material = material;
@@ -414,7 +415,7 @@ class GPUComputationRenderer {
 
 			renderer.xr.enabled = currentXrEnabled;
 			renderer.shadowMap.autoUpdate = currentShadowAutoUpdate;
-			renderer.outputEncoding = currentOutputEncoding;
+			renderer.outputColorSpace = currentOutputColorSpace;
 			renderer.toneMapping = currentToneMapping;
 
 			renderer.setRenderTarget( currentRenderTarget );

package/examples/jsm/misc/MD2Character.js

@@ -6,7 +6,7 @@ import {
 	Object3D,
 	TextureLoader,
 	UVMapping,
-	sRGBEncoding
+	SRGBColorSpace
 } from 'three';
 import { MD2Loader } from '../loaders/MD2Loader.js';
 
@@ -73,7 +73,7 @@ class MD2Character {
 				textures[ i ] = textureLoader.load( baseUrl + textureUrls[ i ], checkLoadingComplete );
 				textures[ i ].mapping = UVMapping;
 				textures[ i ].name = textureUrls[ i ];
-				textures[ i ].encoding = sRGBEncoding;
+				textures[ i ].colorSpace = SRGBColorSpace;
 
 			}
 

package/examples/jsm/misc/MD2CharacterComplex.js

@@ -5,7 +5,7 @@ import {
 	Object3D,
 	TextureLoader,
 	UVMapping,
-	sRGBEncoding
+	SRGBColorSpace
 } from 'three';
 import { MD2Loader } from '../loaders/MD2Loader.js';
 import { MorphBlendMesh } from '../misc/MorphBlendMesh.js';
@@ -157,7 +157,7 @@ class MD2CharacterComplex {
 				textures[ i ] = textureLoader.load( baseUrl + textureUrls[ i ], checkLoadingComplete );
 				textures[ i ].mapping = UVMapping;
 				textures[ i ].name = textureUrls[ i ];
-				textures[ i ].encoding = sRGBEncoding;
+				textures[ i ].colorSpace = SRGBColorSpace;
 
 			}
 

package/examples/jsm/misc/ProgressiveLightMap.js

@@ -36,6 +36,7 @@ class ProgressiveLightMap {
 		const format = /(Android|iPad|iPhone|iPod)/g.test( navigator.userAgent ) ? THREE.HalfFloatType : THREE.FloatType;
 		this.progressiveLightMap1 = new THREE.WebGLRenderTarget( this.res, this.res, { type: format } );
 		this.progressiveLightMap2 = new THREE.WebGLRenderTarget( this.res, this.res, { type: format } );
+		this.progressiveLightMap2.texture.channel = 1;
 
 		// Inject some spicy new logic into a standard phong material
 		this.uvMat = new THREE.MeshPhongMaterial();
@@ -45,17 +46,18 @@ class ProgressiveLightMap {
 			// Vertex Shader: Set Vertex Positions to the Unwrapped UV Positions
 			shader.vertexShader =
 				'#define USE_LIGHTMAP\n' +
+				'#define LIGHTMAP_UV uv1\n' +
 				shader.vertexShader.slice( 0, - 1 ) +
-				'	gl_Position = vec4((uv2 - 0.5) * 2.0, 1.0, 1.0); }';
+				'	gl_Position = vec4((LIGHTMAP_UV - 0.5) * 2.0, 1.0, 1.0); }';
 
 			// Fragment Shader: Set Pixels to average in the Previous frame's Shadows
 			const bodyStart = shader.fragmentShader.indexOf( 'void main() {' );
 			shader.fragmentShader =
-				'varying vec2 vUv2;\n' +
+				'#define USE_LIGHTMAP\n' +
 				shader.fragmentShader.slice( 0, bodyStart ) +
 				'	uniform sampler2D previousShadowMap;\n	uniform float averagingWindow;\n' +
 				shader.fragmentShader.slice( bodyStart - 1, - 1 ) +
-				`\nvec3 texelOld = texture2D(previousShadowMap, vUv2).rgb;
+				`\nvec3 texelOld = texture2D(previousShadowMap, vLightMapUv).rgb;
 				gl_FragColor.rgb = mix(texelOld, gl_FragColor.rgb, 1.0/averagingWindow);
 			}`;
 
@@ -75,7 +77,7 @@ class ProgressiveLightMap {
 	}
 
 	/**
-	 * Sets these objects' materials' lightmaps and modifies their uv2's.
+	 * Sets these objects' materials' lightmaps and modifies their uv1's.
 	 * @param {Object3D} objects An array of objects and lights to set up your lightmap.
 	 */
 	addObjectsToLightMap( objects ) {
@@ -128,16 +130,16 @@ class ProgressiveLightMap {
 		const dimensions = potpack( this.uv_boxes );
 		this.uv_boxes.forEach( ( box ) => {
 
-			const uv2 = objects[ box.index ].geometry.getAttribute( 'uv' ).clone();
-			for ( let i = 0; i < uv2.array.length; i += uv2.itemSize ) {
+			const uv1 = objects[ box.index ].geometry.getAttribute( 'uv' ).clone();
+			for ( let i = 0; i < uv1.array.length; i += uv1.itemSize ) {
 
-				uv2.array[ i ] = ( uv2.array[ i ] + box.x + padding ) / dimensions.w;
-				uv2.array[ i + 1 ] = ( uv2.array[ i + 1 ] + box.y + padding ) / dimensions.h;
+				uv1.array[ i ] = ( uv1.array[ i ] + box.x + padding ) / dimensions.w;
+				uv1.array[ i + 1 ] = ( uv1.array[ i + 1 ] + box.y + padding ) / dimensions.h;
 
 			}
 
-			objects[ box.index ].geometry.setAttribute( 'uv2', uv2 );
-			objects[ box.index ].geometry.getAttribute( 'uv2' ).needsUpdate = true;
+			objects[ box.index ].geometry.setAttribute( 'uv1', uv1 );
+			objects[ box.index ].geometry.getAttribute( 'uv1' ).needsUpdate = true;
 
 		} );
 

package/examples/jsm/misc/RollerCoaster.js

@@ -1,8 +1,10 @@
 import {
 	BufferAttribute,
 	BufferGeometry,
+	Color,
 	Quaternion,
 	Raycaster,
+	SRGBColorSpace,
 	Vector3
 } from 'three';
 
@@ -513,6 +515,8 @@ class TreesGeometry extends BufferGeometry {
 		const raycaster = new Raycaster();
 		raycaster.ray.direction.set( 0, - 1, 0 );
 
+		const _color = new Color();
+
 		for ( let i = 0; i < 2000; i ++ ) {
 
 			const x = Math.random() * 500 - 250;
@@ -544,7 +548,9 @@ class TreesGeometry extends BufferGeometry {
 
 			for ( let j = 0; j < 6; j ++ ) {
 
-				colors.push( 0.2 + random, 0.4 + random, 0 );
+				_color.setRGB( 0.2 + random, 0.4 + random, 0, SRGBColorSpace );
+
+				colors.push( _color.r, _color.g, _color.b );
 
 			}
 

package/examples/jsm/misc/Volume.js

@@ -194,10 +194,18 @@ class Volume {
 		this.sliceList = [];
 
 
+		/**
+		 * @member {boolean} segmentation in segmentation mode, it can load 16-bits nrrds correctly
+		 */
+		this.segmentation = false;
+
+
 		/**
 		 * @member {Array} RASDimensions This array holds the dimensions of the volume in the RAS space
 		 */
 
+
+
 	}
 
 	/**
@@ -332,13 +340,20 @@ class Volume {
 
 		}
 
-		firstDirection.applyMatrix4( volume.inverseMatrix ).normalize();
+
+		let iLength, jLength;
+
+		if( ! this.segmentation ) {
+
+			firstDirection.applyMatrix4( volume.inverseMatrix ).normalize();
+			secondDirection.applyMatrix4( volume.inverseMatrix ).normalize();
+			axisInIJK.applyMatrix4( volume.inverseMatrix ).normalize();
+
+		}
 		firstDirection.arglet = 'i';
-		secondDirection.applyMatrix4( volume.inverseMatrix ).normalize();
 		secondDirection.arglet = 'j';
-		axisInIJK.applyMatrix4( volume.inverseMatrix ).normalize();
-		const iLength = Math.floor( Math.abs( firstDirection.dot( dimensions ) ) );
-		const jLength = Math.floor( Math.abs( secondDirection.dot( dimensions ) ) );
+		iLength = Math.floor( Math.abs( firstDirection.dot( dimensions ) ) );
+		jLength = Math.floor( Math.abs( secondDirection.dot( dimensions ) ) );
 		const planeWidth = Math.abs( iLength * firstSpacing );
 		const planeHeight = Math.abs( jLength * secondSpacing );
 

package/examples/jsm/misc/VolumeSlice.js

@@ -5,7 +5,8 @@ import {
 	Mesh,
 	MeshBasicMaterial,
 	PlaneGeometry,
-	Texture
+	Texture,
+	SRGBColorSpace
 } from 'three';
 
 /**
@@ -68,6 +69,7 @@ class VolumeSlice {
 		const canvasMap = new Texture( this.canvas );
 		canvasMap.minFilter = LinearFilter;
 		canvasMap.wrapS = canvasMap.wrapT = ClampToEdgeWrapping;
+		canvasMap.colorSpace = SRGBColorSpace;
 		const material = new MeshBasicMaterial( { map: canvasMap, side: DoubleSide, transparent: true } );
 		/**
 		 * @member {Mesh} mesh The mesh ready to get used in the scene

package/examples/jsm/modifiers/CurveModifier.js

@@ -270,6 +270,7 @@ export class InstancedFlow extends Flow {
 			count
 		);
 		mesh.instanceMatrix.setUsage( DynamicDrawUsage );
+		mesh.frustumCulled = false;
 		super( mesh, curveCount );
 
 		this.offsets = new Array( count ).fill( 0 );

package/examples/jsm/modifiers/TessellateModifier.js

@@ -66,19 +66,19 @@ class TessellateModifier {
 		const hasNormals = attributes.normal !== undefined;
 		const hasColors = attributes.color !== undefined;
 		const hasUVs = attributes.uv !== undefined;
-		const hasUV2s = attributes.uv2 !== undefined;
+		const hasUV1s = attributes.uv1 !== undefined;
 
 		let positions = attributes.position.array;
 		let normals = hasNormals ? attributes.normal.array : null;
 		let colors = hasColors ? attributes.color.array : null;
 		let uvs = hasUVs ? attributes.uv.array : null;
-		let uv2s = hasUV2s ? attributes.uv2.array : null;
+		let uv1s = hasUV1s ? attributes.uv1.array : null;
 
 		let positions2 = positions;
 		let normals2 = normals;
 		let colors2 = colors;
 		let uvs2 = uvs;
-		let uv2s2 = uv2s;
+		let uv1s2 = uv1s;
 
 		let iteration = 0;
 		let tessellating = true;
@@ -129,15 +129,15 @@ class TessellateModifier {
 
 			}
 
-			if ( hasUV2s ) {
+			if ( hasUV1s ) {
 
 				const u21 = u2s[ a ];
 				const u22 = u2s[ b ];
 				const u23 = u2s[ c ];
 
-				uv2s2.push( u21.x, u21.y );
-				uv2s2.push( u22.x, u22.y );
-				uv2s2.push( u23.x, u23.y );
+				uv1s2.push( u21.x, u21.y );
+				uv1s2.push( u22.x, u22.y );
+				uv1s2.push( u23.x, u23.y );
 
 			}
 
@@ -172,10 +172,10 @@ class TessellateModifier {
 
 			}
 
-			if ( hasUV2s ) {
+			if ( hasUV1s ) {
 
-				uv2s = uv2s2;
-				uv2s2 = [];
+				uv1s = uv1s2;
+				uv1s2 = [];
 
 			}
 
@@ -209,11 +209,11 @@ class TessellateModifier {
 
 				}
 
-				if ( hasUV2s ) {
+				if ( hasUV1s ) {
 
-					u2a.fromArray( uv2s, i2 + 0 );
-					u2b.fromArray( uv2s, i2 + 2 );
-					u2c.fromArray( uv2s, i2 + 4 );
+					u2a.fromArray( uv1s, i2 + 0 );
+					u2b.fromArray( uv1s, i2 + 2 );
+					u2c.fromArray( uv1s, i2 + 4 );
 
 				}
 
@@ -231,7 +231,7 @@ class TessellateModifier {
 						if ( hasNormals ) nm.lerpVectors( na, nb, 0.5 );
 						if ( hasColors ) cm.lerpColors( ca, cb, 0.5 );
 						if ( hasUVs ) um.lerpVectors( ua, ub, 0.5 );
-						if ( hasUV2s ) u2m.lerpVectors( u2a, u2b, 0.5 );
+						if ( hasUV1s ) u2m.lerpVectors( u2a, u2b, 0.5 );
 
 						addTriangle( 0, 3, 2 );
 						addTriangle( 3, 1, 2 );
@@ -242,7 +242,7 @@ class TessellateModifier {
 						if ( hasNormals ) nm.lerpVectors( nb, nc, 0.5 );
 						if ( hasColors ) cm.lerpColors( cb, cc, 0.5 );
 						if ( hasUVs ) um.lerpVectors( ub, uc, 0.5 );
-						if ( hasUV2s ) u2m.lerpVectors( u2b, u2c, 0.5 );
+						if ( hasUV1s ) u2m.lerpVectors( u2b, u2c, 0.5 );
 
 						addTriangle( 0, 1, 3 );
 						addTriangle( 3, 2, 0 );
@@ -253,7 +253,7 @@ class TessellateModifier {
 						if ( hasNormals ) nm.lerpVectors( na, nc, 0.5 );
 						if ( hasColors ) cm.lerpColors( ca, cc, 0.5 );
 						if ( hasUVs ) um.lerpVectors( ua, uc, 0.5 );
-						if ( hasUV2s ) u2m.lerpVectors( u2a, u2c, 0.5 );
+						if ( hasUV1s ) u2m.lerpVectors( u2a, u2c, 0.5 );
 
 						addTriangle( 0, 1, 3 );
 						addTriangle( 3, 1, 2 );
@@ -292,9 +292,9 @@ class TessellateModifier {
 
 		}
 
-		if ( hasUV2s ) {
+		if ( hasUV1s ) {
 
-			geometry2.setAttribute( 'uv2', new Float32BufferAttribute( uv2s2, 2 ) );
+			geometry2.setAttribute( 'uv1', new Float32BufferAttribute( uv1s2, 2 ) );
 
 		}