Merge pull request #6 from ux3d/fix/ambient_occlusion_order

Apply Ambient Occlusion only to IBL (diffuse part)
KhronosGroup · Nov 5, 2020 · de6f6b4 · de6f6b4
2 parents 87a2574 + f6beb38
commit de6f6b4
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/shaders/pbr.frag b/src/shaders/pbr.frag
@@ -537,6 +537,13 @@ void main()
     #endif
 #endif
 
+    float ao = 1.0;
+    // Apply optional PBR terms for additional (optional) shading
+#ifdef HAS_OCCLUSION_MAP
+    ao = texture(u_OcclusionSampler,  getOcclusionUV()).r;
+    f_diffuse = mix(f_diffuse, f_diffuse * ao, u_OcclusionStrength);
+#endif
+
 #ifdef USE_PUNCTUAL
     for (int i = 0; i < LIGHT_COUNT; ++i)
     {
@@ -645,13 +652,6 @@ void main()
 
     color = (f_emissive + diffuse + f_specular + f_subsurface + (1.0 - reflectance) * f_sheen) * (1.0 - clearcoatFactor * clearcoatFresnel) + f_clearcoat * clearcoatFactor;
 
-    float ao = 1.0;
-    // Apply optional PBR terms for additional (optional) shading
-#ifdef HAS_OCCLUSION_MAP
-    ao = texture(u_OcclusionSampler,  getOcclusionUV()).r;
-    color = mix(color, color * ao, u_OcclusionStrength);
-#endif
-
 #ifndef DEBUG_OUTPUT // no debug
 
 #ifdef ALPHAMODE_MASK