@cesium/engine 10.0.0 → 11.0.0

package/Source/Shaders/Builtin/Functions/textureCube.glsl

@@ -6,12 +6,31 @@
  * @glslFunction
  *
  * @param {samplerCube} sampler The sampler.
- * @param {vec3} p The coordinates to sample the texture at.
+ * @param {vec3} p The coordinate at which to sample the texture.
  */
 vec4 czm_textureCube(samplerCube sampler, vec3 p) {
 #if __VERSION__ == 300
     return texture(sampler, p);
-#else  
+#else
     return textureCube(sampler, p);
 #endif
+}
+
+/**
+ * A wrapper around the textureLod (WebGL2) / textureCube (WebGL1)
+ * function to allow for WebGL 1 support in fragment shaders.
+ *
+ * @name czm_textureCubeLod
+ * @glslFunction
+ *
+ * @param {samplerCube} sampler The sampler.
+ * @param {vec3} p The coordinate at which to sample the texture.
+ * @param {float} lod The mipmap level from which to sample.
+ */
+vec4 czm_textureCube(samplerCube sampler, vec3 p, float lod) {
+#if __VERSION__ == 300
+    return textureLod(sampler, p, lod);
+#elif defined(GL_EXT_shader_texture_lod)
+    return textureCubeLodEXT(sampler, p, lod);
+#endif
 }

package/Source/Shaders/Builtin/Functions/textureCube.js

@@ -7,12 +7,31 @@ export default "/**\n\
  * @glslFunction\n\
  *\n\
  * @param {samplerCube} sampler The sampler.\n\
- * @param {vec3} p The coordinates to sample the texture at.\n\
+ * @param {vec3} p The coordinate at which to sample the texture.\n\
  */\n\
 vec4 czm_textureCube(samplerCube sampler, vec3 p) {\n\
 #if __VERSION__ == 300\n\
     return texture(sampler, p);\n\
-#else  \n\
+#else\n\
     return textureCube(sampler, p);\n\
 #endif\n\
+}\n\
+\n\
+/**\n\
+ * A wrapper around the textureLod (WebGL2) / textureCube (WebGL1)\n\
+ * function to allow for WebGL 1 support in fragment shaders.\n\
+ *\n\
+ * @name czm_textureCubeLod\n\
+ * @glslFunction\n\
+ *\n\
+ * @param {samplerCube} sampler The sampler.\n\
+ * @param {vec3} p The coordinate at which to sample the texture.\n\
+ * @param {float} lod The mipmap level from which to sample.\n\
+ */\n\
+vec4 czm_textureCube(samplerCube sampler, vec3 p, float lod) {\n\
+#if __VERSION__ == 300\n\
+    return textureLod(sampler, p, lod);\n\
+#elif defined(GL_EXT_shader_texture_lod)\n\
+    return textureCubeLodEXT(sampler, p, lod);\n\
+#endif\n\
 }";

package/Source/Shaders/Builtin/Structs/materialInput.glsl

@@ -13,6 +13,7 @@
  * @property {float} height The height of the terrain in meters above or below the ellipsoid.  Only available for globe materials.
  * @property {float} slope The slope of the terrain in radians.  0 is flat; pi/2 is vertical.  Only available for globe materials.
  * @property {float} aspect The aspect of the terrain in radians.  0 is East, pi/2 is North, pi is West, 3pi/2 is South.  Only available for globe materials.
+* @property {float} waterMask The value of the water mask. 0 is land, 1 is water. Only available for globe materials.
  */
 struct czm_materialInput
 {
@@ -25,4 +26,5 @@ struct czm_materialInput
     float height;
     float slope;
     float aspect;
+    float waterMask;
 };

package/Source/Shaders/Builtin/Structs/materialInput.js

