Merge pull request #10631 from kaisalmen/WWOBJLoader2

OBJLoader2 and WWOBJLoader2
mrdoob · Mar 26, 2017 · ff25afe · ff25afe
2 parents 91aa13f + 0ff805f
commit ff25afe
Show file tree

Hide file tree

Showing 7 changed files with 3,419 additions and 2 deletions.
diff --git a/examples/files.js b/examples/files.js
@@ -102,6 +102,9 @@ var files = {
 		"webgl_loader_msgpack",
 		"webgl_loader_obj",
 		"webgl_loader_obj_mtl",
+		"webgl_loader_obj2",
+		"webgl_loader_obj2_ww",
+		"webgl_loader_obj2_ww_parallels",
 		"webgl_loader_nrrd",
 		"webgl_loader_pcd",
 		"webgl_loader_pdb",

diff --git a/examples/js/loaders/OBJLoader.js b/examples/js/loaders/OBJLoader.js
@@ -720,8 +720,7 @@ THREE.OBJLoader.prototype = {
 
 				}
 
-				var multiMaterial = new THREE.MultiMaterial( createdMaterials );
-				mesh = ( ! isLine ? new THREE.Mesh( buffergeometry, multiMaterial ) : new THREE.LineSegments( buffergeometry, multiMaterial ) );
+				mesh = ( ! isLine ? new THREE.Mesh( buffergeometry, createdMaterials ) : new THREE.LineSegments( buffergeometry, createdMaterials ) );
 
 			} else {