super-three 0.147.1 → 0.152.0

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/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 ) );
 
 		}