@gnsx/three 0.185.15 → 0.186.0

package/examples/jsm/loaders/materialx/parse/MaterialXParser.js

@@ -0,0 +1,28 @@
+function parseMaterialXNodeTree( nodeXML, createNode, addNode, nodePath = '' ) {
+
+	const materialXNode = createNode( nodeXML, nodePath );
+	if ( materialXNode.nodePath ) {
+
+		addNode( materialXNode );
+
+	}
+
+	for ( const childNodeXML of nodeXML.children ) {
+
+		const childMXNode = parseMaterialXNodeTree( childNodeXML, createNode, addNode, materialXNode.nodePath );
+		materialXNode.add( childMXNode );
+
+	}
+
+	return materialXNode;
+
+}
+
+function parseMaterialXText( text, createNode, addNode ) {
+
+	const rootXML = new DOMParser().parseFromString( text, 'application/xml' ).documentElement;
+	return parseMaterialXNodeTree( rootXML, createNode, addNode );
+
+}
+
+export { parseMaterialXNodeTree, parseMaterialXText };

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

@@ -2,6 +2,8 @@
 const DEF_MATCH_REGEX = /^def\s+(?:(\w+)\s+)?"?([^"]+)"?$/;
 const VARIANT_STRING_REGEX = /^string\s+(\w+)$/;
 const ATTR_MATCH_REGEX = /^(?:uniform\s+)?(\w+(?:\[\])?)\s+(.+)$/;
