USDZExporter: Only include metalnessMap/roughnessMap when metalness/roughness is 1 (#22201)

mrdoob · web-flow · commit e203359dc86b · 2021-07-28T09:15:24.000+01:00
diff --git a/examples/jsm/exporters/USDZExporter.js b/examples/jsm/exporters/USDZExporter.js
@@ -425,7 +425,7 @@ function buildMaterial( material, textures ) {
 
 	}
 
-	if ( material.roughnessMap !== null ) {
+	if ( material.roughnessMap !== null && material.roughness === 1 ) {
 
 		inputs.push( `${ pad }float inputs:roughness.connect = </Materials/Material_${ material.id }/Texture_${ material.roughnessMap.id }_roughness.outputs:g>` );
 
@@ -437,7 +437,7 @@ function buildMaterial( material, textures ) {
 
 	}
 
-	if ( material.metalnessMap !== null ) {
+	if ( material.metalnessMap !== null && material.metalness === 1 ) {
 
 		inputs.push( `${ pad }float inputs:metallic.connect = </Materials/Material_${ material.id }/Texture_${ material.metalnessMap.id }_metallic.outputs:b>` );
 

Original file line number	Diff line number	Diff line change
`@@ -425,7 +425,7 @@ function buildMaterial( material, textures ) {`
`425`	`425`
`426`	`426`	`}`
`427`	`427`
`428`		`- if ( material.roughnessMap !== null ) {`
	`428`	`+ if ( material.roughnessMap !== null && material.roughness === 1 ) {`
`429`	`429`
`430`	`430`	inputs.push( `${ pad }float inputs:roughness.connect = </Materials/Material_${ material.id }/Texture_${ material.roughnessMap.id }_roughness.outputs:g>` );
`431`	`431`
`@@ -437,7 +437,7 @@ function buildMaterial( material, textures ) {`
`437`	`437`
`438`	`438`	`}`
`439`	`439`
`440`		`- if ( material.metalnessMap !== null ) {`
	`440`	`+ if ( material.metalnessMap !== null && material.metalness === 1 ) {`
`441`	`441`
`442`	`442`	inputs.push( `${ pad }float inputs:metallic.connect = </Materials/Material_${ material.id }/Texture_${ material.metalnessMap.id }_metallic.outputs:b>` );
`443`	`443`