OBJLoader2 V2.3.0:

#28 Parser Validation. Parser now is one single class: THREE.LoaderSupport.Parser.Obj. This way existing constructor and usage of OBJLoader2 is kept. Simplified code, fixed bugs missing 'g' statements) and introduced obj_obj2 verification examples with gulpfile to re-create verify.obj.
#31 Worker code still works when mangling is used during minification. Needed to remove Consts.
#32 THREE.LoaderSupport.ConsoleLogger: Allow to pass additional arguments to error, warn, info and debug

Fixed CRLF issues. Now all files has unix line-endings

Author: kaisalmen

docs/examples/loaders/LoaderSupport.html

@@ -107,6 +107,7 @@ var files = {
 		"webgl_loader_nodes",
 		"webgl_loader_obj",
 		"webgl_loader_obj_mtl",
+		"webgl_loader_obj_obj2_verify",
 		"webgl_loader_obj2",
 		"webgl_loader_obj2_meshspray",
 		"webgl_loader_obj2_options",

examples/files.js

@@ -93,39 +93,52 @@ THREE.LoaderSupport.ConsoleLogger = (function () {
 	 * @memberOf THREE.LoaderSupport.ConsoleLogger
 	 *
 	 * @param {string} message Message to log
+	 * @param {string[]} additional Array of strings containing additional content to be logged
+	 *
 	 */
-	ConsoleLogger.prototype.logDebug = function ( message ) {
-		if ( this.enabled && this.debug ) console.info( message );
+	ConsoleLogger.prototype.logDebug = function ( message, additional ) {
+		if ( this.enabled && this.debug ) {
+
+			this._createStatement( message, 'Additional content:', additional, function ( output ) { console.debug( output ) } );
+
+		}
 	};
 
 	/**
 	 * Log an info message if enabled.
 	 * @memberOf THREE.LoaderSupport.ConsoleLogger
 	 *
 	 * @param {string} message Message to log
+	 * @param {string[]} additional Array of strings containing additional content to be logged
 	 */
-	ConsoleLogger.prototype.logInfo = function ( message ) {
-		if ( this.enabled ) console.info( message );
+	ConsoleLogger.prototype.logInfo = function ( message, additional ) {
+		if ( this.enabled ) {
+
+			this._createStatement( message, 'Additional content:', additional, function ( output ) { console.info( output ) } );
+
+		}
 	};
 
 	/**
 	 * Log a warn message (always).
 	 * @memberOf THREE.LoaderSupport.ConsoleLogger
 	 *
 	 * @param {string} message Message to log
+	 * @param {string[]} additional Array of strings containing additional content to be logged
 	 */
-	ConsoleLogger.prototype.logWarn = function ( message ) {
-		console.warn( message );
+	ConsoleLogger.prototype.logWarn = function ( message, additional ) {
+		this._createStatement( message, 'Additional content:', additional, function ( output ) { console.warn( output ) } );
 	};
 
 	/**
 	 * Log an error message (always).
 	 * @memberOf THREE.LoaderSupport.ConsoleLogger
 	 *
 	 * @param {string} message Message to log
+	 * @param {string[]} additional Array of strings containing additional content to be logged
 	 */
-	ConsoleLogger.prototype.logError = function ( message ) {
-		console.error( message );
+	ConsoleLogger.prototype.logError = function ( message, additional ) {
+		this._createStatement( message, 'Additional content:', additional, function ( output ) { console.error( output ) } );
 	};
 
 	/**
@@ -148,6 +161,16 @@ THREE.LoaderSupport.ConsoleLogger = (function () {
 		if ( this.enabled ) console.timeEnd( id );
 	};
 
+	ConsoleLogger.prototype._createStatement = function ( message, addHeader, additional, logFunction ) {
+		var output = message;
+		if ( Array.isArray( additional ) ) {
+
+			output += '\n' + addHeader + '\n' + additional.join( '\n' );
+
+		}
+		logFunction( output );
+	};
+
 	return ConsoleLogger;
 })();
 
@@ -428,6 +451,10 @@ THREE.LoaderSupport.PrepData = (function () {
 	return PrepData;
 })();
 
+THREE.LoaderSupport.Parser = {
+	Obj: null
+};
+
 /**
  * Builds one or many THREE.Mesh from one raw set of Arraybuffers, materialGroup descriptions and further parameters.
  * Supports vertex, vertexColor, normal, uv and index buffers.
@@ -989,7 +1016,7 @@ THREE.LoaderSupport.WorkerRunnerRefImpl = (function () {
  */
 THREE.LoaderSupport.WorkerSupport = (function () {
 
-	var WORKER_SUPPORT_VERSION = '2.0.1';
+	var WORKER_SUPPORT_VERSION = '2.1.2';
 
 	var Validator = THREE.LoaderSupport.Validator;
 
@@ -1159,11 +1186,12 @@ THREE.LoaderSupport.WorkerSupport = (function () {
 	 * @memberOf THREE.LoaderSupport.WorkerSupport
 	 *
 	 * @param {Function} functionCodeBuilder Function that is invoked with funcBuildObject and funcBuildSingelton that allows stringification of objects and singletons.
+	 * @param {String} parserName Name of the Parser object
 	 * @param {String[]} libLocations URL of libraries that shall be added to worker code relative to libPath
 	 * @param {String} libPath Base path used for loading libraries
 	 * @param {THREE.LoaderSupport.WorkerRunnerRefImpl} runnerImpl The default worker parser wrapper implementation (communication and execution). An extended class could be passed here.
 	 */
-	WorkerSupport.prototype.validate = function ( functionCodeBuilder, libLocations, libPath, runnerImpl ) {
+	WorkerSupport.prototype.validate = function ( functionCodeBuilder, parserName, libLocations, libPath, runnerImpl ) {
 		if ( Validator.isValid( this.loaderWorker.worker ) ) return;
 
 		this.logger.logInfo( 'WorkerSupport: Building worker code...' );
@@ -1181,7 +1209,8 @@ THREE.LoaderSupport.WorkerSupport = (function () {
 		}
 
 		var userWorkerCode = functionCodeBuilder( buildObject, buildSingelton );
-		userWorkerCode += buildSingelton( runnerImpl.name, runnerImpl.name, runnerImpl );
+		userWorkerCode += 'var Parser = '+ parserName + ';\n\n';
+		userWorkerCode += buildSingelton( runnerImpl.name, runnerImpl );
 		userWorkerCode += 'new ' + runnerImpl.name + '();\n\n';
 
 		var scope = this;
@@ -1282,10 +1311,9 @@ THREE.LoaderSupport.WorkerSupport = (function () {
 		return objectString;
 	};
 
-	var buildSingelton = function ( fullName, internalName, object ) {
+	var buildSingelton = function ( fullName, object ) {
 		var objectString = fullName + ' = (function () {\n\n';
 		objectString += '\t' + object.prototype.constructor.toString() + '\n\n';
-		objectString = objectString.replace( object.name, internalName );
 
 		var funcString;
 		var objectPart;
@@ -1295,12 +1323,12 @@ THREE.LoaderSupport.WorkerSupport = (function () {
 			if ( typeof objectPart === 'function' ) {
 
 				funcString = objectPart.toString();
-				objectString += '\t' + internalName + '.prototype.' + name + ' = ' + funcString + ';\n\n';
+				objectString += '\t' + object.name + '.prototype.' + name + ' = ' + funcString + ';\n\n';
 
 			}
 
 		}
-		objectString += '\treturn ' + internalName + ';\n';
+		objectString += '\treturn ' + object.name + ';\n';
 		objectString += '})();\n\n';
 
 		return objectString;