Returning conversion warnings in 3DMLoader

examples/jsm/loaders/3DMLoader.js

@@ -46,6 +46,7 @@ class Rhino3dmLoader extends Loader {
 		this.workerConfig = {};
 
 		this.materials = [];
+		this.warnings = [];
 
 	}
 
@@ -89,7 +90,7 @@ class Rhino3dmLoader extends Loader {
 
 			this.decodeObjects( buffer, url )
 				.then( onLoad )
-				.catch( onError );
+				.catch( e => onError( e ) );
 
 		}, onProgress, onError );
 
@@ -121,12 +122,22 @@ class Rhino3dmLoader extends Loader {
 
 					worker.postMessage( { type: 'decode', id: taskID, buffer }, [ buffer ] );
 
-					//this.debug();
+					// this.debug();
 
 				} );
 
 			} )
-			.then( ( message ) => this._createGeometry( message.data ) );
+			.then( ( message ) => {
+
+				const geometry = this._createGeometry( message.data );
+				geometry.warnings = warnings;
+				return geometry;
+
+			} ).catch( e => {
+
+				throw e;
+
+			} );
 
 		// Remove task from the task list.
 		// Note: replaced '.finally()' with '.catch().then()' block - iOS 11 support (#19416)
@@ -160,7 +171,7 @@ class Rhino3dmLoader extends Loader {
 
 		this.decodeObjects( data, '' )
 			.then( onLoad )
-			.catch( onError );
+			.catch( e => onError( e ) );
 
 	}
 
@@ -332,7 +343,7 @@ class Rhino3dmLoader extends Loader {
 
 					} else {
 
-						const material = this._createMaterial( );
+						const material = this._createMaterial();
 						_object = this._createObject( obj, material );
 
 					}
@@ -615,7 +626,7 @@ class Rhino3dmLoader extends Loader {
 
 				} else if ( geometry.isLinearLight ) {
 
-					console.warn( 'THREE.3DMLoader:  No conversion exists for linear lights.' );
+					self.postMessage( { type: 'warning', id: taskID, message: 'THREE.3DMLoader:  No conversion exists for linear lights.' } );
 
 					return;
 
@@ -709,6 +720,10 @@ class Rhino3dmLoader extends Loader {
 
 					switch ( message.type ) {
 
+						case 'warning':
+							this.warnings.push( message )
+							break;
+
 						case 'decode':
 							worker._callbacks[ message.id ].resolve( message );
 							break;
@@ -777,6 +792,7 @@ function Rhino3dmWorker() {
 	let libraryPending;
 	let libraryConfig;
 	let rhino;
+	let taskID;
 
 	onmessage = function ( e ) {
 
@@ -786,6 +802,7 @@ function Rhino3dmWorker() {
 
 			case 'init':
 
+				console.log(message)
 				libraryConfig = message.libraryConfig;
 				const wasmBinary = libraryConfig.wasmBinary;
 				let RhinoModule;
@@ -806,12 +823,20 @@ function Rhino3dmWorker() {
 
 			case 'decode':
 
+				taskID = message.id;
 				const buffer = message.buffer;
 				libraryPending.then( () => {
 
-					const data = decodeObjects( rhino, buffer );
+					try {
+
+						const data = decodeObjects( rhino, buffer, message.id );
+						self.postMessage( { type: 'decode', id: message.id, data } );
 
-					self.postMessage( { type: 'decode', id: message.id, data } );
+					} catch ( error ) {
+
+						self.postMessage( { type: 'error', id: message.id, error } );
+
+					}
 
 				} );
 
@@ -927,7 +952,7 @@ function Rhino3dmWorker() {
 
 					} else {
 
-						console.warn( `THREE.3DMLoader: Image for ${textureType} texture not embedded in file.` );
+						self.postMessage( { type: 'warning', id: taskID, message:`THREE.3DMLoader: Image for ${textureType} texture not embedded in file.` } );
 						texture.image = null;
 
 					}
@@ -1223,7 +1248,9 @@ function Rhino3dmWorker() {
 				*/
 
 			default:
-				console.warn( `THREE.3DMLoader: TODO: Implement ${objectType.constructor.name}` );
+
+				self.postMessage( { type: 'warning', id: taskID, message:`THREE.3DMLoader: TODO: Implement ${objectType.constructor.name}` } );
+
 				break;
 
 		}
@@ -1260,7 +1287,7 @@ function Rhino3dmWorker() {
 
 		} else {
 
-			console.warn( `THREE.3DMLoader: ${objectType.constructor.name} has no associated mesh geometry.` );
+			self.postMessage( { type: 'warning', id: taskID, message:`THREE.3DMLoader: ${objectType.constructor.name} has no associated mesh geometry.`  } );
 
 		}
 

examples/webgl_loader_3dm.html

@@ -76,7 +76,7 @@
 					// hide spinner
 					document.getElementById( 'loader' ).style.display = 'none';
 
-				} );
+				}, progress =>progress, error => ( console.log( error ) ) );
 
 				controls = new OrbitControls( camera, renderer.domElement );