Merge pull request #8128 from AnalyticalGraphicsInc/unlit

Don't apply tonemapping for unlit material

Author: Omar Shehata

Source/Scene/processPbrMaterials.js

@@ -534,11 +534,21 @@ define([
             '    return vec4(linearOut, srgbIn.a);\n' +
             '}\n\n';
 
+        fragmentShader +=
+            'vec3 applyTonemapping(vec3 linearIn) \n' +
+            '{\n' +
+            '#ifndef HDR \n' +
+            '    return czm_acesTonemapping(linearIn);\n' +
+            '#else \n' +
+            '    return linearIn;\n' +
+            '#endif \n' +
+            '}\n\n';
+
         fragmentShader +=
             'vec3 LINEARtoSRGB(vec3 linearIn) \n' +
             '{\n' +
             '#ifndef HDR \n' +
-            '    return pow(czm_acesTonemapping(linearIn), vec3(1.0/2.2));\n' +
+            '    return pow(linearIn, vec3(1.0/2.2));\n' +
             '#else \n' +
             '    return linearIn;\n' +
             '#endif \n' +
@@ -845,8 +855,12 @@ define([
             }
         }
 
-        // Final color
+        if (!isUnlit) {
+            fragmentShader += '    color = applyTonemapping(color);\n';
+        }
+
         fragmentShader += '    color = LINEARtoSRGB(color);\n';
+
         if (defined(alphaMode)) {
             if (alphaMode === 'MASK') {
                 fragmentShader += '    if (baseColorWithAlpha.a < u_alphaCutoff) {\n';

Specs/Scene/ModelSpec.js

@@ -1026,7 +1026,7 @@ defineSuite([
                 scene : scene,
                 time : JulianDate.fromDate(new Date('January 1, 2014 12:00:00 UTC'))
             }).toRenderAndCall(function(rgba) {
-                expect(rgba).toEqualEpsilon([193, 17, 16, 255], 5); // Red
+                expect(rgba).toEqualEpsilon([174, 6, 5, 255], 5); // Red
             });
 
             primitives.remove(m);