提交 0ff805ff 编写于 作者: K Kai Salmen

#9756 Updated to WWOBJLoader2 V1.1.0:

Adjusted to removal of MultiMaterial
上级 75de261d
......@@ -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 {
......
......@@ -6,7 +6,7 @@
'use strict';
if ( THREE.OBJLoader2 === undefined ) { THREE.OBJLoader2 = {} }
THREE.OBJLoader2.version = '1.0.6';
THREE.OBJLoader2.version = '1.1.0';
/**
* Use this class to load OBJ data from files or to parse OBJ data from arraybuffer or text
......@@ -965,7 +965,7 @@ THREE.OBJLoader2 = (function () {
}
if ( ! normalBA ) bufferGeometry.computeVertexNormals();
if ( createMultiMaterial ) material = new THREE.MultiMaterial( materials );
if ( createMultiMaterial ) material = materials;
var mesh = new THREE.Mesh( bufferGeometry, material );
this.sceneGraphBaseNode.add( mesh );
......
......@@ -6,7 +6,7 @@
'use strict';
if ( THREE.OBJLoader2 === undefined ) { THREE.OBJLoader2 = {} }
THREE.OBJLoader2.version = '1.0.6';
THREE.OBJLoader2.version = '1.1.0';
/**
* OBJ data will be loaded by dynamically created web worker.
......@@ -416,10 +416,9 @@ THREE.OBJLoader2.WWOBJLoader2 = (function () {
if ( createMultiMaterial ) multiMaterials.push( material );
}
if ( createMultiMaterial ) {
material = new THREE.MultiMaterial( multiMaterials );
material = multiMaterials;
var materialGroups = payload.materialGroups;
var materialGroup;
for ( var key in materialGroups ) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册