@@ -14,6 +14,7 @@ export default "/**\n\
  * @property {float} height The height of the terrain in meters above or below the ellipsoid.  Only available for globe materials.\n\
  * @property {float} slope The slope of the terrain in radians.  0 is flat; pi/2 is vertical.  Only available for globe materials.\n\
  * @property {float} aspect The aspect of the terrain in radians.  0 is East, pi/2 is North, pi is West, 3pi/2 is South.  Only available for globe materials.\n\
+* @property {float} waterMask The value of the water mask. 0 is land, 1 is water. Only available for globe materials.\n\
  */\n\
 struct czm_materialInput\n\
 {\n\
@@ -26,5 +27,6 @@ struct czm_materialInput\n\
     float height;\n\
     float slope;\n\
     float aspect;\n\
+    float waterMask;\n\
 };\n\
 ";

package/Source/Shaders/GlobeFS.glsl

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

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

@@ -16,10 +16,10 @@ vec3 getProceduralSkyMetrics(vec3 positionWC, vec3 reflectionWC)
 }
 
 /**
- * Compute the diffuse irradiance for a procedural sky lighting model
+ * Compute the diffuse irradiance for a procedural sky lighting model.
  *
  * @param {vec3} skyMetrics The dot products of the horizon and reflection directions with the nadir, and an atmosphere boundary distance.
- * @return {vec3} The computed diffuse irradiance
+ * @return {vec3} The computed diffuse irradiance.
  */
 vec3 getProceduralDiffuseIrradiance(vec3 skyMetrics)
 {
@@ -30,10 +30,12 @@ vec3 getProceduralDiffuseIrradiance(vec3 skyMetrics)
 }
 
 /**
- * Compute the specular irradiance for a procedural sky lighting model
+ * Compute the specular irradiance for a procedural sky lighting model.
  *
+ * @param {vec3} reflectionWC The reflection vector in world coordinates.
  * @param {vec3} skyMetrics The dot products of the horizon and reflection directions with the nadir, and an atmosphere boundary distance.
- * @return {vec3} The computed specular irradiance
+ * @param {float} roughness The roughness of the material.
+ * @return {vec3} The computed specular irradiance.
  */
 vec3 getProceduralSpecularIrradiance(vec3 reflectionWC, vec3 skyMetrics, float roughness)
 {
@@ -42,7 +44,7 @@ vec3 getProceduralSpecularIrradiance(vec3 reflectionWC, vec3 skyMetrics, float r
     reflectionWC = -normalize(czm_temeToPseudoFixed * reflectionWC);
     reflectionWC.x = -reflectionWC.x;
 
-    float inverseRoughness = 1.04 - roughness;
+    float inverseRoughness = 1.0 - roughness;
     inverseRoughness *= inverseRoughness;
     vec3 sceneSkyBox = czm_textureCube(czm_environmentMap, reflectionWC).rgb * inverseRoughness;
 
@@ -121,7 +123,7 @@ float getSunLuminance(vec3 positionWC, vec3 normalEC, vec3 lightDirectionEC)
 ) {
     vec3 viewDirectionEC = -normalize(positionEC);
     vec3 positionWC = vec3(czm_inverseView * vec4(positionEC, 1.0));
-    vec3 reflectionWC = normalize(czm_inverseViewRotation * normalize(reflect(viewDirectionEC, normalEC)));
+    vec3 reflectionWC = normalize(czm_inverseViewRotation * reflect(viewDirectionEC, normalEC));
     vec3 skyMetrics = getProceduralSkyMetrics(positionWC, reflectionWC);
 
     float roughness = material.roughness;
@@ -150,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); 
@@ -164,20 +166,19 @@ 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, float VdotH, vec3 f0, float roughness)
+vec3 computeSpecularIBL(vec3 cubeDir, float NdotV, vec3 f0, float roughness)
 {
-    float reflectance = czm_maximumComponent(f0);
-    vec3 f90 = vec3(clamp(reflectance * 25.0, 0.0, 1.0));
-    vec3 F = fresnelSchlick2(f0, f90, VdotH);
+    // 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 F = fresnelSchlick2(f0, f90, NdotV);
 
     vec2 brdfLut = texture(czm_brdfLut, vec2(NdotV, roughness)).rg;
     vec3 specularSample = sampleSpecularEnvironment(cubeDir, roughness);
@@ -188,54 +189,64 @@ vec3 computeSpecularIBL(vec3 cubeDir, float NdotV, float VdotH, vec3 f0, float r
 
 #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
-) {
-    // Find the direction in which to sample the environment map
-    vec3 cubeDir = normalize(model_iblReferenceFrameMatrix * normalize(reflect(-viewDirectionEC, normalEC)));
+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 diffuseContribution = computeDiffuseIBL(cubeDir) * material.diffuse;
+        vec3 normalMC = normalize(model_iblReferenceFrameMatrix * normalEC);
+        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
 
-    float roughness = material.roughness;
-
     #ifdef USE_ANISOTROPY
-        // Update environment map sampling direction to account for anisotropic distortion of specular reflection
+        // Bend normal to account for anisotropic distortion of specular reflection
         vec3 anisotropyDirection = material.anisotropicB;
         vec3 anisotropicTangent = cross(anisotropyDirection, viewDirectionEC);
         vec3 anisotropicNormal = cross(anisotropicTangent, anisotropyDirection);
         float bendFactor = 1.0 - material.anisotropyStrength * (1.0 - roughness);
         float bendFactorPow4 = bendFactor * bendFactor * bendFactor * bendFactor;
         vec3 bentNormal = normalize(mix(anisotropicNormal, normalEC, bendFactorPow4));
-        cubeDir = normalize(model_iblReferenceFrameMatrix * normalize(reflect(-viewDirectionEC, bentNormal)));
+        vec3 reflectEC = reflect(-viewDirectionEC, bentNormal);
+    #else
+        vec3 reflectEC = reflect(-viewDirectionEC, normalEC);
     #endif
 
     #ifdef SPECULAR_IBL
-        float NdotV = abs(dot(normalEC, viewDirectionEC)) + 0.001;
-        vec3 halfwayDirectionEC = normalize(viewDirectionEC + lightDirectionEC);
-        float VdotH = clamp(dot(viewDirectionEC, halfwayDirectionEC), 0.0, 1.0);
-        vec3 f0 = material.specular;
-        vec3 specularContribution = computeSpecularIBL(cubeDir, NdotV, VdotH, f0, roughness);
+        vec3 reflectMC = normalize(model_iblReferenceFrameMatrix * reflectEC);
+        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

@@ -17,10 +17,10 @@ vec3 getProceduralSkyMetrics(vec3 positionWC, vec3 reflectionWC)\n\
 }\n\
 \n\
 /**\n\
- * Compute the diffuse irradiance for a procedural sky lighting model\n\
+ * Compute the diffuse irradiance for a procedural sky lighting model.\n\
  *\n\
  * @param {vec3} skyMetrics The dot products of the horizon and reflection directions with the nadir, and an atmosphere boundary distance.\n\
- * @return {vec3} The computed diffuse irradiance\n\
+ * @return {vec3} The computed diffuse irradiance.\n\
  */\n\
 vec3 getProceduralDiffuseIrradiance(vec3 skyMetrics)\n\
 {\n\
@@ -31,10 +31,12 @@ vec3 getProceduralDiffuseIrradiance(vec3 skyMetrics)\n\
 }\n\
 \n\
 /**\n\
- * Compute the specular irradiance for a procedural sky lighting model\n\
+ * Compute the specular irradiance for a procedural sky lighting model.\n\
  *\n\
+ * @param {vec3} reflectionWC The reflection vector in world coordinates.\n\
  * @param {vec3} skyMetrics The dot products of the horizon and reflection directions with the nadir, and an atmosphere boundary distance.\n\
- * @return {vec3} The computed specular irradiance\n\
+ * @param {float} roughness The roughness of the material.\n\
+ * @return {vec3} The computed specular irradiance.\n\
  */\n\
 vec3 getProceduralSpecularIrradiance(vec3 reflectionWC, vec3 skyMetrics, float roughness)\n\
 {\n\
@@ -43,7 +45,7 @@ vec3 getProceduralSpecularIrradiance(vec3 reflectionWC, vec3 skyMetrics, float r
     reflectionWC = -normalize(czm_temeToPseudoFixed * reflectionWC);\n\
     reflectionWC.x = -reflectionWC.x;\n\
 \n\
-    float inverseRoughness = 1.04 - roughness;\n\
+    float inverseRoughness = 1.0 - roughness;\n\
     inverseRoughness *= inverseRoughness;\n\
     vec3 sceneSkyBox = czm_textureCube(czm_environmentMap, reflectionWC).rgb * inverseRoughness;\n\
 \n\
@@ -122,7 +124,7 @@ float getSunLuminance(vec3 positionWC, vec3 normalEC, vec3 lightDirectionEC)\n\
 ) {\n\
     vec3 viewDirectionEC = -normalize(positionEC);\n\
     vec3 positionWC = vec3(czm_inverseView * vec4(positionEC, 1.0));\n\
-    vec3 reflectionWC = normalize(czm_inverseViewRotation * normalize(reflect(viewDirectionEC, normalEC)));\n\
+    vec3 reflectionWC = normalize(czm_inverseViewRotation * reflect(viewDirectionEC, normalEC));\n\
     vec3 skyMetrics = getProceduralSkyMetrics(positionWC, reflectionWC);\n\
 \n\
     float roughness = material.roughness;\n\
@@ -151,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\
@@ -165,20 +167,19 @@ 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, float VdotH, vec3 f0, float roughness)\n\
+vec3 computeSpecularIBL(vec3 cubeDir, float NdotV, vec3 f0, float roughness)\n\
 {\n\
-    float reflectance = czm_maximumComponent(f0);\n\
-    vec3 f90 = vec3(clamp(reflectance * 25.0, 0.0, 1.0));\n\
-    vec3 F = fresnelSchlick2(f0, f90, VdotH);\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 F = fresnelSchlick2(f0, f90, NdotV);\n\
 \n\
     vec2 brdfLut = texture(czm_brdfLut, vec2(NdotV, roughness)).rg;\n\
     vec3 specularSample = sampleSpecularEnvironment(cubeDir, roughness);\n\
@@ -189,54 +190,64 @@ vec3 computeSpecularIBL(vec3 cubeDir, float NdotV, float VdotH, vec3 f0, float r
 \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\
-    // Find the direction in which to sample the environment map\n\
-    vec3 cubeDir = normalize(model_iblReferenceFrameMatrix * normalize(reflect(-viewDirectionEC, normalEC)));\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 diffuseContribution = computeDiffuseIBL(cubeDir) * material.diffuse;\n\
+        vec3 normalMC = normalize(model_iblReferenceFrameMatrix * normalEC);\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\
-    float roughness = material.roughness;\n\
 \n\
     #ifdef USE_ANISOTROPY\n\
-        // Update environment map sampling direction to account for anisotropic distortion of specular reflection\n\
+        // Bend normal to account for anisotropic distortion of specular reflection\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 - roughness);\n\
         float bendFactorPow4 = bendFactor * bendFactor * bendFactor * bendFactor;\n\
         vec3 bentNormal = normalize(mix(anisotropicNormal, normalEC, bendFactorPow4));\n\
-        cubeDir = normalize(model_iblReferenceFrameMatrix * normalize(reflect(-viewDirectionEC, bentNormal)));\n\
+        vec3 reflectEC = reflect(-viewDirectionEC, bentNormal);\n\
+    #else\n\
+        vec3 reflectEC = reflect(-viewDirectionEC, normalEC);\n\
     #endif\n\
 \n\
     #ifdef SPECULAR_IBL\n\
-        float NdotV = abs(dot(normalEC, viewDirectionEC)) + 0.001;\n\
-        vec3 halfwayDirectionEC = normalize(viewDirectionEC + lightDirectionEC);\n\
-        float VdotH = clamp(dot(viewDirectionEC, halfwayDirectionEC), 0.0, 1.0);\n\
-        vec3 f0 = material.specular;\n\
-        vec3 specularContribution = computeSpecularIBL(cubeDir, NdotV, VdotH, f0, roughness);\n\
+        vec3 reflectMC = normalize(model_iblReferenceFrameMatrix * reflectEC);\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\