@unikia/upe-renderer 0.186.110 → 0.187.11

package/examples/jsm/loaders/usd/USDAParser.js

@@ -81,7 +81,7 @@ class USDAParser {
 				const value = line.slice( colonIdx + 1 ).trim();
 
 				// Only process if key looks like a number (timeSamples frame)
-				if ( /^[\d.]+$/.test( key ) ) {
+				if ( /^-?[\d.]+$/.test( key ) ) {
 
 					target[ key ] = value;
 
@@ -235,39 +235,42 @@ class USDAParser {
 
 	_stripBlockComments( text ) {
 
-		// Iteratively remove /* ... */ comments without regex backtracking
+		// Iteratively remove /* ... */ comments without regex backtracking.
+		// Strings are copied as is since they may contain /* (e.g. path expressions)
+		const tokens = /\/\*|"""|'''|["']/g;
+
 		let result = '';
 		let i = 0;
 
 		while ( i < text.length ) {
 
-			// Check for block comment start
-			if ( text[ i ] === '/' && i + 1 < text.length && text[ i + 1 ] === '*' ) {
+			tokens.lastIndex = i;
+			const match = tokens.exec( text );
 
-				// Find the closing */
-				let j = i + 2;
+			if ( match === null ) {
 
-				while ( j < text.length ) {
+				result += text.slice( i );
+				break;
 
-					if ( text[ j ] === '*' && j + 1 < text.length && text[ j + 1 ] === '/' ) {
+			}
 
-						// Found closing, skip past it
-						j += 2;
-						break;
+			const start = match.index;
+			const token = match[ 0 ];
 
-					}
+			if ( token === '/*' ) {
 
-					j ++;
-
-				}
+				result += text.slice( i, start );
 
 				// Move past the comment (or to end if unclosed)
-				i = j;
+				const end = text.indexOf( '*/', start + 2 );
+				i = ( end === - 1 ) ? text.length : end + 2;
 
 			} else {
 
-				result += text[ i ];
-				i ++;
+				const end = this._findStringEnd( text, start, token );
+
+				result += text.slice( i, end );
+				i = end;
 
 			}
 
@@ -277,57 +280,63 @@ class USDAParser {
 
 	}
 
-	_collapseTripleQuotedStrings( text ) {
+	_findStringEnd( text, start, quote ) {
 
-		let result = '';
-		let i = 0;
+		if ( quote.length === 3 ) {
 
-		while ( i < text.length ) {
+			const end = text.indexOf( quote, start + 3 );
+			return ( end === - 1 ) ? text.length : end + 3;
 
-			if ( i + 2 < text.length ) {
+		}
 
-				const triple = text.slice( i, i + 3 );
+		// Single-line string with escapes, ends at the line end if unclosed
+		for ( let i = start + 1; i < text.length; i ++ ) {
 
-				if ( triple === '\'\'\'' || triple === '"""' ) {
+			const ch = text[ i ];
 
-					const quoteChar = triple;
-					result += quoteChar;
-					i += 3;
+			if ( ch === '\\' ) i ++;
+			else if ( ch === quote ) return i + 1;
+			else if ( ch === '\n' ) return i;
 
-					while ( i < text.length ) {
+		}
 
-						if ( i + 2 < text.length && text.slice( i, i + 3 ) === quoteChar ) {
+		return text.length;
 
-							result += quoteChar;
-							i += 3;
-							break;
+	}
 
-						} else {
+	_collapseTripleQuotedStrings( text ) {
 
-							if ( text[ i ] === '\n' ) {
+		const tripleQuote = /'''|"""/g;
 
-								result += '\\n';
+		let result = '';
+		let i = 0;
 
-							} else if ( text[ i ] !== '\r' ) {
+		while ( i < text.length ) {
 
-								result += text[ i ];
+			tripleQuote.lastIndex = i;
+			const match = tripleQuote.exec( text );
 
-							}
+			if ( match === null ) {
 
-							i ++;
+				result += text.slice( i );
+				break;
 
-						}
+			}
 
-					}
+			const start = match.index;
+			const quoteChar = match[ 0 ];
 
-					continue;
+			result += text.slice( i, start );
 
-				}
+			const end = text.indexOf( quoteChar, start + 3 );
+			const content = text.slice( start + 3, ( end === - 1 ) ? text.length : end );
 
-			}
+			result += quoteChar + content.replace( /\r/g, '' ).replace( /\n/g, '\\n' );
+
+			if ( end === - 1 ) break;
 
-			result += text[ i ];
-			i ++;
+			result += quoteChar;
+			i = end + 3;
 
 		}
 

package/examples/jsm/loaders/usd/USDComposer.js

@@ -11,7 +11,9 @@ import {
 	DirectionalLight,
 	Euler,
 	Group,
+	ImageLoader,
 	LoaderUtils,
+	LinearSRGBColorSpace,
 	Matrix4,
 	Mesh,
 	MeshPhysicalMaterial,
@@ -79,11 +81,12 @@ const USD_CAMERA_DEFAULTS = {
  */
 class USDComposer {
 
-	constructor( manager = null ) {
+	constructor( manager ) {
 
 		this.textureCache = {};
 		this.skinnedMeshes = [];
 		this.manager = manager;
+		this.imageLoader = new ImageLoader( manager );
 		this.texturePromises = [];
 
 	}
@@ -894,6 +897,9 @@ class USDComposer {
 		if ( referencedData.specsByPath ) {
 
 			const composer = new USDComposer( this.manager );
+			composer.imageLoader.setCrossOrigin( this.imageLoader.crossOrigin );
+			composer.imageLoader.setPriority( this.imageLoader.priority );
+			composer.imageLoader.setCache( this.imageLoader.cache );
 			const newBasePath = this._getBasePath( resolvedPath );
 			const composedGroup = composer.compose( referencedData, this.assets, mergedVariants, newBasePath );
 
@@ -1330,7 +1336,7 @@ class USDComposer {
 
 				if ( mat.color && mat.color.r === 1 && mat.color.g === 1 && mat.color.b === 1 && ! mat.map ) {
 
-					mat.color.setRGB( displayColor[ 0 ], displayColor[ 1 ], displayColor[ 2 ], SRGBColorSpace );
+					mat.color.setRGB( displayColor[ 0 ], displayColor[ 1 ], displayColor[ 2 ], LinearSRGBColorSpace );
 
 				}
 
@@ -3107,7 +3113,7 @@ class USDComposer {
 
 				if ( Array.isArray( color ) && color.length >= 3 ) {
 
-					material.color.setRGB( color[ 0 ], color[ 1 ], color[ 2 ], SRGBColorSpace );
+					material.color.setRGB( color[ 0 ], color[ 1 ], color[ 2 ], LinearSRGBColorSpace );
 
 				}
 
@@ -3120,7 +3126,7 @@ class USDComposer {
 			const scale = material.map.userData.scale;
 			if ( Array.isArray( scale ) && scale.length >= 3 ) {
 
-				material.color.setRGB( scale[ 0 ], scale[ 1 ], scale[ 2 ], SRGBColorSpace );
+				material.color.setRGB( scale[ 0 ], scale[ 1 ], scale[ 2 ], LinearSRGBColorSpace );
 
 			}
 
@@ -3135,7 +3141,7 @@ class USDComposer {
 
 				if ( Array.isArray( color ) && color.length >= 3 ) {
 
-					material.emissive.setRGB( color[ 0 ], color[ 1 ], color[ 2 ], SRGBColorSpace );
+					material.emissive.setRGB( color[ 0 ], color[ 1 ], color[ 2 ], LinearSRGBColorSpace );
 
 				}
 
@@ -3149,7 +3155,7 @@ class USDComposer {
 				const scale = material.emissiveMap.userData.scale;
 				if ( Array.isArray( scale ) && scale.length >= 3 ) {
 
-					material.emissive.setRGB( scale[ 0 ], scale[ 1 ], scale[ 2 ], SRGBColorSpace );
+					material.emissive.setRGB( scale[ 0 ], scale[ 1 ], scale[ 2 ], LinearSRGBColorSpace );
 
 				}
 
@@ -3228,7 +3234,7 @@ class USDComposer {
 
 				if ( Array.isArray( color ) && color.length >= 3 ) {
 
-					material.specularColor.setRGB( color[ 0 ], color[ 1 ], color[ 2 ], SRGBColorSpace );
+					material.specularColor.setRGB( color[ 0 ], color[ 1 ], color[ 2 ], LinearSRGBColorSpace );
 
 				}
 
@@ -3241,7 +3247,7 @@ class USDComposer {
 			const scale = material.specularColorMap.userData.scale;
 			if ( Array.isArray( scale ) && scale.length >= 3 ) {
 
-				material.specularColor.setRGB( scale[ 0 ], scale[ 1 ], scale[ 2 ], SRGBColorSpace );
+				material.specularColor.setRGB( scale[ 0 ], scale[ 1 ], scale[ 2 ], LinearSRGBColorSpace );
 
 			}
 
@@ -3322,7 +3328,7 @@ class USDComposer {
 
 				if ( Array.isArray( color ) && color.length >= 3 ) {
 
-					material.color.setRGB( color[ 0 ], color[ 1 ], color[ 2 ], SRGBColorSpace );
+					material.color.setRGB( color[ 0 ], color[ 1 ], color[ 2 ], LinearSRGBColorSpace );
 
 				}
 
@@ -3335,7 +3341,7 @@ class USDComposer {
 			const scale = material.map.userData.scale;
 			if ( Array.isArray( scale ) && scale.length >= 3 ) {
 
-				material.color.setRGB( scale[ 0 ], scale[ 1 ], scale[ 2 ], SRGBColorSpace );
+				material.color.setRGB( scale[ 0 ], scale[ 1 ], scale[ 2 ], LinearSRGBColorSpace );
 
 			}
 
@@ -3382,7 +3388,7 @@ class USDComposer {
 
 				if ( Array.isArray( color ) && color.length >= 3 ) {
 
-					material.emissive.setRGB( color[ 0 ], color[ 1 ], color[ 2 ], SRGBColorSpace );
+					material.emissive.setRGB( color[ 0 ], color[ 1 ], color[ 2 ], LinearSRGBColorSpace );
 
 				}
 
@@ -3426,7 +3432,7 @@ class USDComposer {
 
 			if ( transmissionColor !== undefined && Array.isArray( transmissionColor ) ) {
 
-				material.attenuationColor.setRGB( transmissionColor[ 0 ], transmissionColor[ 1 ], transmissionColor[ 2 ] );
+				material.attenuationColor.setRGB( transmissionColor[ 0 ], transmissionColor[ 1 ], transmissionColor[ 2 ], LinearSRGBColorSpace );
 				material.attenuationDistance = transmissionDepth || 1.0;
 
 			}
@@ -3490,7 +3496,8 @@ class USDComposer {
 
 				// OpenPBR uses micrometers, Three.js uses nanometers
 				const thicknessNm = thinFilmThickness * 1000;
-				material.iridescenceThicknessRange = [ thicknessNm, thicknessNm ];
+				material.iridescenceThicknessMinimum = thicknessNm;
+				material.iridescenceThicknessMaximum = thicknessNm;
 
 			}
 
@@ -3509,7 +3516,7 @@ class USDComposer {
 
 		if ( specularColor !== undefined && Array.isArray( specularColor ) ) {
 
-			material.specularColor.setRGB( specularColor[ 0 ], specularColor[ 1 ], specularColor[ 2 ] );
+			material.specularColor.setRGB( specularColor[ 0 ], specularColor[ 1 ], specularColor[ 2 ], LinearSRGBColorSpace );
 
 		}
 
@@ -3870,13 +3877,7 @@ class USDComposer {
 			// Try loading via LoadingManager if available
 			if ( this.manager ) {
 
-				const url = this.manager.resolveURL( baseName );
-				if ( url !== baseName ) {
-
-					// URL modifier found a match - load it
-					return this._createTextureFromData( url, textureAttrs, transformAttrs );
-
-				}
+				return this._createTextureFromData( baseName, textureAttrs, transformAttrs );
 
 			}
 
@@ -3913,11 +3914,9 @@ class USDComposer {
 
 		}
 
-		const image = new Image();
-
 		this.texturePromises.push( new Promise( ( resolve ) => {
 
-			image.onload = function () {
+			this.imageLoader.load( url, function ( image ) {
 
 				texture.image = image;
 
@@ -3939,9 +3938,7 @@ class USDComposer {
 
 				resolve();
 
-			};
-
-			image.onerror = function () {
+			}, undefined, function () {
 
 				console.warn( 'USDLoader: Failed to load texture:', url );
 
@@ -3953,12 +3950,10 @@ class USDComposer {
 
 				resolve();
 
-			};
+			} );
 
 		} ) );
 
-		image.src = url;
-
 		return texture;
 
 	}

package/examples/jsm/math/ColorConverter.js

@@ -27,7 +27,10 @@ class ColorConverter {
 		s = MathUtils.clamp( s, 0, 1 );
 		v = MathUtils.clamp( v, 0, 1 );
 
-		return color.setHSL( h, ( s * v ) / ( ( h = ( 2 - s ) * v ) < 1 ? h : ( 2 - h ) ), h * 0.5 );
+		const l = ( 2 - s ) * v;
+		const saturation = ( l === 0 || l === 2 ) ? 0 : ( s * v ) / ( l < 1 ? l : ( 2 - l ) );
+
+		return color.setHSL( h, saturation, l * 0.5 );
 
 	}
 
@@ -44,10 +47,11 @@ class ColorConverter {
 
 		// based on https://gist.github.com/xpansive/1337890#file-index-js
 		_hsl.s *= ( _hsl.l < 0.5 ) ? _hsl.l : ( 1 - _hsl.l );
+		const v = _hsl.l + _hsl.s;
 
 		target.h = _hsl.h;
-		target.s = 2 * _hsl.s / ( _hsl.l + _hsl.s );
-		target.v = _hsl.l + _hsl.s;
+		target.s = v === 0 ? 0 : 2 * _hsl.s / v;
+		target.v = v;
 
 		return target;
 

package/examples/jsm/math/Lut.js

@@ -143,7 +143,7 @@ class Lut {
 
 		// sample at 0
 
-		this.lut.push( new Color( this.map[ 0 ][ 1 ] ) );
+		this.lut.push( new Color().setHex( this.map[ 0 ][ 1 ], LinearSRGBColorSpace ) );
 
 		// sample at 1/n, ..., (n-1)/n
 
@@ -173,7 +173,7 @@ class Lut {
 
 		// sample at 1
 
-		this.lut.push( new Color( this.map[ this.map.length - 1 ][ 1 ] ) );
+		this.lut.push( new Color().setHex( this.map[ this.map.length - 1 ][ 1 ], LinearSRGBColorSpace ) );
 
 		return this;
 

package/examples/jsm/math/OBB.js

@@ -384,7 +384,7 @@ class OBB {
 
 		// compute distance of the OBB's center from the plane
 
-		const d = plane.normal.dot( this.center ) - plane.constant;
+		const d = plane.distanceToPoint( this.center );
 
 		// Intersection occurs when distance d falls within [-r,+r] interval
 
@@ -515,9 +515,9 @@ class OBB {
 		rotationMatrix.elements[ 7 ] *= invSZ;
 		rotationMatrix.elements[ 8 ] *= invSZ;
 
-		this.rotation.multiply( rotationMatrix );
+		this.rotation.premultiply( rotationMatrix );
 
-		this.halfSize.x *= sx;
+		this.halfSize.x *= Math.abs( sx );
 		this.halfSize.y *= sy;
 		this.halfSize.z *= sz;
 

package/examples/jsm/math/Octree.js

@@ -47,27 +47,27 @@ function lineToLineClosestPoints( line1, line2, target1 = null, target2 = null )
 		const d1 = - d / c;
 		const d2 = ( a - d ) / c;
 
-		if ( Math.abs( d1 - 0.5 ) < Math.abs( d2 - 0.5 ) ) {
+		t1 = ( Math.abs( d1 - 0.5 ) < Math.abs( d2 - 0.5 ) ) ? 0 : 1;
 
-			t1 = 0;
-			t2 = d1;
+	} else {
 
-		} else {
+		t1 = ( e * c - d * a ) / divisor;
 
-			t1 = 1;
-			t2 = d2;
+	}
 
-		}
+	// clamp to the segments. if the closest point on the second segment has
+	// to be clamped, the one on the first segment must be recomputed
 
-	} else {
+	t1 = Math.max( 0, Math.min( 1, t1 ) );
+	t2 = ( t1 * a - d ) / c;
 
-		t1 = ( d * a + e * c ) / divisor;
-		t2 = ( t1 * a - d ) / c;
+	if ( t2 < 0 || t2 > 1 ) {
 
-	}
+		t2 = Math.max( 0, Math.min( 1, t2 ) );
 
-	t2 = Math.max( 0, Math.min( 1, t2 ) );
-	t1 = Math.max( 0, Math.min( 1, t1 ) );
+		if ( b > EPS ) t1 = Math.max( 0, Math.min( 1, ( t2 * a + e ) / b ) );
+
+	}
 
 	if ( target1 ) {
 
@@ -222,7 +222,11 @@ class Octree {
 					box.min.copy( this.box.min ).add( v.multiply( halfsize ) );
 					box.max.copy( box.min ).add( halfsize );
 
-					subTrees.push( new Octree( box ) );
+					const subTree = new Octree( box );
+					subTree.trianglesPerLeaf = this.trianglesPerLeaf;
+					subTree.maxLevel = this.maxLevel;
+
+					subTrees.push( subTree );
 
 				}
 
@@ -424,7 +428,7 @@ class Octree {
 		};
 
 		// project the point onto the triangle surface
-		intersection.point.addScaledVector( intersection.normal, distance );
+		intersection.point.addScaledVector( intersection.normal, - distance );
 
 		return intersection;
 
@@ -444,8 +448,7 @@ class Octree {
 
 		if ( ! sphere.intersectsPlane( _plane ) ) return false;
 
-		const depth = Math.abs( _plane.distanceToSphere( sphere ) );
-		const r2 = sphere.radius * sphere.radius - depth * depth;
+		const r2 = sphere.radius * sphere.radius;
 
 		const plainPoint = _plane.projectPoint( sphere.center, _v1 );
 

package/examples/jsm/objects/GaussianSplat.js

@@ -15,6 +15,7 @@ import {
 
 import {
 	Discard,
+	EPSILON,
 	Fn,
 	If,
 	atan,
@@ -957,14 +958,14 @@ function createMaterialNodes( buffers, sort, localCameraPosition ) {
 		const c = cBase.add( KERNEL_2D_SIZE ).toVar( 'cov2dC' );
 		const detBase = aBase.mul( cBase ).sub( b.mul( b ) ).toVar( 'detBase' );
 		const det = a.mul( c ).sub( b.mul( b ) ).toVar( 'det' );
-		const alphaScale = sqrt( max( detBase.div( max( det, 0.000001 ) ), 0 ) ).toVar( 'alphaScale' );
+		const alphaScale = sqrt( max( detBase.div( max( det, EPSILON ) ), 0 ) ).toVar( 'alphaScale' );
 
 		splatColor.assign( vec4( rgb.clamp( 0, 1 ), color.a.mul( alphaScale ) ) );
 
 		const halfTrace = a.add( c ).mul( 0.5 ).toVar( 'halfTrace' );
-		const radius = sqrt( max( a.sub( c ).mul( 0.5 ).pow2().add( b.mul( b ) ), 0.0000001 ) ).toVar( 'radius' );
-		const lambda1 = max( halfTrace.add( radius ), 0.0000001 ).toVar( 'lambda1' );
-		const lambda2 = max( halfTrace.sub( radius ), 0.0000001 ).toVar( 'lambda2' );
+		const radius = sqrt( max( a.sub( c ).mul( 0.5 ).pow2().add( b.mul( b ) ), EPSILON ) ).toVar( 'radius' );
+		const lambda1 = max( halfTrace.add( radius ), EPSILON ).toVar( 'lambda1' );
+		const lambda2 = max( halfTrace.sub( radius ), EPSILON ).toVar( 'lambda2' );
 		const axis1 = vec2( 1, 0 ).toVar( 'axis1' );
 
 		If( radius.greaterThan( 0.00001 ), () => {

package/examples/jsm/objects/Reflector.js

@@ -156,6 +156,11 @@ class Reflector extends Mesh {
 			reflectionCamera.updateMatrixWorld();
 			reflectionCamera.projectionMatrix.copy( camera.projectionMatrix );
 
+			// The reflection is mirrored horizontally, so the view offset must be mirrored as well.
+
+			reflectionCamera.projectionMatrix.elements[ 8 ] *= - 1;
+			reflectionCamera.projectionMatrix.elements[ 12 ] *= - 1;
+
 			// Update the texture matrix
 			textureMatrix.set(
 				0.5, 0.0, 0.0, 0.5,

package/examples/jsm/objects/SkyMesh.js

@@ -51,28 +51,35 @@ class SkyMesh extends Mesh {
 		super( new BoxGeometry( 1, 1, 1 ), material );
 
 		/**
-		 * The turbidity uniform.
+		 * The atmospheric turbidity which controls the amount of haze.
+		 * Higher values produce a hazier sky.
 		 *
 		 * @type {UniformNode<float>}
 		 */
 		this.turbidity = uniform( 2 );
 
 		/**
-		 * The rayleigh uniform.
+		 * The strength of Rayleigh scattering by air molecules
+		 * which is responsible for the blue color of the sky.
+		 * Higher values produce a brighter sky.
 		 *
 		 * @type {UniformNode<float>}
 		 */
 		this.rayleigh = uniform( 1 );
 
 		/**
-		 * The mieCoefficient uniform.
+		 * The strength of Mie scattering by aerosol particles
+		 * which controls the intensity of the glow around the sun.
+		 * Higher values produce a brighter glow.
 		 *
 		 * @type {UniformNode<float>}
 		 */
 		this.mieCoefficient = uniform( 0.005 );
 
 		/**
-		 * The mieDirectionalG uniform.
+		 * The directionality of Mie scattering which controls
+		 * the size of the glow around the sun. Values closer to `1`
+		 * produce a smaller and more concentrated halo.
 		 *
 		 * @type {UniformNode<float>}
 		 */
@@ -285,7 +292,7 @@ class SkyMesh extends Mesh {
 
 				return fract( p.xx.add( p.yz ).mul( p.zy ) ).mul( 2.0 ).sub( 1.0 );
 
-			} );
+			}, { i: 'vec2', return: 'vec2' } );
 
 			// 2D gradient noise: isotropic lobes like Perlin at value-noise cost
 			const noise = Fn( ( [ p ] ) => {
@@ -301,7 +308,7 @@ class SkyMesh extends Mesh {
 
 				return mix( mix( a, b, u.x ), mix( c, d, u.x ), u.y ).mul( 1.6 ); // ~[-1,1]
 
-			} );
+			}, { p: 'vec2', return: 'float' } );
 
 			// fbm; per-octave drift makes clouds billow instead of scrolling as a rigid stamp
 			const fbm = Fn( ( [ position, drift ] ) => {
@@ -320,7 +327,7 @@ class SkyMesh extends Mesh {
 
 				return result;
 
-			} );
+			}, { position: 'vec2', drift: 'vec2', return: 'float' } );
 
 			// Clouds
 			If( direction.y.greaterThan( 0.0 ).and( this.cloudCoverage.greaterThan( 0.0 ) ), () => {

package/examples/jsm/objects/Water2Mesh.js

@@ -5,7 +5,7 @@ import {
 	Vector3,
 	NodeMaterial,
 	NodeUpdateType,
-	TempNode
+	Node
 } from 'three/webgpu';
 
 import { Fn, vec2, viewportSafeUV, viewportSharedTexture, reflector, pow, float, abs, texture, uniform, vec4, cameraPosition, positionWorld, uv, mix, vec3, normalize, max, dot, screenUV } from 'three/tsl';
@@ -56,7 +56,7 @@ class WaterMesh extends Mesh {
 
 }
 
-class WaterNode extends TempNode {
+class WaterNode extends Node {
 
 	constructor( options, waterBody ) {
 

package/examples/jsm/physics/RapierPhysics.js

@@ -1,6 +1,6 @@
 import { Timer, Vector3, Quaternion, Matrix4 } from 'three';
 
-const RAPIER_PATH = 'https://cdn.skypack.dev/@dimforge/rapier3d-compat@0.17.3';
+const RAPIER_PATH = 'https://cdn.jsdelivr.net/npm/@dimforge/rapier3d-compat@0.21.0/dist/rapier.mjs';
 
 const frameRate = 60;
 
@@ -321,7 +321,7 @@ async function RapierPhysics() {
 
 		timer.update();
 
-		world.timestep = timer.getDelta();
+		world.timestep = Math.min( timer.getDelta(), 1 / 30 );
 		world.step();
 
 		//