From e1a2ad2e5ed2f78beb86f0ea95d44cea7089527d Mon Sep 17 00:00:00 2001
From: Daniel Hritzkiv <daniel.hritzkiv@gmail.com>
Date: Mon, 2 Nov 2015 23:02:19 -0500
Subject: [PATCH] Use updated OBJ Loader in OBJ_MTL example

This requires loading the MTL first with an instance of `MTLLoader`, and passing the resulting `materialCreator` to an instance of `OBJLoader`
---
 examples/webgl_loader_obj_mtl.html | 38 ++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/examples/webgl_loader_obj_mtl.html b/examples/webgl_loader_obj_mtl.html
index b646a92df2..aaf2a83f6b 100644
--- a/examples/webgl_loader_obj_mtl.html
+++ b/examples/webgl_loader_obj_mtl.html
@@ -34,7 +34,7 @@
 
 		<script src="js/loaders/DDSLoader.js"></script>
 		<script src="js/loaders/MTLLoader.js"></script>
-		<script src="js/loaders/OBJMTLLoader.js"></script>
+		<script src="js/loaders/OBJLoader.js"></script>
 
 		<script src="js/Detector.js"></script>
 		<script src="js/libs/stats.min.js"></script>
@@ -83,19 +83,31 @@
 					}
 				};
 
-				var onError = function ( xhr ) {
-				};
-
-
+				var onError = function ( xhr ) { };
+				
 				THREE.Loader.Handlers.add( /\.dds$/i, new THREE.DDSLoader() );
-
-				var loader = new THREE.OBJMTLLoader();
-				loader.load( 'obj/male02/male02.obj', 'obj/male02/male02_dds.mtl', function ( object ) {
-
-					object.position.y = - 80;
-					scene.add( object );
-
-				}, onProgress, onError );
+				
+				var objLoader = new THREE.OBJLoader();
+				var mtlLoader = new THREE.MTLLoader(objLoader.manager);
+				
+				var mtlUrl = 'obj/male02/male02_dds.mtl';
+				var objUrl = 'obj/male02/male02.obj';
+				
+				mtlLoader.setBaseUrl( objUrl.substr( 0, objUrl.lastIndexOf( "/" ) + 1 ) );
+				
+				mtlLoader.load( mtlUrl, function( materials ) {
+					
+					materials.preload();
+					objLoader.setMaterials( materials );
+					
+					objLoader.load( objUrl, function ( object ) {
+	
+						object.position.y = - 80;
+						scene.add( object );
+	
+					}, onProgress, onError );
+					
+				});
 
 				//
 
-- 
GitLab