home/three.js
2
0
Fork 0
mirror of https://github.com/wahyd4/three.js.git synced 2026-08-09 04:56:01 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'jterrace/master' into dev

Browse Source
This commit is contained in:
Mr.doob
2011-11-20 14:31:38 +01:00
parent 01ac1e3d17 c6b1bd8c34
commit 31abf51900
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/extras/loaders/ColladaLoader.js
+6 -3
View File
@@ -703,6 +703,7 @@ THREE.ColladaLoader = function () {
var instance_materials = instance_geometry.instance_material;
var geometry = geometries[instance_geometry.url];
var used_materials = {};
var used_materials_array = [];
var num_materials = 0;
var first_material;
@@ -728,7 +729,8 @@ THREE.ColladaLoader = function () {
var shader = effects[effect_id].shader;
shader.material.opacity = !shader.material.opacity ? 1 : shader.material.opacity;
used_materials[inst_material.symbol] = shader.material;
used_materials[inst_material.symbol] = num_materials;
used_materials_array.push(shader.material)
first_material = shader.material;
num_materials ++;
@@ -743,11 +745,12 @@ THREE.ColladaLoader = function () {
if ( num_materials > 1 ) {
material = new THREE.MeshFaceMaterial();
geom.materials = used_materials_array;
for ( j = 0; j < geom.faces.length; j ++ ) {
var face = geom.faces[ j ];
face.materials = [ used_materials[ face.daeMaterial ] ];
face.materialIndex = used_materials[ face.daeMaterial ]
}