@cesium/engine 10.0.0 → 11.0.0

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);
@@ -34,18 +34,19 @@ vec3 addClearcoatReflection(vec3 baseLayerColor, vec3 position, vec3 lightDirect
 
     // compute specular reflection from direct lighting
     float roughness = material.clearcoatRoughness;
-    float directStrength = computeDirectSpecularStrength(normal, lightDirection, viewDirection, halfwayDirection, roughness);
+    float alphaRoughness = roughness * roughness;
+    float directStrength = computeDirectSpecularStrength(normal, lightDirection, viewDirection, halfwayDirection, alphaRoughness);
     vec3 directReflection = F * directStrength * NdotL;
     vec3 color = lightColorHdr * directReflection;
 
     #ifdef SPECULAR_IBL
         // Find the direction in which to sample the environment map
-        vec3 cubeDir = normalize(model_iblReferenceFrameMatrix * normalize(reflect(-viewDirection, normal)));
-        vec3 iblColor = computeSpecularIBL(cubeDir, NdotV, NdotV, f0, roughness);
+        vec3 reflectMC = normalize(model_iblReferenceFrameMatrix * reflect(-viewDirection, normal));
+        vec3 iblColor = computeSpecularIBL(reflectMC, NdotV, f0, roughness);
         color += iblColor * material.occlusion;
     #elif defined(USE_IBL_LIGHTING)
         vec3 positionWC = vec3(czm_inverseView * vec4(position, 1.0));
-        vec3 reflectionWC = normalize(czm_inverseViewRotation * normalize(reflect(viewDirection, normal)));
+        vec3 reflectionWC = normalize(czm_inverseViewRotation * reflect(viewDirection, normal));
         vec3 skyMetrics = getProceduralSkyMetrics(positionWC, reflectionWC);
 
         vec3 specularIrradiance = getProceduralSpecularIrradiance(reflectionWC, skyMetrics, roughness);
@@ -57,7 +58,7 @@ vec3 addClearcoatReflection(vec3 baseLayerColor, vec3 position, vec3 lightDirect
         #endif
         float maximumComponent = czm_maximumComponent(lightColorHdr);
         vec3 clampedLightColor = lightColorHdr / max(maximumComponent, 1.0);
-        color += clampedLightColor* iblColor * material.occlusion;
+        color += clampedLightColor * iblColor * material.occlusion;
     #endif
 
     float clearcoatFactor = material.clearcoatFactor;
@@ -119,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\
@@ -35,18 +35,19 @@ vec3 addClearcoatReflection(vec3 baseLayerColor, vec3 position, vec3 lightDirect
 \n\
     // compute specular reflection from direct lighting\n\
     float roughness = material.clearcoatRoughness;\n\
-    float directStrength = computeDirectSpecularStrength(normal, lightDirection, viewDirection, halfwayDirection, roughness);\n\
+    float alphaRoughness = roughness * roughness;\n\
+    float directStrength = computeDirectSpecularStrength(normal, lightDirection, viewDirection, halfwayDirection, alphaRoughness);\n\
     vec3 directReflection = F * directStrength * NdotL;\n\
     vec3 color = lightColorHdr * directReflection;\n\
 \n\
     #ifdef SPECULAR_IBL\n\
         // Find the direction in which to sample the environment map\n\
-        vec3 cubeDir = normalize(model_iblReferenceFrameMatrix * normalize(reflect(-viewDirection, normal)));\n\
-        vec3 iblColor = computeSpecularIBL(cubeDir, NdotV, NdotV, f0, roughness);\n\
+        vec3 reflectMC = normalize(model_iblReferenceFrameMatrix * reflect(-viewDirection, normal));\n\
+        vec3 iblColor = computeSpecularIBL(reflectMC, NdotV, f0, roughness);\n\
         color += iblColor * material.occlusion;\n\
     #elif defined(USE_IBL_LIGHTING)\n\
         vec3 positionWC = vec3(czm_inverseView * vec4(position, 1.0));\n\
-        vec3 reflectionWC = normalize(czm_inverseViewRotation * normalize(reflect(viewDirection, normal)));\n\
+        vec3 reflectionWC = normalize(czm_inverseViewRotation * reflect(viewDirection, normal));\n\
         vec3 skyMetrics = getProceduralSkyMetrics(positionWC, reflectionWC);\n\
 \n\
         vec3 specularIrradiance = getProceduralSpecularIrradiance(reflectionWC, skyMetrics, roughness);\n\
@@ -58,7 +59,7 @@ vec3 addClearcoatReflection(vec3 baseLayerColor, vec3 position, vec3 lightDirect
         #endif\n\
         float maximumComponent = czm_maximumComponent(lightColorHdr);\n\
         vec3 clampedLightColor = lightColorHdr / max(maximumComponent, 1.0);\n\
-        color += clampedLightColor* iblColor * material.occlusion;\n\
+        color += clampedLightColor * iblColor * material.occlusion;\n\
     #endif\n\
 \n\
     float clearcoatFactor = material.clearcoatFactor;\n\
@@ -120,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/Model/MaterialStageFS.glsl

@@ -258,8 +258,7 @@ void setSpecularGlossiness(inout czm_modelMaterial material)
     material.specular = specular;
 
     // glossiness is the opposite of roughness, but easier for artists to use.
-    float roughness = 1.0 - glossiness;
-    material.roughness = roughness * roughness;
+    material.roughness = 1.0 - glossiness;
 }
 #elif defined(LIGHTING_PBR)
 float setMetallicRoughness(inout czm_modelMaterial material)
@@ -272,7 +271,7 @@ float setMetallicRoughness(inout czm_modelMaterial material)
 
         vec3 metallicRoughness = texture(u_metallicRoughnessTexture, metallicRoughnessTexCoords).rgb;
         float metalness = clamp(metallicRoughness.b, 0.0, 1.0);
-        float roughness = clamp(metallicRoughness.g, 0.04, 1.0);
+        float roughness = clamp(metallicRoughness.g, 0.0, 1.0);
         #ifdef HAS_METALLIC_FACTOR
             metalness = clamp(metalness * u_metallicFactor, 0.0, 1.0);
         #endif
@@ -288,7 +287,7 @@ float setMetallicRoughness(inout czm_modelMaterial material)
         #endif
 
         #ifdef HAS_ROUGHNESS_FACTOR
-            float roughness = clamp(u_roughnessFactor, 0.04, 1.0);
+            float roughness = clamp(u_roughnessFactor, 0.0, 1.0);
         #else
             float roughness = 1.0;
         #endif
@@ -303,9 +302,8 @@ float setMetallicRoughness(inout czm_modelMaterial material)
     // diffuse only applies to dielectrics.
     material.diffuse = mix(material.baseColor.rgb, vec3(0.0), metalness);
 
-    // roughness is authored as perceptual roughness
-    // square it to get material roughness
-    material.roughness = roughness * roughness;
+    // This is perceptual roughness. The square of this value is used for direct lighting
+    material.roughness = roughness;
 
     return metalness;
 }
@@ -418,9 +416,8 @@ void setClearcoat(inout czm_modelMaterial material, in ProcessedAttributes attri
     #endif
 
     material.clearcoatFactor = clearcoatFactor;
-    // roughness is authored as perceptual roughness
-    // square it to get material roughness
-    material.clearcoatRoughness = clearcoatRoughness * clearcoatRoughness;
+    // This is perceptual roughness. The square of this value is used for direct lighting
+    material.clearcoatRoughness = clearcoatRoughness;
     #ifdef HAS_CLEARCOAT_NORMAL_TEXTURE
         material.clearcoatNormal = getClearcoatNormalFromTexture(attributes, attributes.normalEC);
     #else
@@ -458,14 +455,13 @@ void materialStage(inout czm_modelMaterial material, ProcessedAttributes attribu
         baseColorWithAlpha *= color;
     #endif
 
+    #ifdef USE_CPU_STYLING
+        baseColorWithAlpha.rgb = blend(baseColorWithAlpha.rgb, feature.color.rgb, model_colorBlend);
+    #endif
     material.baseColor = baseColorWithAlpha;
     material.diffuse = baseColorWithAlpha.rgb;
     material.alpha = baseColorWithAlpha.a;
 
-    #ifdef USE_CPU_STYLING
-        material.diffuse = blend(material.diffuse, feature.color.rgb, model_colorBlend);
-    #endif
-
     #ifdef HAS_OCCLUSION_TEXTURE
         vec2 occlusionTexCoords = TEXCOORD_OCCLUSION;
         #ifdef HAS_OCCLUSION_TEXTURE_TRANSFORM

package/Source/Shaders/Model/MaterialStageFS.js

@@ -259,8 +259,7 @@ void setSpecularGlossiness(inout czm_modelMaterial material)\n\
     material.specular = specular;\n\
 \n\
     // glossiness is the opposite of roughness, but easier for artists to use.\n\
-    float roughness = 1.0 - glossiness;\n\
-    material.roughness = roughness * roughness;\n\
+    material.roughness = 1.0 - glossiness;\n\
 }\n\
 #elif defined(LIGHTING_PBR)\n\
 float setMetallicRoughness(inout czm_modelMaterial material)\n\
@@ -273,7 +272,7 @@ float setMetallicRoughness(inout czm_modelMaterial material)\n\
 \n\
         vec3 metallicRoughness = texture(u_metallicRoughnessTexture, metallicRoughnessTexCoords).rgb;\n\
         float metalness = clamp(metallicRoughness.b, 0.0, 1.0);\n\
-        float roughness = clamp(metallicRoughness.g, 0.04, 1.0);\n\
+        float roughness = clamp(metallicRoughness.g, 0.0, 1.0);\n\
         #ifdef HAS_METALLIC_FACTOR\n\
             metalness = clamp(metalness * u_metallicFactor, 0.0, 1.0);\n\
         #endif\n\
@@ -289,7 +288,7 @@ float setMetallicRoughness(inout czm_modelMaterial material)\n\
         #endif\n\
 \n\
         #ifdef HAS_ROUGHNESS_FACTOR\n\
-            float roughness = clamp(u_roughnessFactor, 0.04, 1.0);\n\
+            float roughness = clamp(u_roughnessFactor, 0.0, 1.0);\n\
         #else\n\
             float roughness = 1.0;\n\
         #endif\n\
@@ -304,9 +303,8 @@ float setMetallicRoughness(inout czm_modelMaterial material)\n\
     // diffuse only applies to dielectrics.\n\
     material.diffuse = mix(material.baseColor.rgb, vec3(0.0), metalness);\n\
 \n\
-    // roughness is authored as perceptual roughness\n\
-    // square it to get material roughness\n\
-    material.roughness = roughness * roughness;\n\
+    // This is perceptual roughness. The square of this value is used for direct lighting\n\
+    material.roughness = roughness;\n\
 \n\
     return metalness;\n\
 }\n\
@@ -419,9 +417,8 @@ void setClearcoat(inout czm_modelMaterial material, in ProcessedAttributes attri
     #endif\n\
 \n\
     material.clearcoatFactor = clearcoatFactor;\n\
-    // roughness is authored as perceptual roughness\n\
-    // square it to get material roughness\n\
-    material.clearcoatRoughness = clearcoatRoughness * clearcoatRoughness;\n\
+    // This is perceptual roughness. The square of this value is used for direct lighting\n\
+    material.clearcoatRoughness = clearcoatRoughness;\n\
     #ifdef HAS_CLEARCOAT_NORMAL_TEXTURE\n\
         material.clearcoatNormal = getClearcoatNormalFromTexture(attributes, attributes.normalEC);\n\
     #else\n\
@@ -459,13 +456,12 @@ void materialStage(inout czm_modelMaterial material, ProcessedAttributes attribu
         baseColorWithAlpha *= color;\n\
     #endif\n\
 \n\
+    #ifdef USE_CPU_STYLING\n\
+        baseColorWithAlpha.rgb = blend(baseColorWithAlpha.rgb, feature.color.rgb, model_colorBlend);\n\
+    #endif\n\
     material.baseColor = baseColorWithAlpha;\n\
     material.diffuse = baseColorWithAlpha.rgb;\n\
     material.alpha = baseColorWithAlpha.a;\n\
-\n\
-    #ifdef USE_CPU_STYLING\n\
-        material.diffuse = blend(material.diffuse, feature.color.rgb, model_colorBlend);\n\
-    #endif\n\
 \n\
     #ifdef HAS_OCCLUSION_TEXTURE\n\
         vec2 occlusionTexCoords = TEXCOORD_OCCLUSION;\n\

package/Source/Shaders/PointPrimitiveCollectionFS.glsl

@@ -3,9 +3,13 @@ in vec4 v_outlineColor;
 in float v_innerPercent;
 in float v_pixelDistance;
 in vec4 v_pickColor;
+in float v_splitDirection;
 
 void main()
 {
+    if (v_splitDirection < 0.0 && gl_FragCoord.x > czm_splitPosition) discard;
+    if (v_splitDirection > 0.0 && gl_FragCoord.x < czm_splitPosition) discard;
+
     // The distance in UV space from this fragment to the center of the point, at most 0.5.
     float distanceToCenter = length(gl_PointCoord - vec2(0.5));
     // The max distance stops one pixel shy of the edge to leave space for anti-aliasing.

package/Source/Shaders/PointPrimitiveCollectionFS.js

@@ -4,9 +4,13 @@ in vec4 v_outlineColor;\n\
 in float v_innerPercent;\n\
 in float v_pixelDistance;\n\
 in vec4 v_pickColor;\n\
+in float v_splitDirection;\n\
 \n\
 void main()\n\
 {\n\
+    if (v_splitDirection < 0.0 && gl_FragCoord.x > czm_splitPosition) discard;\n\
+    if (v_splitDirection > 0.0 && gl_FragCoord.x < czm_splitPosition) discard;\n\
+\n\
     // The distance in UV space from this fragment to the center of the point, at most 0.5.\n\
     float distanceToCenter = length(gl_PointCoord - vec2(0.5));\n\
     // The max distance stops one pixel shy of the edge to leave space for anti-aliasing.\n\

package/Source/Shaders/PointPrimitiveCollectionVS.glsl

@@ -2,16 +2,17 @@ uniform float u_maxTotalPointSize;
 
 in vec4 positionHighAndSize;
 in vec4 positionLowAndOutline;
-in vec4 compressedAttribute0;                       // color, outlineColor, pick color
-in vec4 compressedAttribute1;                       // show, translucency by distance, some free space
-in vec4 scaleByDistance;                            // near, nearScale, far, farScale
-in vec3 distanceDisplayConditionAndDisableDepth;    // near, far, disableDepthTestDistance
+in vec4 compressedAttribute0;                                        // color, outlineColor, pick color
+in vec4 compressedAttribute1;                                        // show, translucency by distance, some free space
+in vec4 scaleByDistance;                                             // near, nearScale, far, farScale
+in vec4 distanceDisplayConditionAndDisableDepthAndSplitDirection;    // near, far, disableDepthTestDistance, splitDirection
 
 out vec4 v_color;
 out vec4 v_outlineColor;
 out float v_innerPercent;
 out float v_pixelDistance;
 out vec4 v_pickColor;
+out float v_splitDirection;
 
 const float SHIFT_LEFT8 = 256.0;
 const float SHIFT_RIGHT8 = 1.0 / 256.0;
@@ -135,8 +136,8 @@ void main()
 #endif
 
 #ifdef DISTANCE_DISPLAY_CONDITION
-    float nearSq = distanceDisplayConditionAndDisableDepth.x;
-    float farSq = distanceDisplayConditionAndDisableDepth.y;
+    float nearSq = distanceDisplayConditionAndDisableDepthAndSplitDirection.x;
+    float farSq = distanceDisplayConditionAndDisableDepthAndSplitDirection.y;
     if (lengthSq < nearSq || lengthSq > farSq) {
         // push vertex behind camera to force it to be clipped
         positionEC.xyz = vec3(0.0, 0.0, 1.0);
@@ -147,7 +148,7 @@ void main()
     czm_vertexLogDepth();
 
 #ifdef DISABLE_DEPTH_DISTANCE
-    float disableDepthTestDistance = distanceDisplayConditionAndDisableDepth.z;
+    float disableDepthTestDistance = distanceDisplayConditionAndDisableDepthAndSplitDirection.z;
     if (disableDepthTestDistance == 0.0 && czm_minimumDisableDepthTestDistance != 0.0)
     {
         disableDepthTestDistance = czm_minimumDisableDepthTestDistance;
@@ -180,4 +181,5 @@ void main()
     gl_Position *= show;
 
     v_pickColor = pickColor;
+    v_splitDirection = distanceDisplayConditionAndDisableDepthAndSplitDirection.w;
 }

package/Source/Shaders/PointPrimitiveCollectionVS.js

@@ -3,16 +3,17 @@ export default "uniform float u_maxTotalPointSize;\n\
 \n\
 in vec4 positionHighAndSize;\n\
 in vec4 positionLowAndOutline;\n\
-in vec4 compressedAttribute0;                       // color, outlineColor, pick color\n\
-in vec4 compressedAttribute1;                       // show, translucency by distance, some free space\n\
-in vec4 scaleByDistance;                            // near, nearScale, far, farScale\n\
-in vec3 distanceDisplayConditionAndDisableDepth;    // near, far, disableDepthTestDistance\n\
+in vec4 compressedAttribute0;                                        // color, outlineColor, pick color\n\
+in vec4 compressedAttribute1;                                        // show, translucency by distance, some free space\n\
+in vec4 scaleByDistance;                                             // near, nearScale, far, farScale\n\
+in vec4 distanceDisplayConditionAndDisableDepthAndSplitDirection;    // near, far, disableDepthTestDistance, splitDirection\n\
 \n\
 out vec4 v_color;\n\
 out vec4 v_outlineColor;\n\
 out float v_innerPercent;\n\
 out float v_pixelDistance;\n\
 out vec4 v_pickColor;\n\
+out float v_splitDirection;\n\
 \n\
 const float SHIFT_LEFT8 = 256.0;\n\
 const float SHIFT_RIGHT8 = 1.0 / 256.0;\n\
@@ -136,8 +137,8 @@ void main()\n\
 #endif\n\
 \n\
 #ifdef DISTANCE_DISPLAY_CONDITION\n\
-    float nearSq = distanceDisplayConditionAndDisableDepth.x;\n\
-    float farSq = distanceDisplayConditionAndDisableDepth.y;\n\
+    float nearSq = distanceDisplayConditionAndDisableDepthAndSplitDirection.x;\n\
+    float farSq = distanceDisplayConditionAndDisableDepthAndSplitDirection.y;\n\
     if (lengthSq < nearSq || lengthSq > farSq) {\n\
         // push vertex behind camera to force it to be clipped\n\
         positionEC.xyz = vec3(0.0, 0.0, 1.0);\n\
@@ -148,7 +149,7 @@ void main()\n\
     czm_vertexLogDepth();\n\
 \n\
 #ifdef DISABLE_DEPTH_DISTANCE\n\
-    float disableDepthTestDistance = distanceDisplayConditionAndDisableDepth.z;\n\
+    float disableDepthTestDistance = distanceDisplayConditionAndDisableDepthAndSplitDirection.z;\n\
     if (disableDepthTestDistance == 0.0 && czm_minimumDisableDepthTestDistance != 0.0)\n\
     {\n\
         disableDepthTestDistance = czm_minimumDisableDepthTestDistance;\n\
@@ -181,5 +182,6 @@ void main()\n\
     gl_Position *= show;\n\
 \n\
     v_pickColor = pickColor;\n\
+    v_splitDirection = distanceDisplayConditionAndDisableDepthAndSplitDirection.w;\n\
 }\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.
  *