Implements approach agreed to here: mrdoob#10691 Support Substance Oc…

…clusionRoughnessMetallic maps.
bhouston · Feb 1, 2017 · 602a981 · 602a981
1 parent a4e4b18
commit 602a981
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/renderers/shaders/ShaderChunk/aomap_fragment.glsl b/src/renderers/shaders/ShaderChunk/aomap_fragment.glsl
@@ -1,5 +1,6 @@
 #ifdef USE_AOMAP
 
+	// reads channel R, intended to be used with a combined OcclusionRoughnessMetallic (RGB) texture
 	float ambientOcclusion = ( texture2D( aoMap, vUv2 ).r - 1.0 ) * aoMapIntensity + 1.0;
 
 	reflectedLight.indirectDiffuse *= ambientOcclusion;

diff --git a/src/renderers/shaders/ShaderChunk/metalnessmap_fragment.glsl b/src/renderers/shaders/ShaderChunk/metalnessmap_fragment.glsl
@@ -3,6 +3,8 @@ float metalnessFactor = metalness;
 #ifdef USE_METALNESSMAP
 
 	vec4 texelMetalness = texture2D( metalnessMap, vUv );
-	metalnessFactor *= texelMetalness.r;
+
+	// reads channel B, intended to be used with a combined OcclusionRoughnessMetallic (RGB) texture
+	metalnessFactor *= texelMetalness.b;
 
 #endif
diff --git a/src/renderers/shaders/ShaderChunk/roughnessmap_fragment.glsl b/src/renderers/shaders/ShaderChunk/roughnessmap_fragment.glsl
@@ -3,6 +3,8 @@ float roughnessFactor = roughness;
 #ifdef USE_ROUGHNESSMAP
 
 	vec4 texelRoughness = texture2D( roughnessMap, vUv );
-	roughnessFactor *= texelRoughness.r;
+
+	// reads channel G, intended to be used with a combined OcclusionRoughnessMetallic (RGB) texture
+	roughnessFactor *= texelRoughness.g;
 
 #endif