+// Preserve metadata blocks without changing the legacy parseText value shape.
+const VALUE_METADATA = Symbol( 'valueMetadata' );
 
 // Spec types (must match USDCParser/USDComposer)
 const SpecType = {
@@ -55,10 +57,12 @@ class USDAParser {
 
 					// see #28631
 
-					const values = rhs.slice( 0, - 1 );
+					const values = rhs.slice( 0, - 1 ).trim();
 					target[ lhs ] = values;
 
 					const meta = {};
+					if ( target[ VALUE_METADATA ] === undefined ) target[ VALUE_METADATA ] = {};
+					target[ VALUE_METADATA ][ lhs ] = meta;
 					stack.push( meta );
 
 					target = meta;
@@ -621,9 +625,18 @@ class USDAParser {
 				const relName = key.slice( 4 );
 				const relPath = path + '.' + relName;
 				const target = data[ key ].replace( /[<>]/g, '' );
+				const metadata = data[ VALUE_METADATA ]?.[ key ];
+				const fields = { targetPaths: [ target ] };
+
+				if ( metadata?.bindMaterialAs !== undefined ) {
+
+					fields.bindMaterialAs = this._parseString( String( metadata.bindMaterialAs ).trim() );
+
+				}
+
 				specsByPath[ relPath ] = {
 					specType: SpecType.Relationship,
-					fields: { targetPaths: [ target ] }
+					fields
 				};
 				continue;
 

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

@@ -656,10 +656,7 @@ class USDCParser {
 		const reader = this.reader;
 		reader.seek( section.start );
 
-		// Strings section has an 8-byte count prefix, but string indices stored
-		// elsewhere in the file are relative to the section start (not the data).
-		// So we read the entire section as uint32 values to maintain correct indexing.
-		const numStrings = Math.floor( section.size / 4 );
+		const numStrings = reader.readUint64();
 		this.strings = [];
 
 		for ( let i = 0; i < numStrings; i ++ ) {

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

@@ -1081,6 +1081,47 @@ class USDComposer {
 
 	}
 
+	/**
+	 * Resolve an attribute's authored value, following connections before using
+	 * local fallback values.
+	 */
+	_resolveAttributeValue( path, visited = new Set() ) {
+
+		const cleanPath = String( path ).replace( /<|>/g, '' );
+		if ( visited.has( cleanPath ) ) return undefined;
+
+		const fields = this.specsByPath[ cleanPath ]?.fields;
+		if ( ! fields ) return undefined;
+
+		const nextVisited = new Set( visited );
+		nextVisited.add( cleanPath );
+
+		if ( fields.connectionPaths ) {
+
+			for ( const connectionPath of fields.connectionPaths ) {
+
+				const value = this._resolveAttributeValue( connectionPath, nextVisited );
+				if ( value !== undefined ) return value;
+
+			}
+
+		}
+
+		if ( fields.default !== undefined ) return fields.default;
+
+		const { times, values } = fields.timeSamples || {};
+		if ( times && values && times.length > 0 ) {
+
+			// Find time 0, or use the first available time (rest pose).
+			const index = times.indexOf( 0 );
+			return values[ index >= 0 ? index : 0 ];
+
+		}
+
+		return undefined;
+
+	}
+
 	/**
 	 * Get attributes for a path from attribute specs.
 	 */
@@ -1141,21 +1182,10 @@ class USDComposer {
 
 		for ( const [ attrName, attrSpec ] of attrMap ) {
 
-			if ( attrSpec.fields?.default !== undefined ) {
+			const value = this._resolveAttributeValue( path + '.' + attrName );
+			if ( value !== undefined ) {
 
-				attrs[ attrName ] = attrSpec.fields.default;
-
-			} else if ( attrSpec.fields?.timeSamples ) {
-
-				// For animated attributes without default, use the first time sample (rest pose)
-				const { times, values } = attrSpec.fields.timeSamples;
-				if ( times && values && times.length > 0 ) {
-
-					// Find time 0, or use the first available time
-					const idx = times.indexOf( 0 );
-					attrs[ attrName ] = idx >= 0 ? values[ idx ] : values[ 0 ];
-
-				}
+				attrs[ attrName ] = value;
 
 			}
 
@@ -1634,22 +1664,16 @@ class USDComposer {
 	}
 
 	/**
-	 * Get material binding target path, checking variant paths if needed.
+	 * Get the material binding relationship for a prim, including overrides from
+	 * active variants.
 	 */
-	_getMaterialBindingTarget( primPath ) {
+	_getMaterialBindingSpec( primPath ) {
 
 		const attrName = 'material:binding';
-
-		// First check direct path
 		const directPath = primPath + '.' + attrName;
-		const directSpec = this.specsByPath[ directPath ];
-		if ( directSpec?.fields?.targetPaths?.length > 0 ) {
+		let bindingSpec = this.specsByPath[ directPath ] || null;
 
-			return directSpec.fields.targetPaths[ 0 ];
-
-		}
-
-		// Check variant paths at ancestor levels
+		// A variant on any ancestor may override this prim's relationship.
 		const parts = primPath.split( '/' );
 		for ( let i = 1; i < parts.length; i ++ ) {
 
@@ -1664,7 +1688,7 @@ class USDComposer {
 
 				if ( overrideSpec?.fields?.targetPaths?.length > 0 ) {
 
-					return overrideSpec.fields.targetPaths[ 0 ];
+					bindingSpec = overrideSpec;
 
 				}
 
@@ -1672,7 +1696,35 @@ class USDComposer {
 
 		}
 
-		return null;
+		return bindingSpec;
+
+	}
+
+	/**
+	 * Get the resolved material binding target for a prim. Material bindings are
+	 * inherited, and an ancestor marked strongerThanDescendants takes precedence
+	 * over bindings authored on its descendants.
+	 */
+	_getMaterialBindingTarget( primPath ) {
+
+		const parts = primPath.split( '/' ).filter( Boolean );
+		let resolvedBinding = null;
+
+		for ( let i = 0; i < parts.length; i ++ ) {
+
+			const ancestorPath = '/' + parts.slice( 0, i + 1 ).join( '/' );
+			const bindingSpec = this._getMaterialBindingSpec( ancestorPath );
+			if ( ! bindingSpec?.fields?.targetPaths?.length ) continue;
+
+			if ( ! resolvedBinding || resolvedBinding.fields?.bindMaterialAs !== 'strongerThanDescendants' ) {
+
+				resolvedBinding = bindingSpec;
+
+			}
+
+		}
+
+		return resolvedBinding?.fields.targetPaths[ 0 ] || null;
 
 	}
 
@@ -2917,21 +2969,7 @@ class USDComposer {
 	 */
 	_applyMaterialBinding( mesh, primPath ) {
 
-		// Look for material:binding on this prim
-		const bindingPath = primPath + '.material:binding';
-		const bindingSpec = this.specsByPath[ bindingPath ];
-
-		if ( ! bindingSpec ) return;
-
-		let materialPath = null;
-		const targetPaths = bindingSpec.fields?.targetPaths || bindingSpec.fields?.default;
-
-		if ( targetPaths ) {
-
-			materialPath = Array.isArray( targetPaths ) ? targetPaths[ 0 ] : targetPaths;
-
-		}
-
+		let materialPath = this._getMaterialBindingTarget( primPath );
 		if ( ! materialPath ) return;
 
 		// Clean the material path

package/examples/jsm/materials/WoodNodeMaterial.js

@@ -99,112 +99,10 @@ const softLightMix = TSL.Fn( ( [ t, col1, col2 ] ) => {
 
 } );
 
-const noiseFbm = TSL.Fn( ( [ p, detail, roughness, lacunarity, useNormalize ] ) => {
+// single-octave normalized noise — equivalent to fbm with detail = 1
 
-	const fscale = TSL.float( 1.0 ).toVar();
-	const amp = TSL.float( 1.0 ).toVar();
-	const maxamp = TSL.float( 0.0 ).toVar();
-	const sum = TSL.float( 0.0 ).toVar();
-
-	const iterations = detail.floor();
-
-	TSL.Loop( iterations, () => {
-
-		const t = TSL.mx_noise_float( p.mul( fscale ) );
-		sum.addAssign( t.mul( amp ) );
-		maxamp.addAssign( amp );
-		amp.mulAssign( roughness );
-		fscale.mulAssign( lacunarity );
-
-	} );
-
-	const rmd = detail.sub( iterations );
-	const hasRemainder = rmd.greaterThan( 0.001 );
-
-	return TSL.select(
-		hasRemainder,
-		TSL.select(
-			useNormalize.equal( 1 ),
-			( () => {
-
-				const t = TSL.mx_noise_float( p.mul( fscale ) );
-				const sum2 = sum.add( t.mul( amp ) );
-				const maxamp2 = maxamp.add( amp );
-				const normalizedSum = sum.div( maxamp ).mul( 0.5 ).add( 0.5 );
-				const normalizedSum2 = sum2.div( maxamp2 ).mul( 0.5 ).add( 0.5 );
-				return TSL.mix( normalizedSum, normalizedSum2, rmd );
-
-			} )(),
-			( () => {
-
-				const t = TSL.mx_noise_float( p.mul( fscale ) );
-				const sum2 = sum.add( t.mul( amp ) );
-				return TSL.mix( sum, sum2, rmd );
-
-			} )()
-		),
-		TSL.select(
-			useNormalize.equal( 1 ),
-			sum.div( maxamp ).mul( 0.5 ).add( 0.5 ),
-			sum
-		)
-	);
-
-} );
-
-const noiseFbm3d = TSL.Fn( ( [ p, detail, roughness, lacunarity, useNormalize ] ) => {
-
-	const fscale = TSL.float( 1.0 ).toVar();
-
-	const amp = TSL.float( 1.0 ).toVar();
-	const maxamp = TSL.float( 0.0 ).toVar();
-	const sum = TSL.vec3( 0.0 ).toVar();
-
-	const iterations = detail.floor();
-
-	TSL.Loop( iterations, () => {
-
-		const t = TSL.mx_noise_vec3( p.mul( fscale ) );
-		sum.addAssign( t.mul( amp ) );
-		maxamp.addAssign( amp );
-		amp.mulAssign( roughness );
-		fscale.mulAssign( lacunarity );
-
-	} );
-
-	const rmd = detail.sub( iterations );
-	const hasRemainder = rmd.greaterThan( 0.001 );
-
-	return TSL.select(
-		hasRemainder,
-		TSL.select(
-			useNormalize.equal( 1 ),
-			( () => {
-
-				const t = TSL.mx_noise_vec3( p.mul( fscale ) );
-				const sum2 = sum.add( t.mul( amp ) );
-				const maxamp2 = maxamp.add( amp );
-				const normalizedSum = sum.div( maxamp ).mul( 0.5 ).add( 0.5 );
-				const normalizedSum2 = sum2.div( maxamp2 ).mul( 0.5 ).add( 0.5 );
-				return TSL.mix( normalizedSum, normalizedSum2, rmd );
-
-			} )(),
-			( () => {
-
-				const t = TSL.mx_noise_vec3( p.mul( fscale ) );
-				const sum2 = sum.add( t.mul( amp ) );
-				return TSL.mix( sum, sum2, rmd );
-
-			} )()
-		),
-		TSL.select(
-			useNormalize.equal( 1 ),
-			sum.div( maxamp ).mul( 0.5 ).add( 0.5 ),
-			sum
-		)
-	);
-
-} );
+const noise1Norm = TSL.Fn( ( [ p ] ) => TSL.mx_noise_float( p ).mul( 0.5 ).add( 0.5 ) );
+const noise3Norm = TSL.Fn( ( [ p ] ) => TSL.mx_noise_vec3( p ).mul( 0.5 ).add( 0.5 ) );
 
 const woodCenter = TSL.Fn( ( [ p, centerSize ] ) => {
 
@@ -218,7 +116,7 @@ const woodCenter = TSL.Fn( ( [ p, centerSize ] ) => {
 const spaceWarp = TSL.Fn( ( [ p, warpStrength, xyScale, zScale ] ) => {
 
 	const combinedXyz = TSL.vec3( xyScale, xyScale, zScale ).mul( p );
-	const noise = noiseFbm3d( combinedXyz.mul( 1.6 * 1.5 ), TSL.float( 1 ), TSL.float( 0.5 ), TSL.float( 2 ), TSL.int( 1 ) ).sub( 0.5 ).mul( warpStrength );
+	const noise = noise3Norm( combinedXyz.mul( 1.6 * 1.5 ) ).sub( 0.5 ).mul( warpStrength );
 	const pXy = p.mul( TSL.vec3( 1, 1, 0 ) );
 	const normalizedXy = pXy.normalize();
 	const warp = noise.mul( normalizedXy ).add( pXy );
@@ -229,7 +127,7 @@ const spaceWarp = TSL.Fn( ( [ p, warpStrength, xyScale, zScale ] ) => {
 
 const woodRings = TSL.Fn( ( [ w, ringThickness, ringBias, ringSizeVariance, ringVarianceScale, barkThickness ] ) => {
 
-	const rings = noiseFbm( w.mul( ringVarianceScale ), TSL.float( 1 ), TSL.float( 0.5 ), TSL.float( 1 ), TSL.int( 1 ) ).mul( ringSizeVariance ).add( w ).mul( ringThickness ).fract().mul( barkThickness );
+	const rings = noise1Norm( w.mul( ringVarianceScale ) ).mul( ringSizeVariance ).add( w ).mul( ringThickness ).fract().mul( barkThickness );
 
 	const sharpRings = TSL.min( mapRange( rings, 0, ringBias, 0, 1, TSL.bool( true ) ), mapRange( rings, ringBias, 1, 1, 0, TSL.bool( true ) ) );
 
@@ -246,7 +144,7 @@ const woodDetail = TSL.Fn( ( [ warp, p, y, splotchScale ] ) => {
 	const combinedXyz = TSL.vec3( radialCoords.sin(), y, radialCoords.cos().mul( p.z ) );
 	const scaled = TSL.vec3( 0.1, 1.19, 0.05 ).mul( combinedXyz );
 
-	return noiseFbm( scaled.mul( splotchScale ), TSL.float( 1 ), TSL.float( 0.5 ), TSL.float( 2 ), TSL.bool( true ) );
+	return noise1Norm( scaled.mul( splotchScale ) );
 
 } );
 

package/examples/jsm/misc/RollerCoaster.js

@@ -223,7 +223,7 @@ class RollerCoasterGeometry extends BufferGeometry {
 
 			let headingChange = Math.atan2( sample2.x, sample2.z ) - Math.atan2( sample1.x, sample1.z );
 			if ( headingChange > Math.PI ) headingChange -= Math.PI * 2;
-			if ( headingChange < -Math.PI ) headingChange += Math.PI * 2;
+			if ( headingChange < - Math.PI ) headingChange += Math.PI * 2;
 
 			quaternion.premultiply( rollQuaternion.setFromAxisAngle( forward, - Math.atan( headingChange * 8 ) * 0.5 ) );
 
@@ -398,7 +398,7 @@ class RollerCoasterLiftersGeometry extends BufferGeometry {
 
 			let headingChange = Math.atan2( sample2.x, sample2.z ) - Math.atan2( sample1.x, sample1.z );
 			if ( headingChange > Math.PI ) headingChange -= Math.PI * 2;
-			if ( headingChange < -Math.PI ) headingChange += Math.PI * 2;
+			if ( headingChange < - Math.PI ) headingChange += Math.PI * 2;
 
 			bankedQuaternion.copy( quaternion );
 			rollQuaternion.setFromAxisAngle( tangent, - Math.atan( headingChange * 8 ) * 0.5 );

package/examples/jsm/misc/SculptGL.LICENSE.txt

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 Stéphane GINIER
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.