@needle-tools/three 0.162.2 → 0.162.4

package/examples/jsm/exporters/GLTFExporter.js

@@ -1290,13 +1290,14 @@ class GLTFWriter {
 
 				if ( ( typeof HTMLImageElement !== 'undefined' && image instanceof HTMLImageElement ) ||
 					( typeof HTMLCanvasElement !== 'undefined' && image instanceof HTMLCanvasElement ) ||
-					( typeof ImageBitmap !== 'undefined' && image instanceof ImageBitmap ) ) {
+					( typeof ImageBitmap !== 'undefined' && image instanceof ImageBitmap ) ||
+					( typeof OffscreenCanvas !== 'undefined' && image instanceof OffscreenCanvas ) ) { 
 
 					ctx.drawImage( image, 0, 0, canvas.width, canvas.height );
 
 				} else {
 
-					throw new Error( 'THREE.GLTFExporter: Invalid image type. Use HTMLImageElement, HTMLCanvasElement or ImageBitmap.' );
+					throw new Error( 'THREE.GLTFExporter: Invalid image type. Use HTMLImageElement, HTMLCanvasElement, ImageBitmap or OffscreenCanvas.' );
 
 				}
 
@@ -1388,6 +1389,18 @@ class GLTFWriter {
 
 		if ( cache.textures.has( map ) ) return cache.textures.get( map );
 
+		const beforeWriteArgs = { keep: true, newTexture: null };
+	
+		this._invokeAll( function ( ext ) {
+
+			ext.beforeWriteTexture && ext.beforeWriteTexture( map, beforeWriteArgs );
+
+		} );
+
+		if ( beforeWriteArgs.keep === false ) return null;
+
+		if ( beforeWriteArgs.newTexture != null ) map = beforeWriteArgs.newTexture;
+
 		if ( ! json.textures ) json.textures = [];
 
 		// make non-readable textures (e.g. CompressedTexture) readable by blitting them into a new texture
@@ -1605,6 +1618,20 @@ class GLTFWriter {
 	 */
 	processMesh( mesh ) {
 
+		const beforeWriteArgs = { keep: true }
+
+		this._invokeAll( function ( ext ) {
+
+			ext.beforeWriteMesh && ext.beforeWriteMesh( mesh, beforeWriteArgs );
+
+		} );
+
+		if ( beforeWriteArgs.keep != true ) { 
+			
+			return null;
+
+		}
+
 		const cache = this.cache;
 		const json = this.json;
 
@@ -2204,6 +2231,20 @@ class GLTFWriter {
 	 */
 	processNode( object ) {
 
+		const beforeWriteArgs = { keep: true }
+
+		this._invokeAll( function ( ext ) {
+
+			ext.beforeWriteNode && ext.beforeWriteNode( object, beforeWriteArgs );
+
+		} );
+
+		if ( beforeWriteArgs.keep != true ) { 
+			
+			return null;
+
+		}
+
 		const json = this.json;
 		const options = this.options;
 		const nodeMap = this.nodeMap;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@needle-tools/three",
-  "version": "0.162.2",
+  "version": "0.162.4",
   "description": "JavaScript 3D library",
   "type": "module",
   "main": "./build/three.cjs",

package/src/animation/PropertyBinding.js

@@ -217,19 +217,23 @@ class PropertyBinding {
 		// search into node subtree.
 		if ( root.children ) {
 
-			const searchNodeSubtree = function ( children ) {
+			const searchNodeSubtree = function ( children, checkByUserDataName ) {
 
 				for ( let i = 0; i < children.length; i ++ ) {
 
 					const childNode = children[ i ];
 
-					if ( childNode.name === nodeName || childNode.uuid === nodeName ) {
+					if ( ! checkByUserDataName && ( childNode.name === nodeName || childNode.uuid === nodeName ) ) {
+
+						return childNode;
+
+					} else if ( checkByUserDataName && childNode.userData && childNode.userData.name === nodeName ) {
 
 						return childNode;
 
 					}
 
-					const result = searchNodeSubtree( childNode.children );
+					const result = searchNodeSubtree( childNode.children, checkByUserDataName );
 
 					if ( result ) return result;
 
@@ -245,6 +249,18 @@ class PropertyBinding {
 
 				return subTreeNode;
 
+			} else {
+
+				// Search again by userData.name, as set by GLTFLoader.
+				// We don't want to do that in a single pass to avoid incorrect matches.
+				const subTreeNode = searchNodeSubtree( root.children, true );
+
+				if ( subTreeNode ) {
+
+					return subTreeNode;
+
+				}
+
 			}
 
 		}