@cesium/engine 10.1.0 → 11.0.0

package/Source/Shaders/GlobeFS.js

@@ -50,7 +50,7 @@ uniform vec4 u_colorsToAlpha[TEXTURE_UNITS];\n\
 uniform vec4 u_dayTextureTexCoordsRectangle[TEXTURE_UNITS];\n\
 #endif\n\
 \n\
-#ifdef SHOW_REFLECTIVE_OCEAN\n\
+#if defined(HAS_WATER_MASK) && (defined(SHOW_REFLECTIVE_OCEAN) || defined(APPLY_MATERIAL))\n\
 uniform sampler2D u_waterMask;\n\
 uniform vec4 u_waterMaskTranslationAndScale;\n\
 uniform float u_zoomedOutOceanSpecularIntensity;\n\
@@ -363,7 +363,7 @@ void main()\n\
     float fade = 0.0;\n\
 #endif\n\
 \n\
-#ifdef SHOW_REFLECTIVE_OCEAN\n\
+#if defined(HAS_WATER_MASK) && (defined(SHOW_REFLECTIVE_OCEAN) || defined(APPLY_MATERIAL))\n\
     vec2 waterMaskTranslation = u_waterMaskTranslationAndScale.xy;\n\
     vec2 waterMaskScale = u_waterMaskTranslationAndScale.zw;\n\
     vec2 waterMaskTextureCoordinates = v_textureCoordinates.xy * waterMaskScale + waterMaskTranslation;\n\
@@ -371,6 +371,7 @@ void main()\n\
 \n\
     float mask = texture(u_waterMask, waterMaskTextureCoordinates).r;\n\
 \n\
+    #ifdef SHOW_REFLECTIVE_OCEAN\n\
     if (mask > 0.0)\n\
     {\n\
         mat3 enuToEye = czm_eastNorthUpToEyeCoordinates(v_positionMC, normalEC);\n\
@@ -382,6 +383,7 @@ void main()\n\
 \n\
         color = computeWaterColor(v_positionEC, textureCoordinates, enuToEye, color, mask, fade);\n\
     }\n\
+    #endif\n\
 #endif\n\
 \n\
 #ifdef APPLY_MATERIAL\n\
@@ -393,6 +395,10 @@ void main()\n\
     materialInput.slope = v_slope;\n\
     materialInput.height = v_height;\n\
     materialInput.aspect = v_aspect;\n\
+    #ifdef HAS_WATER_MASK\n\
+        materialInput.waterMask = mask;\n\
+    #endif\n\
+\n\
     czm_material material = czm_getMaterial(materialInput);\n\
     vec4 materialColor = vec4(material.diffuse, material.alpha);\n\
     color = alphaBlend(materialColor, color);\n\
@@ -423,7 +429,7 @@ void main()\n\
 #ifdef ENABLE_CLIPPING_POLYGONS\n\
     vec2 clippingPosition = v_clippingPosition;\n\
     int regionIndex = v_regionIndex;\n\
-    clipPolygons(u_clippingDistance, CLIPPING_POLYGON_REGIONS_LENGTH, clippingPosition, regionIndex);    \n\
+    clipPolygons(u_clippingDistance, CLIPPING_POLYGON_REGIONS_LENGTH, clippingPosition, regionIndex);\n\
 #endif\n\
 \n\
 #ifdef HIGHLIGHT_FILL_TILE\n\
@@ -490,7 +496,7 @@ void main()\n\
             #endif\n\
 \n\
             #ifndef HDR\n\
-                fogColor.rgb = czm_acesTonemapping(fogColor.rgb);\n\
+                fogColor.rgb = czm_pbrNeutralTonemapping(fogColor.rgb);\n\
                 fogColor.rgb = czm_inverseGamma(fogColor.rgb);\n\
             #endif\n\
 \n\

package/Source/Shaders/Materials/WaterMaskMaterial.glsl

@@ -0,0 +1,15 @@
+uniform vec4 waterColor;
+uniform vec4 landColor;
+
+czm_material czm_getMaterial(czm_materialInput materialInput)
+{
+    czm_material material = czm_getDefaultMaterial(materialInput);
+
+    vec4 outColor = mix(landColor, waterColor, materialInput.waterMask);
+    outColor = czm_gammaCorrect(outColor);
+
+    material.diffuse = outColor.rgb;
+    material.alpha = outColor.a;
+
+    return material;
+}

