|
@@ -424,7 +424,7 @@ ColladaExporter.prototype = {
|
|
|
|
|
|
(
|
|
|
type !== 'constant' ?
|
|
|
- '<diffuse>' +
|
|
|
+ '<diffuse>' +
|
|
|
|
|
|
(
|
|
|
m.map ?
|
|
@@ -432,12 +432,12 @@ ColladaExporter.prototype = {
|
|
|
`<color sid="diffuse">${ diffuse.r } ${ diffuse.g } ${ diffuse.b } 1</color>`
|
|
|
) +
|
|
|
'</diffuse>'
|
|
|
- : ''
|
|
|
+ : ''
|
|
|
) +
|
|
|
|
|
|
(
|
|
|
type === 'phong' ?
|
|
|
- `<specular><color sid="specular">${ specular.r } ${ specular.g } ${ specular.b } 1</color></specular>` +
|
|
|
+ `<specular><color sid="specular">${ specular.r } ${ specular.g } ${ specular.b } 1</color></specular>` +
|
|
|
|
|
|
'<shininess>' +
|
|
|
|
|
@@ -448,7 +448,7 @@ ColladaExporter.prototype = {
|
|
|
) +
|
|
|
|
|
|
'</shininess>'
|
|
|
- : ''
|
|
|
+ : ''
|
|
|
) +
|
|
|
|
|
|
`<reflective><color>${ diffuse.r } ${ diffuse.g } ${ diffuse.b } 1</color></reflective>` +
|
|
@@ -537,9 +537,13 @@ ColladaExporter.prototype = {
|
|
|
var mat = o.material || new MeshBasicMaterial();
|
|
|
var materials = Array.isArray( mat ) ? mat : [ mat ];
|
|
|
if ( geometry.groups.length > materials.length ) {
|
|
|
+
|
|
|
matidsArray = new Array( geometry.groups.length );
|
|
|
+
|
|
|
} else {
|
|
|
- matidsArray = new Array( materials.length )
|
|
|
+
|
|
|
+ matidsArray = new Array( materials.length );
|
|
|
+
|
|
|
}
|
|
|
matids = matidsArray.fill()
|
|
|
.map( ( v, i ) => processMaterial( materials[ i % materials.length ] ) );
|