Disable HDR by Default

CHANGES.md

@@ -6,6 +6,9 @@ Change Log
 ##### Additions :tada:
 * Added optional `index` parameter to `PrimitiveCollection.add`. [#8041](https://github.com/AnalyticalGraphicsInc/cesium/pull/8041)
 
+##### Fixes :wrench:
+Disabled HDR by default to improve visual quality in most standard use cases. Set `viewer.scene.highDynamicRange = true` to re-enable it. [#7966](https://github.com/AnalyticalGraphicsInc/cesium/issues/7966)
+
 ### 1.60 - 2019-08-01
 
 ##### Additions :tada:

CONTRIBUTORS.md

@@ -132,7 +132,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
    * [Hannah Pinkos](https://github.com/hpinkos)
    * [Kangning Li](https://github.com/likangning93)
    * [Sean Lilley](https://github.com/lilleyse)
-
+   * [Brandon Barker](https://github.com/ProjectBarks)
 
 ## [Individual CLA](Documentation/Contributors/CLAs/individual-contributor-license-agreement-v1.0.pdf)
 * [Victor Berchet](https://github.com/vicb)

Source/Scene/PostProcessStageLibrary.js

@@ -7,7 +7,7 @@ define([
         '../Core/deprecationWarning',
         '../Core/destroyObject',
         '../Core/Ellipsoid',
-        '../Shaders/PostProcessStages/AcesTonemapping',
+        '../Shaders/PostProcessStages/AcesTonemappingStage',
         '../Shaders/PostProcessStages/AmbientOcclusionGenerate',
         '../Shaders/PostProcessStages/AmbientOcclusionModulate',
         '../Shaders/PostProcessStages/BlackAndWhite',

Source/Scene/Scene.js

@@ -825,7 +825,7 @@ define([
 
         this._hdr = undefined;
         this._hdrDirty = undefined;
-        this.highDynamicRange = true;
+        this.highDynamicRange = false;
         this.gamma = 2.2;
         this._sunColor = new Cartesian3(1.8, 1.85, 2.0);
 

Source/Scene/processPbrMaterials.js

@@ -544,7 +544,7 @@ define([
             'vec3 LINEARtoSRGB(vec3 linearIn) \n' +
             '{\n' +
             '#ifndef HDR \n' +
-            '    return pow(linearIn, vec3(1.0/2.2));\n' +
+            '    return pow(czm_acesTonemapping(linearIn), vec3(1.0/2.2));\n' +
             '#else \n' +
             '    return linearIn;\n' +
             '#endif \n' +
@@ -869,6 +869,7 @@ define([
         } else {
             fragmentShader += '    gl_FragColor = vec4(color, 1.0);\n';
         }
+
         fragmentShader += '}\n';
 
         // Add shaders

Source/Shaders/Builtin/Functions/acesTonemapping.glsl

@@ -0,0 +1,16 @@
+// See:
+//    https://knarkowicz.wordpress.com/2016/01/06/aces-filmic-tone-mapping-curve/
+
+vec3 czm_acesTonemapping(vec3 color) {
+    float g = 0.985;
+    float a = 0.065;
+    float b = 0.0001;
+    float c = 0.433;
+    float d = 0.238;
+
+    color = (color * (color + a) - b) / (color * (g * color + c) + d);
+
+    color = clamp(color, 0.0, 1.0);
+
+    return color;
+}

Source/Shaders/PostProcessStages/AcesTonemapping.glsl → Source/Shaders/PostProcessStages/AcesTonemappingStage.glsl

@@ -6,9 +6,6 @@ varying vec2 v_textureCoordinates;
 uniform sampler2D autoExposure;
 #endif
 
-// See:
-//    https://knarkowicz.wordpress.com/2016/01/06/aces-filmic-tone-mapping-curve/
-
 void main()
 {
     vec4 fragmentColor = texture2D(colorTexture, v_textureCoordinates);
@@ -17,16 +14,8 @@ void main()
 #ifdef AUTO_EXPOSURE
     color /= texture2D(autoExposure, vec2(0.5)).r;
 #endif
-    float g = 0.985;
-
-    float a = 0.065;
-    float b = 0.0001;
-    float c = 0.433;
-    float d = 0.238;
-
-    color = (color * (color + a) - b) / (color * (g * color + c) + d);
-
-    color = clamp(color, 0.0, 1.0);
+    color = czm_acesTonemapping(color);
     color = czm_inverseGamma(color);
+
     gl_FragColor = vec4(color, fragmentColor.a);
 }