package/Source/Shaders/Materials/WaterMaskMaterial.js

@@ -0,0 +1,17 @@
+//This file is automatically rebuilt by the Cesium build process.
+export default "uniform vec4 waterColor;\n\
+uniform vec4 landColor;\n\
+\n\
+czm_material czm_getMaterial(czm_materialInput materialInput)\n\
+{\n\
+    czm_material material = czm_getDefaultMaterial(materialInput);\n\
+\n\
+    vec4 outColor = mix(landColor, waterColor, materialInput.waterMask);\n\
+    outColor = czm_gammaCorrect(outColor);\n\
+\n\
+    material.diffuse = outColor.rgb;\n\
+    material.alpha = outColor.a;\n\
+\n\
+    return material;\n\
+}\n\
+";

package/Source/Shaders/Model/AtmosphereStageFS.glsl

@@ -52,7 +52,7 @@ void applyFog(inout vec4 color, vec4 groundAtmosphereColor, vec3 lightDirection,
 
     // Tonemap if HDR rendering is disabled
     #ifndef HDR
-        fogColor.rgb = czm_acesTonemapping(fogColor.rgb);
+        fogColor.rgb = czm_pbrNeutralTonemapping(fogColor.rgb);
         fogColor.rgb = czm_inverseGamma(fogColor.rgb);
     #endif
 

package/Source/Shaders/Model/AtmosphereStageFS.js

@@ -53,7 +53,7 @@ void applyFog(inout vec4 color, vec4 groundAtmosphereColor, vec3 lightDirection,
 \n\
     // Tonemap if HDR rendering is disabled\n\
     #ifndef HDR\n\
-        fogColor.rgb = czm_acesTonemapping(fogColor.rgb);\n\
+        fogColor.rgb = czm_pbrNeutralTonemapping(fogColor.rgb);\n\
         fogColor.rgb = czm_inverseGamma(fogColor.rgb);\n\
     #endif\n\
 \n\

package/Source/Shaders/Model/ImageBasedLightingStageFS.glsl

@@ -152,7 +152,7 @@ float getSunLuminance(vec3 positionWC, vec3 normalEC, vec3 lightDirectionEC)
 }
 
 #ifdef DIFFUSE_IBL
-vec3 computeDiffuseIBL(vec3 cubeDir)
+vec3 sampleDiffuseEnvironment(vec3 cubeDir)
 {
     #ifdef CUSTOM_SPHERICAL_HARMONICS
         return czm_sphericalHarmonics(cubeDir, model_sphericalHarmonicCoefficients); 
@@ -166,13 +166,11 @@ vec3 computeDiffuseIBL(vec3 cubeDir)
 vec3 sampleSpecularEnvironment(vec3 cubeDir, float roughness)
 {
     #ifdef CUSTOM_SPECULAR_IBL
-        float maxLod = model_specularEnvironmentMapsMaximumLOD;
-        float lod = roughness * maxLod;
-        return czm_sampleOctahedralProjection(model_specularEnvironmentMaps, model_specularEnvironmentMapsSize, cubeDir, lod, maxLod);
+        float lod = roughness * model_specularEnvironmentMapsMaximumLOD;
+        return czm_textureCube(model_specularEnvironmentMaps, cubeDir, lod).rgb;
     #else
-        float maxLod = czm_specularEnvironmentMapsMaximumLOD;
-        float lod = roughness * maxLod;
-        return czm_sampleOctahedralProjection(czm_specularEnvironmentMaps, czm_specularEnvironmentMapSize, cubeDir, lod, maxLod);
+        float lod = roughness * czm_specularEnvironmentMapsMaximumLOD;
+        return czm_textureCube(czm_specularEnvironmentMaps, cubeDir, lod).rgb;
     #endif
 }
 vec3 computeSpecularIBL(vec3 cubeDir, float NdotV, vec3 f0, float roughness)
@@ -191,25 +189,43 @@ vec3 computeSpecularIBL(vec3 cubeDir, float NdotV, vec3 f0, float roughness)
 
 #if defined(DIFFUSE_IBL) || defined(SPECULAR_IBL)
 /**
- * Compute the light contributions from environment maps and spherical harmonic coefficients
+ * Compute the light contributions from environment maps and spherical harmonic coefficients.
+ * See Fdez-Aguera, https://www.jcgt.org/published/0008/01/03/paper.pdf, for explanation
+ * of the single- and multi-scattering terms.
  *
- * @param {vec3} viewDirectionEC Unit vector pointing from the fragment to the eye position
- * @param {vec3} normalEC The surface normal in eye coordinates
- * @param {vec3} lightDirectionEC Unit vector pointing to the light source in eye coordinates.
+ * @param {vec3} viewDirectionEC Unit vector pointing from the fragment to the eye position.
+ * @param {vec3} normalEC The surface normal in eye coordinates.
  * @param {czm_modelMaterial} The material properties.
- * @return {vec3} The computed HDR color
+ * @return {vec3} The computed HDR color.
  */
-vec3 textureIBL(
-    vec3 viewDirectionEC,
-    vec3 normalEC,
-    vec3 lightDirectionEC,
-    czm_modelMaterial material
-) {
+vec3 textureIBL(vec3 viewDirectionEC, vec3 normalEC, czm_modelMaterial material) {
+    vec3 f0 = material.specular;
+    float roughness = material.roughness;
+    float specularWeight = 1.0;
+    #ifdef USE_SPECULAR
+        specularWeight = material.specularWeight;
+    #endif
+    float NdotV = clamp(dot(normalEC, viewDirectionEC), 0.0, 1.0);
+
+    // see https://bruop.github.io/ibl/ at Single Scattering Results
+    // Roughness dependent fresnel, from Fdez-Aguera
+    vec3 f90 = max(vec3(1.0 - roughness), f0);
+    vec3 singleScatterFresnel = fresnelSchlick2(f0, f90, NdotV);
+
+    vec2 brdfLut = texture(czm_brdfLut, vec2(NdotV, roughness)).rg;
+    vec3 FssEss = specularWeight * (singleScatterFresnel * brdfLut.x + brdfLut.y);
+
     #ifdef DIFFUSE_IBL
         vec3 normalMC = normalize(model_iblReferenceFrameMatrix * normalEC);
-        vec3 diffuseContribution = computeDiffuseIBL(normalMC) * material.diffuse;
+        vec3 irradiance = sampleDiffuseEnvironment(normalMC);
+
+        vec3 averageFresnel = f0 + (1.0 - f0) / 21.0;
+        float Ems = specularWeight * (1.0 - brdfLut.x - brdfLut.y);
+        vec3 FmsEms = FssEss * averageFresnel * Ems / (1.0 - averageFresnel * Ems);
+        vec3 dielectricScattering = (1.0 - FssEss - FmsEms) * material.diffuse;
+        vec3 diffuseContribution = irradiance * (FmsEms + dielectricScattering);
     #else
-        vec3 diffuseContribution = vec3(0.0); 
+        vec3 diffuseContribution = vec3(0.0);
     #endif
 
     #ifdef USE_ANISOTROPY
@@ -217,7 +233,7 @@ vec3 textureIBL(
         vec3 anisotropyDirection = material.anisotropicB;
         vec3 anisotropicTangent = cross(anisotropyDirection, viewDirectionEC);
         vec3 anisotropicNormal = cross(anisotropicTangent, anisotropyDirection);
-        float bendFactor = 1.0 - material.anisotropyStrength * (1.0 - material.roughness);
+        float bendFactor = 1.0 - material.anisotropyStrength * (1.0 - roughness);
         float bendFactorPow4 = bendFactor * bendFactor * bendFactor * bendFactor;
         vec3 bentNormal = normalize(mix(anisotropicNormal, normalEC, bendFactorPow4));
         vec3 reflectEC = reflect(-viewDirectionEC, bentNormal);
@@ -227,15 +243,10 @@ vec3 textureIBL(
 
     #ifdef SPECULAR_IBL
         vec3 reflectMC = normalize(model_iblReferenceFrameMatrix * reflectEC);
-        float NdotV = clamp(dot(normalEC, viewDirectionEC), 0.0, 1.0);
-        vec3 f0 = material.specular;
-        vec3 specularContribution = computeSpecularIBL(reflectMC, NdotV, f0, material.roughness);
+        vec3 radiance = sampleSpecularEnvironment(reflectMC, roughness);
+        vec3 specularContribution = radiance * FssEss;
     #else
-        vec3 specularContribution = vec3(0.0); 
-    #endif
-
-    #ifdef USE_SPECULAR
-        specularContribution *= material.specularWeight;
+        vec3 specularContribution = vec3(0.0);
     #endif
 
     return diffuseContribution + specularContribution;

package/Source/Shaders/Model/ImageBasedLightingStageFS.js

@@ -153,7 +153,7 @@ float getSunLuminance(vec3 positionWC, vec3 normalEC, vec3 lightDirectionEC)\n\
 }\n\
 \n\
 #ifdef DIFFUSE_IBL\n\
-vec3 computeDiffuseIBL(vec3 cubeDir)\n\
+vec3 sampleDiffuseEnvironment(vec3 cubeDir)\n\
 {\n\
     #ifdef CUSTOM_SPHERICAL_HARMONICS\n\
         return czm_sphericalHarmonics(cubeDir, model_sphericalHarmonicCoefficients); \n\
@@ -167,13 +167,11 @@ vec3 computeDiffuseIBL(vec3 cubeDir)\n\
 vec3 sampleSpecularEnvironment(vec3 cubeDir, float roughness)\n\
 {\n\
     #ifdef CUSTOM_SPECULAR_IBL\n\
-        float maxLod = model_specularEnvironmentMapsMaximumLOD;\n\
-        float lod = roughness * maxLod;\n\
-        return czm_sampleOctahedralProjection(model_specularEnvironmentMaps, model_specularEnvironmentMapsSize, cubeDir, lod, maxLod);\n\
+        float lod = roughness * model_specularEnvironmentMapsMaximumLOD;\n\
+        return czm_textureCube(model_specularEnvironmentMaps, cubeDir, lod).rgb;\n\
     #else\n\
-        float maxLod = czm_specularEnvironmentMapsMaximumLOD;\n\
-        float lod = roughness * maxLod;\n\
-        return czm_sampleOctahedralProjection(czm_specularEnvironmentMaps, czm_specularEnvironmentMapSize, cubeDir, lod, maxLod);\n\
+        float lod = roughness * czm_specularEnvironmentMapsMaximumLOD;\n\
+        return czm_textureCube(czm_specularEnvironmentMaps, cubeDir, lod).rgb;\n\
     #endif\n\
 }\n\
 vec3 computeSpecularIBL(vec3 cubeDir, float NdotV, vec3 f0, float roughness)\n\
@@ -192,25 +190,43 @@ vec3 computeSpecularIBL(vec3 cubeDir, float NdotV, vec3 f0, float roughness)\n\
 \n\
 #if defined(DIFFUSE_IBL) || defined(SPECULAR_IBL)\n\
 /**\n\
- * Compute the light contributions from environment maps and spherical harmonic coefficients\n\
+ * Compute the light contributions from environment maps and spherical harmonic coefficients.\n\
+ * See Fdez-Aguera, https://www.jcgt.org/published/0008/01/03/paper.pdf, for explanation\n\
+ * of the single- and multi-scattering terms.\n\
  *\n\
- * @param {vec3} viewDirectionEC Unit vector pointing from the fragment to the eye position\n\
- * @param {vec3} normalEC The surface normal in eye coordinates\n\
- * @param {vec3} lightDirectionEC Unit vector pointing to the light source in eye coordinates.\n\
+ * @param {vec3} viewDirectionEC Unit vector pointing from the fragment to the eye position.\n\
+ * @param {vec3} normalEC The surface normal in eye coordinates.\n\
  * @param {czm_modelMaterial} The material properties.\n\
- * @return {vec3} The computed HDR color\n\
+ * @return {vec3} The computed HDR color.\n\
  */\n\
-vec3 textureIBL(\n\
-    vec3 viewDirectionEC,\n\
-    vec3 normalEC,\n\
-    vec3 lightDirectionEC,\n\
-    czm_modelMaterial material\n\
-) {\n\
+vec3 textureIBL(vec3 viewDirectionEC, vec3 normalEC, czm_modelMaterial material) {\n\
+    vec3 f0 = material.specular;\n\
+    float roughness = material.roughness;\n\
+    float specularWeight = 1.0;\n\
+    #ifdef USE_SPECULAR\n\
+        specularWeight = material.specularWeight;\n\
+    #endif\n\
+    float NdotV = clamp(dot(normalEC, viewDirectionEC), 0.0, 1.0);\n\
+\n\
+    // see https://bruop.github.io/ibl/ at Single Scattering Results\n\
+    // Roughness dependent fresnel, from Fdez-Aguera\n\
+    vec3 f90 = max(vec3(1.0 - roughness), f0);\n\
+    vec3 singleScatterFresnel = fresnelSchlick2(f0, f90, NdotV);\n\
+\n\
+    vec2 brdfLut = texture(czm_brdfLut, vec2(NdotV, roughness)).rg;\n\
+    vec3 FssEss = specularWeight * (singleScatterFresnel * brdfLut.x + brdfLut.y);\n\
+\n\
     #ifdef DIFFUSE_IBL\n\
         vec3 normalMC = normalize(model_iblReferenceFrameMatrix * normalEC);\n\
-        vec3 diffuseContribution = computeDiffuseIBL(normalMC) * material.diffuse;\n\
+        vec3 irradiance = sampleDiffuseEnvironment(normalMC);\n\
+\n\
+        vec3 averageFresnel = f0 + (1.0 - f0) / 21.0;\n\
+        float Ems = specularWeight * (1.0 - brdfLut.x - brdfLut.y);\n\
+        vec3 FmsEms = FssEss * averageFresnel * Ems / (1.0 - averageFresnel * Ems);\n\
+        vec3 dielectricScattering = (1.0 - FssEss - FmsEms) * material.diffuse;\n\
+        vec3 diffuseContribution = irradiance * (FmsEms + dielectricScattering);\n\
     #else\n\
-        vec3 diffuseContribution = vec3(0.0); \n\
+        vec3 diffuseContribution = vec3(0.0);\n\
     #endif\n\
 \n\
     #ifdef USE_ANISOTROPY\n\
@@ -218,7 +234,7 @@ vec3 textureIBL(\n\
         vec3 anisotropyDirection = material.anisotropicB;\n\
         vec3 anisotropicTangent = cross(anisotropyDirection, viewDirectionEC);\n\
         vec3 anisotropicNormal = cross(anisotropicTangent, anisotropyDirection);\n\
-        float bendFactor = 1.0 - material.anisotropyStrength * (1.0 - material.roughness);\n\
+        float bendFactor = 1.0 - material.anisotropyStrength * (1.0 - roughness);\n\
         float bendFactorPow4 = bendFactor * bendFactor * bendFactor * bendFactor;\n\
         vec3 bentNormal = normalize(mix(anisotropicNormal, normalEC, bendFactorPow4));\n\
         vec3 reflectEC = reflect(-viewDirectionEC, bentNormal);\n\
@@ -228,15 +244,10 @@ vec3 textureIBL(\n\
 \n\
     #ifdef SPECULAR_IBL\n\
         vec3 reflectMC = normalize(model_iblReferenceFrameMatrix * reflectEC);\n\
-        float NdotV = clamp(dot(normalEC, viewDirectionEC), 0.0, 1.0);\n\
-        vec3 f0 = material.specular;\n\
-        vec3 specularContribution = computeSpecularIBL(reflectMC, NdotV, f0, material.roughness);\n\
+        vec3 radiance = sampleSpecularEnvironment(reflectMC, roughness);\n\
+        vec3 specularContribution = radiance * FssEss;\n\
     #else\n\
-        vec3 specularContribution = vec3(0.0); \n\
-    #endif\n\
-\n\
-    #ifdef USE_SPECULAR\n\
-        specularContribution *= material.specularWeight;\n\
+        vec3 specularContribution = vec3(0.0);\n\
     #endif\n\
 \n\
     return diffuseContribution + specularContribution;\n\

package/Source/Shaders/Model/LightingStageFS.glsl

@@ -4,7 +4,7 @@ vec3 computeIBL(vec3 position, vec3 normal, vec3 lightDirection, vec3 lightColor
     #if defined(DIFFUSE_IBL) || defined(SPECULAR_IBL)
         // Environment maps were provided, use them for IBL
         vec3 viewDirection = -normalize(position);
-        vec3 iblColor = textureIBL(viewDirection, normal, lightDirection, material);
+        vec3 iblColor = textureIBL(viewDirection, normal, material);
     #else
         // Use procedural IBL if there are no environment maps
         vec3 imageBasedLighting = proceduralIBL(position, normal, lightDirection, material);
@@ -120,7 +120,7 @@ void lightingStage(inout czm_modelMaterial material, ProcessedAttributes attribu
         // tonemapping. However, if HDR is not enabled, we must tonemap else large
         // values may be clamped to 1.0
         #ifndef HDR
-            color = czm_acesTonemapping(color);
+            color = czm_pbrNeutralTonemapping(color);
         #endif
     #else // unlit
         vec3 color = material.diffuse;

package/Source/Shaders/Model/LightingStageFS.js

@@ -5,7 +5,7 @@ vec3 computeIBL(vec3 position, vec3 normal, vec3 lightDirection, vec3 lightColor
     #if defined(DIFFUSE_IBL) || defined(SPECULAR_IBL)\n\
         // Environment maps were provided, use them for IBL\n\
         vec3 viewDirection = -normalize(position);\n\
-        vec3 iblColor = textureIBL(viewDirection, normal, lightDirection, material);\n\
+        vec3 iblColor = textureIBL(viewDirection, normal, material);\n\
     #else\n\
         // Use procedural IBL if there are no environment maps\n\
         vec3 imageBasedLighting = proceduralIBL(position, normal, lightDirection, material);\n\
@@ -121,7 +121,7 @@ void lightingStage(inout czm_modelMaterial material, ProcessedAttributes attribu
         // tonemapping. However, if HDR is not enabled, we must tonemap else large\n\
         // values may be clamped to 1.0\n\
         #ifndef HDR\n\
-            color = czm_acesTonemapping(color);\n\
+            color = czm_pbrNeutralTonemapping(color);\n\
         #endif\n\
     #else // unlit\n\
         vec3 color = material.diffuse;\n\

package/Source/Shaders/PostProcessStages/AcesTonemappingStage.glsl

@@ -4,6 +4,8 @@ in vec2 v_textureCoordinates;
 
 #ifdef AUTO_EXPOSURE
 uniform sampler2D autoExposure;
+#else
+uniform float exposure;
 #endif
 
 void main()
@@ -13,6 +15,8 @@ void main()
 
 #ifdef AUTO_EXPOSURE
     color /= texture(autoExposure, vec2(0.5)).r;
+#else
+    color *= vec3(exposure);
 #endif
     color = czm_acesTonemapping(color);
     color = czm_inverseGamma(color);

package/Source/Shaders/PostProcessStages/AcesTonemappingStage.js

@@ -5,6 +5,8 @@ in vec2 v_textureCoordinates;\n\
 \n\
 #ifdef AUTO_EXPOSURE\n\
 uniform sampler2D autoExposure;\n\
+#else\n\
+uniform float exposure;\n\
 #endif\n\
 \n\
 void main()\n\
@@ -14,6 +16,8 @@ void main()\n\
 \n\
 #ifdef AUTO_EXPOSURE\n\
     color /= texture(autoExposure, vec2(0.5)).r;\n\
+#else\n\
+    color *= vec3(exposure);\n\
 #endif\n\
     color = czm_acesTonemapping(color);\n\
     color = czm_inverseGamma(color);\n\

package/Source/Shaders/PostProcessStages/FilmicTonemapping.glsl

@@ -4,6 +4,8 @@ in vec2 v_textureCoordinates;
 
 #ifdef AUTO_EXPOSURE
 uniform sampler2D autoExposure;
+#else
+uniform float exposure;
 #endif
 
 // See slides 142 and 143:
@@ -17,6 +19,8 @@ void main()
 #ifdef AUTO_EXPOSURE
     float exposure = texture(autoExposure, vec2(0.5)).r;
     color /= exposure;
+#else
+    color *= vec3(exposure);
 #endif
 
 	const float A = 0.22; // shoulder strength

package/Source/Shaders/PostProcessStages/FilmicTonemapping.js

@@ -5,6 +5,8 @@ in vec2 v_textureCoordinates;\n\
 \n\
 #ifdef AUTO_EXPOSURE\n\
 uniform sampler2D autoExposure;\n\
+#else\n\
+uniform float exposure;\n\
 #endif\n\
 \n\
 // See slides 142 and 143:\n\
@@ -18,6 +20,8 @@ void main()\n\
 #ifdef AUTO_EXPOSURE\n\
     float exposure = texture(autoExposure, vec2(0.5)).r;\n\
     color /= exposure;\n\
+#else\n\
+    color *= vec3(exposure);\n\
 #endif\n\
 \n\
 	const float A = 0.22; // shoulder strength\n\

package/Source/Shaders/PostProcessStages/ModifiedReinhardTonemapping.glsl

@@ -5,6 +5,8 @@ in vec2 v_textureCoordinates;
 
 #ifdef AUTO_EXPOSURE
 uniform sampler2D autoExposure;
+#else
+uniform float exposure;
 #endif
 
 // See equation 4:
@@ -17,6 +19,8 @@ void main()
 #ifdef AUTO_EXPOSURE
     float exposure = texture(autoExposure, vec2(0.5)).r;
     color /= exposure;
+#else
+    color *= vec3(exposure);
 #endif
     color = (color * (1.0 + color / white)) / (1.0 + color);
     color = czm_inverseGamma(color);

package/Source/Shaders/PostProcessStages/ModifiedReinhardTonemapping.js

@@ -6,6 +6,8 @@ in vec2 v_textureCoordinates;\n\
 \n\
 #ifdef AUTO_EXPOSURE\n\
 uniform sampler2D autoExposure;\n\
+#else\n\
+uniform float exposure;\n\
 #endif\n\
 \n\
 // See equation 4:\n\
@@ -18,6 +20,8 @@ void main()\n\
 #ifdef AUTO_EXPOSURE\n\
     float exposure = texture(autoExposure, vec2(0.5)).r;\n\
     color /= exposure;\n\
+#else\n\
+    color *= vec3(exposure);\n\
 #endif\n\
     color = (color * (1.0 + color / white)) / (1.0 + color);\n\
     color = czm_inverseGamma(color);\n\

package/Source/Shaders/PostProcessStages/PbrNeutralTonemapping.glsl

@@ -0,0 +1,25 @@
+uniform sampler2D colorTexture;
+
+in vec2 v_textureCoordinates;
+
+#ifdef AUTO_EXPOSURE
+uniform sampler2D autoExposure;
+#else
+uniform float exposure;
+#endif
+
+void main()
+{
+    vec4 fragmentColor = texture(colorTexture, v_textureCoordinates);
+    vec3 color = fragmentColor.rgb;
+
+#ifdef AUTO_EXPOSURE
+    color /= texture(autoExposure, vec2(0.5)).r;
+#else
+    color *= vec3(exposure);
+#endif
+    color = czm_pbrNeutralTonemapping(color);
+    color = czm_inverseGamma(color);
+
+    out_FragColor = vec4(color, fragmentColor.a);
+}

package/Source/Shaders/PostProcessStages/PbrNeutralTonemapping.js

@@ -0,0 +1,27 @@
+//This file is automatically rebuilt by the Cesium build process.
+export default "uniform sampler2D colorTexture;\n\
+\n\
+in vec2 v_textureCoordinates;\n\
+\n\
+#ifdef AUTO_EXPOSURE\n\
+uniform sampler2D autoExposure;\n\
+#else\n\
+uniform float exposure;\n\
+#endif\n\
+\n\
+void main()\n\
+{\n\
+    vec4 fragmentColor = texture(colorTexture, v_textureCoordinates);\n\
+    vec3 color = fragmentColor.rgb;\n\
+\n\
+#ifdef AUTO_EXPOSURE\n\
+    color /= texture(autoExposure, vec2(0.5)).r;\n\
+#else\n\
+    color *= vec3(exposure);\n\
+#endif\n\
+    color = czm_pbrNeutralTonemapping(color);\n\
+    color = czm_inverseGamma(color);\n\
+\n\
+    out_FragColor = vec4(color, fragmentColor.a);\n\
+}\n\
+";

package/Source/Shaders/PostProcessStages/ReinhardTonemapping.glsl

@@ -4,6 +4,8 @@ in vec2 v_textureCoordinates;
 
 #ifdef AUTO_EXPOSURE
 uniform sampler2D autoExposure;
+#else
+uniform float exposure;
 #endif
 
 // See equation 3:
@@ -16,6 +18,8 @@ void main()
 #ifdef AUTO_EXPOSURE
     float exposure = texture(autoExposure, vec2(0.5)).r;
     color /= exposure;
+#else
+    color *= vec3(exposure);
 #endif
     color = color / (1.0 + color);
     color = czm_inverseGamma(color);

package/Source/Shaders/PostProcessStages/ReinhardTonemapping.js

@@ -5,6 +5,8 @@ in vec2 v_textureCoordinates;\n\
 \n\
 #ifdef AUTO_EXPOSURE\n\
 uniform sampler2D autoExposure;\n\
+#else\n\
+uniform float exposure;\n\
 #endif\n\
 \n\
 // See equation 3:\n\
@@ -17,6 +19,8 @@ void main()\n\
 #ifdef AUTO_EXPOSURE\n\
     float exposure = texture(autoExposure, vec2(0.5)).r;\n\
     color /= exposure;\n\
+#else\n\
+    color *= vec3(exposure);\n\
 #endif\n\
     color = color / (1.0 + color);\n\
     color = czm_inverseGamma(color);\n\

package/Source/Shaders/SkyAtmosphereFS.glsl

@@ -38,7 +38,7 @@ void main (void)
     vec4 color = computeAtmosphereColor(v_outerPositionWC, lightDirection, rayleighColor, mieColor, opacity);
 
     #ifndef HDR
-        color.rgb = czm_acesTonemapping(color.rgb);
+        color.rgb = czm_pbrNeutralTonemapping(color.rgb);
         color.rgb = czm_inverseGamma(color.rgb);
     #endif
 

package/Source/Shaders/SkyAtmosphereFS.js

@@ -39,7 +39,7 @@ void main (void)\n\
     vec4 color = computeAtmosphereColor(v_outerPositionWC, lightDirection, rayleighColor, mieColor, opacity);\n\
 \n\
     #ifndef HDR\n\
-        color.rgb = czm_acesTonemapping(color.rgb);\n\
+        color.rgb = czm_pbrNeutralTonemapping(color.rgb);\n\
         color.rgb = czm_inverseGamma(color.rgb);\n\
     #endif\n\
 \n\

package/Source/Widget/CesiumWidget.js

@@ -143,7 +143,7 @@ function configureCameraFrustum(widget) {
  * @param {boolean} [options.blurActiveElementOnCanvasFocus=true] If true, the active element will blur when the viewer's canvas is clicked. Setting this to false is useful for cases when the canvas is clicked only for retrieving position or an entity data without actually meaning to set the canvas to be the active element.
  * @param {boolean} [options.requestRenderMode=false] If true, rendering a frame will only occur when needed as determined by changes within the scene. Enabling improves performance of the application, but requires using {@link Scene#requestRender} to render a new frame explicitly in this mode. This will be necessary in many cases after making changes to the scene in other parts of the API. See {@link https://cesium.com/blog/2018/01/24/cesium-scene-rendering-performance/|Improving Performance with Explicit Rendering}.
  * @param {number} [options.maximumRenderTimeChange=0.0] If requestRenderMode is true, this value defines the maximum change in simulation time allowed before a render is requested. See {@link https://cesium.com/blog/2018/01/24/cesium-scene-rendering-performance/|Improving Performance with Explicit Rendering}.
- * @param {number} [options.msaaSamples=1] If provided, this value controls the rate of multisample antialiasing. Typical multisampling rates are 2, 4, and sometimes 8 samples per pixel. Higher sampling rates of MSAA may impact performance in exchange for improved visual quality. This value only applies to WebGL2 contexts that support multisample render targets.
+ * @param {number} [options.msaaSamples=4] If provided, this value controls the rate of multisample antialiasing. Typical multisampling rates are 2, 4, and sometimes 8 samples per pixel. Higher sampling rates of MSAA may impact performance in exchange for improved visual quality. This value only applies to WebGL2 contexts that support multisample render targets. Set to 1 to disable MSAA.
  *
  * @exception {DeveloperError} Element with id "container" does not exist in the document.
  *