@cesium/engine 10.1.0 → 11.1.0

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

@@ -1,11 +1,11 @@
 /**
- * Packs a depth value into a vec3 that can be represented by unsigned bytes.
+ * Packs a depth value into a vec4 that can be represented by unsigned bytes.
  *
  * @name czm_packDepth
  * @glslFunction
  *
  * @param {float} depth The floating-point depth.
- * @returns {vec3} The packed depth.
+ * @returns {vec4} The packed depth.
  */
 vec4 czm_packDepth(float depth)
 {

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

@@ -1,12 +1,12 @@
 //This file is automatically rebuilt by the Cesium build process.
 export default "/**\n\
- * Packs a depth value into a vec3 that can be represented by unsigned bytes.\n\
+ * Packs a depth value into a vec4 that can be represented by unsigned bytes.\n\
  *\n\
  * @name czm_packDepth\n\
  * @glslFunction\n\
  *\n\
  * @param {float} depth The floating-point depth.\n\
- * @returns {vec3} The packed depth.\n\
+ * @returns {vec4} The packed depth.\n\
  */\n\
 vec4 czm_packDepth(float depth)\n\
 {\n\

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

@@ -96,8 +96,8 @@ float GGX(float alphaRoughness, float NdotH)
  */
 float computeDirectSpecularStrength(vec3 normal, vec3 lightDirection, vec3 viewDirection, vec3 halfwayDirection, float alphaRoughness)
 {
-    float NdotL = dot(normal, lightDirection);
-    float NdotV = abs(dot(normal, viewDirection));
+    float NdotL = clamp(dot(normal, lightDirection), 0.0, 1.0);
+    float NdotV = clamp(dot(normal, viewDirection), 0.0, 1.0);
     float G = smithVisibilityGGX(alphaRoughness, NdotL, NdotV);
     float NdotH = clamp(dot(normal, halfwayDirection), 0.0, 1.0);
     float D = GGX(alphaRoughness, NdotH);

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

@@ -97,8 +97,8 @@ float GGX(float alphaRoughness, float NdotH)\n\
  */\n\
 float computeDirectSpecularStrength(vec3 normal, vec3 lightDirection, vec3 viewDirection, vec3 halfwayDirection, float alphaRoughness)\n\
 {\n\
-    float NdotL = dot(normal, lightDirection);\n\
-    float NdotV = abs(dot(normal, viewDirection));\n\
+    float NdotL = clamp(dot(normal, lightDirection), 0.0, 1.0);\n\
+    float NdotV = clamp(dot(normal, viewDirection), 0.0, 1.0);\n\
     float G = smithVisibilityGGX(alphaRoughness, NdotL, NdotV);\n\
     float NdotH = clamp(dot(normal, halfwayDirection), 0.0, 1.0);\n\
     float D = GGX(alphaRoughness, NdotH);\n\

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

@@ -0,0 +1,23 @@
+// KhronosGroup https://github.com/KhronosGroup/ToneMapping/tree/main/PBR_Neutral
+
+// Input color is non-negative and resides in the Linear Rec. 709 color space.
+// Output color is also Linear Rec. 709, but in the [0, 1] range.
+
+vec3 czm_pbrNeutralTonemapping(vec3 color) {
+    const float startCompression = 0.8 - 0.04;
+    const float desaturation = 0.15;
+
+    float x = min(color.r, min(color.g, color.b));
+    float offset = czm_branchFreeTernary(x < 0.08, x - 6.25 * x * x, 0.04);
+    color -= offset;
+
+    float peak = max(color.r, max(color.g, color.b));
+    if (peak < startCompression) return color;
+
+    const float d = 1.0 - startCompression;
+    float newPeak = 1.0 - d * d / (peak + d - startCompression);
+    color *= newPeak / peak;
+
+    float g = 1.0 - 1.0 / (desaturation * (peak - newPeak) + 1.0);
+    return mix(color, newPeak * vec3(1.0, 1.0, 1.0), g);
+}

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

@@ -0,0 +1,25 @@
+//This file is automatically rebuilt by the Cesium build process.
+export default "// KhronosGroup https://github.com/KhronosGroup/ToneMapping/tree/main/PBR_Neutral\n\
+\n\
+// Input color is non-negative and resides in the Linear Rec. 709 color space.\n\
+// Output color is also Linear Rec. 709, but in the [0, 1] range.\n\
+\n\
+vec3 czm_pbrNeutralTonemapping(vec3 color) {\n\
+    const float startCompression = 0.8 - 0.04;\n\
+    const float desaturation = 0.15;\n\
+\n\
+    float x = min(color.r, min(color.g, color.b));\n\
+    float offset = czm_branchFreeTernary(x < 0.08, x - 6.25 * x * x, 0.04);\n\
+    color -= offset;\n\
+\n\
+    float peak = max(color.r, max(color.g, color.b));\n\
+    if (peak < startCompression) return color;\n\
+\n\
+    const float d = 1.0 - startCompression;\n\
+    float newPeak = 1.0 - d * d / (peak + d - startCompression);\n\
+    color *= newPeak / peak;\n\
+\n\
+    float g = 1.0 - 1.0 / (desaturation * (peak - newPeak) + 1.0);\n\
+    return mix(color, newPeak * vec3(1.0, 1.0, 1.0), g);\n\
+}\n\
+";

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/Functions/unpackDepth.glsl

@@ -8,9 +8,9 @@
  *
  * @returns {float} The floating-point depth in [0, 1) range.
  */
- float czm_unpackDepth(vec4 packedDepth)
- {
+float czm_unpackDepth(vec4 packedDepth)
+{
     // See Aras Pranckevičius' post Encoding Floats to RGBA
     // http://aras-p.info/blog/2009/07/30/encoding-floats-to-rgba-the-final/
     return dot(packedDepth, vec4(1.0, 1.0 / 255.0, 1.0 / 65025.0, 1.0 / 16581375.0));
- }
+}

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

@@ -9,10 +9,10 @@ export default "/**\n\
  *\n\
  * @returns {float} The floating-point depth in [0, 1) range.\n\
  */\n\
- float czm_unpackDepth(vec4 packedDepth)\n\
- {\n\
+float czm_unpackDepth(vec4 packedDepth)\n\
+{\n\
     // See Aras Pranckevičius' post Encoding Floats to RGBA\n\
     // http://aras-p.info/blog/2009/07/30/encoding-floats-to-rgba-the-final/\n\
     return dot(packedDepth, vec4(1.0, 1.0 / 255.0, 1.0 / 65025.0, 1.0 / 16581375.0));\n\
- }\n\
+}\n\
 ";

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

@@ -71,7 +71,7 @@ vec4 czm_screenToEyeCoordinates(vec2 screenCoordinateXY, float depthOrLogDepth)
     float near = czm_currentFrustum.x;
     float far = czm_currentFrustum.y;
     float log2Depth = depthOrLogDepth * czm_log2FarDepthFromNearPlusOne;
-    float depthFromNear = pow(2.0, log2Depth) - 1.0;
+    float depthFromNear = exp2(log2Depth) - 1.0;
     float depthFromCamera = depthFromNear + near;
     vec4 screenCoord = vec4(screenCoordinateXY, far * (1.0 - near / depthFromCamera) / (far - near), 1.0);
     vec4 eyeCoordinate = czm_screenToEyeCoordinates(screenCoord);

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

@@ -72,7 +72,7 @@ vec4 czm_screenToEyeCoordinates(vec2 screenCoordinateXY, float depthOrLogDepth)\
     float near = czm_currentFrustum.x;\n\
     float far = czm_currentFrustum.y;\n\
     float log2Depth = depthOrLogDepth * czm_log2FarDepthFromNearPlusOne;\n\
-    float depthFromNear = pow(2.0, log2Depth) - 1.0;\n\
+    float depthFromNear = exp2(log2Depth) - 1.0;\n\
     float depthFromCamera = depthFromNear + near;\n\
     vec4 screenCoord = vec4(screenCoordinateXY, far * (1.0 - near / depthFromCamera) / (far - near), 1.0);\n\
     vec4 eyeCoordinate = czm_screenToEyeCoordinates(screenCoord);\n\

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

@@ -10,7 +10,7 @@ uniform vec2 u_polygonOffset;
 /**
  * Writes the fragment depth to the logarithmic depth buffer.
  * <p>
- * Use this when the vertex shader does not call {@link czm_vertexlogDepth}, for example, when
+ * Use this when the vertex shader does not call {@link czm_vertexLogDepth}, for example, when
  * ray-casting geometry using a full screen quad.
  * </p>
  * @name czm_writeLogDepth
@@ -66,7 +66,7 @@ void czm_writeLogDepth(float depth)
 /**
  * Writes the fragment depth to the logarithmic depth buffer.
  * <p>
- * Use this when the vertex shader calls {@link czm_vertexlogDepth}.
+ * Use this when the vertex shader calls {@link czm_vertexLogDepth}.
  * </p>
  *
  * @name czm_writeLogDepth

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

@@ -11,7 +11,7 @@ uniform vec2 u_polygonOffset;\n\
 /**\n\
  * Writes the fragment depth to the logarithmic depth buffer.\n\
  * <p>\n\
- * Use this when the vertex shader does not call {@link czm_vertexlogDepth}, for example, when\n\
+ * Use this when the vertex shader does not call {@link czm_vertexLogDepth}, for example, when\n\
  * ray-casting geometry using a full screen quad.\n\
  * </p>\n\
  * @name czm_writeLogDepth\n\
@@ -67,7 +67,7 @@ void czm_writeLogDepth(float depth)\n\
 /**\n\
  * Writes the fragment depth to the logarithmic depth buffer.\n\
  * <p>\n\
- * Use this when the vertex shader calls {@link czm_vertexlogDepth}.\n\
+ * Use this when the vertex shader calls {@link czm_vertexLogDepth}.\n\
  * </p>\n\
  *\n\
  * @name czm_writeLogDepth\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/DepthPlaneVS.glsl

@@ -5,7 +5,7 @@ out vec4 positionEC;
 void main()
 {
     positionEC = czm_modelView * position;
-    gl_Position = czm_projection * positionEC;
+    gl_Position = czm_modelViewProjection * position;
 
     czm_vertexLogDepth();
 }

package/Source/Shaders/DepthPlaneVS.js

@@ -6,7 +6,7 @@ out vec4 positionEC;\n\
 void main()\n\
 {\n\
     positionEC = czm_modelView * position;\n\
-    gl_Position = czm_projection * positionEC;\n\
+    gl_Position = czm_modelViewProjection * position;\n\
 \n\
     czm_vertexLogDepth();\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

@@ -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;