@cesium/engine 9.1.0 → 10.0.0

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

@@ -0,0 +1,23 @@
+//This file is automatically rebuilt by the Cesium build process.
+export default "/**\n\
+ * Find the maximum component of a vector.\n\
+ *\n\
+ * @name czm_maximumComponent\n\
+ * @glslFunction\n\
+ *\n\
+ * @param {vec2|vec3|vec4} v The input vector.\n\
+ * @returns {float} The value of the largest component.\n\
+ */\n\
+float czm_maximumComponent(vec2 v)\n\
+{\n\
+    return max(v.x, v.y);\n\
+}\n\
+float czm_maximumComponent(vec3 v)\n\
+{\n\
+    return max(max(v.x, v.y), v.z);\n\
+}\n\
+float czm_maximumComponent(vec4 v)\n\
+{\n\
+    return max(max(max(v.x, v.y), v.z), v.w);\n\
+}\n\
+";

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

@@ -5,9 +5,42 @@ vec3 lambertianDiffuse(vec3 diffuseColor)
 
 vec3 fresnelSchlick2(vec3 f0, vec3 f90, float VdotH)
 {
-    return f0 + (f90 - f0) * pow(clamp(1.0 - VdotH, 0.0, 1.0), 5.0);
+    float versine = 1.0 - VdotH;
+    // pow(versine, 5.0) is slow. See https://stackoverflow.com/a/68793086/10082269
+    float versineSquared = versine * versine;
+    return f0 + (f90 - f0) * versineSquared * versineSquared * versine;
 }
 
+#ifdef USE_ANISOTROPY
+/**
+ * @param {float} roughness Material roughness (along the anisotropy bitangent)
+ * @param {float} tangentialRoughness Anisotropic roughness (along the anisotropy tangent)
+ * @param {vec3} lightDirection The direction from the fragment to the light source, transformed to tangent-bitangent-normal coordinates
+ * @param {vec3} viewDirection The direction from the fragment to the camera, transformed to tangent-bitangent-normal coordinates
+ */
+float smithVisibilityGGX_anisotropic(float roughness, float tangentialRoughness, vec3 lightDirection, vec3 viewDirection)
+{
+    vec3 roughnessScale = vec3(tangentialRoughness, roughness, 1.0);
+    float GGXV = lightDirection.z * length(roughnessScale * viewDirection);
+    float GGXL = viewDirection.z * length(roughnessScale * lightDirection);
+    float v = 0.5 / (GGXV + GGXL);
+    return clamp(v, 0.0, 1.0);
+}
+
+/**
+ * @param {float} roughness Material roughness (along the anisotropy bitangent)
+ * @param {float} tangentialRoughness Anisotropic roughness (along the anisotropy tangent)
+ * @param {vec3} halfwayDirection The unit vector halfway between light and view directions, transformed to tangent-bitangent-normal coordinates
+ */
+float GGX_anisotropic(float roughness, float tangentialRoughness, vec3 halfwayDirection)
+{
+    float roughnessSquared = roughness * tangentialRoughness;
+    vec3 f = halfwayDirection * vec3(roughness, tangentialRoughness, roughnessSquared);
+    float w2 = roughnessSquared / dot(f, f);
+    return roughnessSquared * w2 * w2 / czm_pi;
+}
+#endif
+
 float smithVisibilityG1(float NdotV, float roughness)
 {
     // this is the k value for direct lighting.
@@ -16,14 +49,34 @@ float smithVisibilityG1(float NdotV, float roughness)
     return NdotV / (NdotV * (1.0 - k) + k);
 }
 
+/**
+ * Estimate the geometric self-shadowing of the microfacets in a surface,
+ * using the Schlick GGX approximation of a Smith visibility function.
+ *
+ * @param {float} roughness The roughness of the material.
+ * @param {float} NdotL The cosine of the angle between the surface normal and the direction to the light source.
+ * @param {float} NdotV The cosine of the angle between the surface normal and the direction to the camera.
+ */
 float smithVisibilityGGX(float roughness, float NdotL, float NdotV)
 {
+    // Avoid divide-by-zero errors
+    NdotL = clamp(NdotL, 0.001, 1.0);
+    NdotV += 0.001;
     return (
         smithVisibilityG1(NdotL, roughness) *
         smithVisibilityG1(NdotV, roughness)
-    );
+    ) / (4.0 * NdotL * NdotV);
 }
 
+/**
+ * Estimate the fraction of the microfacets in a surface that are aligned with 
+ * the halfway vector, which is aligned halfway between the directions from
+ * the fragment to the camera and from the fragment to the light source.
+ *
+ * @param {float} roughness The roughness of the material.
+ * @param {float} NdotH The cosine of the angle between the surface normal and the halfway vector.
+ * @return {float} The fraction of microfacets aligned to the halfway vector.
+ */
 float GGX(float roughness, float NdotH)
 {
     float roughnessSquared = roughness * roughness;
@@ -31,69 +84,80 @@ float GGX(float roughness, float NdotH)
     return roughnessSquared / (czm_pi * f * f);
 }
 
+/**
+ * Compute the strength of the specular reflection due to direct lighting.
+ *
+ * @param {vec3} normal The surface normal.
+ * @param {vec3} lightDirection The unit vector pointing from the fragment to the light source.
+ * @param {vec3} viewDirection The unit vector pointing from the fragment to the camera.
+ * @param {vec3} halfwayDirection The unit vector pointing from the fragment to halfway between the light source and the camera.
+ * @param {float} roughness The roughness of the material.
+ * @return {float} The strength of the specular reflection.
+ */
+float computeDirectSpecularStrength(vec3 normal, vec3 lightDirection, vec3 viewDirection, vec3 halfwayDirection, float roughness)
+{
+    float NdotL = dot(normal, lightDirection);
+    float NdotV = abs(dot(normal, viewDirection));
+    float G = smithVisibilityGGX(roughness, NdotL, NdotV);
+    float NdotH = clamp(dot(normal, halfwayDirection), 0.0, 1.0);
+    float D = GGX(roughness, NdotH);
+    return G * D;
+}
+
 /**
  * Compute the diffuse and specular contributions using physically based
  * rendering. This function only handles direct lighting.
  * <p>
  * This function only handles the lighting calculations. Metallic/roughness
- * and specular/glossy must be handled separately. See {@czm_pbrMetallicRoughnessMaterial}, {@czm_pbrSpecularGlossinessMaterial} and {@czm_defaultPbrMaterial}
+ * and specular/glossy must be handled separately. See {@MaterialStageFS}
  * </p>
  *
- * @name czm_pbrlighting
+ * @name czm_pbrLighting
  * @glslFunction
  *
- * @param {vec3} positionEC The position of the fragment 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 {vec3} lightDirectionEC Unit vector pointing to the light source in eye coordinates.
- * @param {vec3} lightColorHdr radiance of the light source. This is a HDR value.
- * @param {czm_pbrParameters} The computed PBR parameters.
+ * @param {czm_modelMaterial} The material properties.
  * @return {vec3} The computed HDR color
- *
- * @example
- * czm_pbrParameters pbrParameters = czm_pbrMetallicRoughnessMaterial(
- *  baseColor,
- *  metallic,
- *  roughness
- * );
- * vec3 color = czm_pbrlighting(
- *  positionEC,
- *  normalEC,
- *  lightDirectionEC,
- *  lightColorHdr,
- *  pbrParameters);
  */
-vec3 czm_pbrLighting(
-    vec3 positionEC,
-    vec3 normalEC,
-    vec3 lightDirectionEC,
-    vec3 lightColorHdr,
-    czm_pbrParameters pbrParameters
-)
+vec3 czm_pbrLighting(vec3 viewDirectionEC, vec3 normalEC, vec3 lightDirectionEC, czm_modelMaterial material)
 {
-    vec3 v = -normalize(positionEC);
-    vec3 l = normalize(lightDirectionEC);
-    vec3 h = normalize(v + l);
-    vec3 n = normalEC;
-    float NdotL = clamp(dot(n, l), 0.001, 1.0);
-    float NdotV = abs(dot(n, v)) + 0.001;
-    float NdotH = clamp(dot(n, h), 0.0, 1.0);
-    float LdotH = clamp(dot(l, h), 0.0, 1.0);
-    float VdotH = clamp(dot(v, h), 0.0, 1.0);
+    vec3 halfwayDirectionEC = normalize(viewDirectionEC + lightDirectionEC);
+    float VdotH = clamp(dot(viewDirectionEC, halfwayDirectionEC), 0.0, 1.0);
+    float NdotL = clamp(dot(normalEC, lightDirectionEC), 0.001, 1.0);
 
-    vec3 f0 = pbrParameters.f0;
-    float reflectance = max(max(f0.r, f0.g), f0.b);
+    vec3 f0 = material.specular;
+    float reflectance = czm_maximumComponent(f0);
+    // Typical dielectrics will have reflectance 0.04, so f90 will be 1.0.
+    // In this case, at grazing angle, all incident energy is reflected.
     vec3 f90 = vec3(clamp(reflectance * 25.0, 0.0, 1.0));
     vec3 F = fresnelSchlick2(f0, f90, VdotH);
 
-    float alpha = pbrParameters.roughness;
-    float G = smithVisibilityGGX(alpha, NdotL, NdotV);
-    float D = GGX(alpha, NdotH);
-    vec3 specularContribution = F * G * D / (4.0 * NdotL * NdotV);
+    #if defined(USE_SPECULAR)
+        F *= material.specularWeight;
+    #endif
+
+    float alpha = material.roughness;
+    #ifdef USE_ANISOTROPY
+        mat3 tbn = mat3(material.anisotropicT, material.anisotropicB, normalEC);
+        vec3 lightDirection = lightDirectionEC * tbn;
+        vec3 viewDirection = viewDirectionEC * tbn;
+        vec3 halfwayDirection = halfwayDirectionEC * tbn;
+        float anisotropyStrength = material.anisotropyStrength;
+        float tangentialRoughness = mix(alpha, 1.0, anisotropyStrength * anisotropyStrength);
+        float G = smithVisibilityGGX_anisotropic(alpha, tangentialRoughness, lightDirection, viewDirection);
+        float D = GGX_anisotropic(alpha, tangentialRoughness, halfwayDirection);
+        vec3 specularContribution = F * G * D;
+    #else
+        float specularStrength = computeDirectSpecularStrength(normalEC, lightDirectionEC, viewDirectionEC, halfwayDirectionEC, alpha);
+        vec3 specularContribution = F * specularStrength;
+    #endif
 
-    vec3 diffuseColor = pbrParameters.diffuseColor;
+    vec3 diffuseColor = material.diffuse;
     // F here represents the specular contribution
     vec3 diffuseContribution = (1.0 - F) * lambertianDiffuse(diffuseColor);
 
     // Lo = (diffuse + specular) * Li * NdotL
-    return (diffuseContribution + specularContribution) * NdotL * lightColorHdr;
+    return (diffuseContribution + specularContribution) * NdotL;
 }

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

@@ -6,9 +6,42 @@ export default "vec3 lambertianDiffuse(vec3 diffuseColor)\n\
 \n\
 vec3 fresnelSchlick2(vec3 f0, vec3 f90, float VdotH)\n\
 {\n\
-    return f0 + (f90 - f0) * pow(clamp(1.0 - VdotH, 0.0, 1.0), 5.0);\n\
+    float versine = 1.0 - VdotH;\n\
+    // pow(versine, 5.0) is slow. See https://stackoverflow.com/a/68793086/10082269\n\
+    float versineSquared = versine * versine;\n\
+    return f0 + (f90 - f0) * versineSquared * versineSquared * versine;\n\
 }\n\
 \n\
+#ifdef USE_ANISOTROPY\n\
+/**\n\
+ * @param {float} roughness Material roughness (along the anisotropy bitangent)\n\
+ * @param {float} tangentialRoughness Anisotropic roughness (along the anisotropy tangent)\n\
+ * @param {vec3} lightDirection The direction from the fragment to the light source, transformed to tangent-bitangent-normal coordinates\n\
+ * @param {vec3} viewDirection The direction from the fragment to the camera, transformed to tangent-bitangent-normal coordinates\n\
+ */\n\
+float smithVisibilityGGX_anisotropic(float roughness, float tangentialRoughness, vec3 lightDirection, vec3 viewDirection)\n\
+{\n\
+    vec3 roughnessScale = vec3(tangentialRoughness, roughness, 1.0);\n\
+    float GGXV = lightDirection.z * length(roughnessScale * viewDirection);\n\
+    float GGXL = viewDirection.z * length(roughnessScale * lightDirection);\n\
+    float v = 0.5 / (GGXV + GGXL);\n\
+    return clamp(v, 0.0, 1.0);\n\
+}\n\
+\n\
+/**\n\
+ * @param {float} roughness Material roughness (along the anisotropy bitangent)\n\
+ * @param {float} tangentialRoughness Anisotropic roughness (along the anisotropy tangent)\n\
+ * @param {vec3} halfwayDirection The unit vector halfway between light and view directions, transformed to tangent-bitangent-normal coordinates\n\
+ */\n\
+float GGX_anisotropic(float roughness, float tangentialRoughness, vec3 halfwayDirection)\n\
+{\n\
+    float roughnessSquared = roughness * tangentialRoughness;\n\
+    vec3 f = halfwayDirection * vec3(roughness, tangentialRoughness, roughnessSquared);\n\
+    float w2 = roughnessSquared / dot(f, f);\n\
+    return roughnessSquared * w2 * w2 / czm_pi;\n\
+}\n\
+#endif\n\
+\n\
 float smithVisibilityG1(float NdotV, float roughness)\n\
 {\n\
     // this is the k value for direct lighting.\n\
@@ -17,14 +50,34 @@ float smithVisibilityG1(float NdotV, float roughness)\n\
     return NdotV / (NdotV * (1.0 - k) + k);\n\
 }\n\
 \n\
+/**\n\
+ * Estimate the geometric self-shadowing of the microfacets in a surface,\n\
+ * using the Schlick GGX approximation of a Smith visibility function.\n\
+ *\n\
+ * @param {float} roughness The roughness of the material.\n\
+ * @param {float} NdotL The cosine of the angle between the surface normal and the direction to the light source.\n\
+ * @param {float} NdotV The cosine of the angle between the surface normal and the direction to the camera.\n\
+ */\n\
 float smithVisibilityGGX(float roughness, float NdotL, float NdotV)\n\
 {\n\
+    // Avoid divide-by-zero errors\n\
+    NdotL = clamp(NdotL, 0.001, 1.0);\n\
+    NdotV += 0.001;\n\
     return (\n\
         smithVisibilityG1(NdotL, roughness) *\n\
         smithVisibilityG1(NdotV, roughness)\n\
-    );\n\
+    ) / (4.0 * NdotL * NdotV);\n\
 }\n\
 \n\
+/**\n\
+ * Estimate the fraction of the microfacets in a surface that are aligned with \n\
+ * the halfway vector, which is aligned halfway between the directions from\n\
+ * the fragment to the camera and from the fragment to the light source.\n\
+ *\n\
+ * @param {float} roughness The roughness of the material.\n\
+ * @param {float} NdotH The cosine of the angle between the surface normal and the halfway vector.\n\
+ * @return {float} The fraction of microfacets aligned to the halfway vector.\n\
+ */\n\
 float GGX(float roughness, float NdotH)\n\
 {\n\
     float roughnessSquared = roughness * roughness;\n\
@@ -32,70 +85,81 @@ float GGX(float roughness, float NdotH)\n\
     return roughnessSquared / (czm_pi * f * f);\n\
 }\n\
 \n\
+/**\n\
+ * Compute the strength of the specular reflection due to direct lighting.\n\
+ *\n\
+ * @param {vec3} normal The surface normal.\n\
+ * @param {vec3} lightDirection The unit vector pointing from the fragment to the light source.\n\
+ * @param {vec3} viewDirection The unit vector pointing from the fragment to the camera.\n\
+ * @param {vec3} halfwayDirection The unit vector pointing from the fragment to halfway between the light source and the camera.\n\
+ * @param {float} roughness The roughness of the material.\n\
+ * @return {float} The strength of the specular reflection.\n\
+ */\n\
+float computeDirectSpecularStrength(vec3 normal, vec3 lightDirection, vec3 viewDirection, vec3 halfwayDirection, float roughness)\n\
+{\n\
+    float NdotL = dot(normal, lightDirection);\n\
+    float NdotV = abs(dot(normal, viewDirection));\n\
+    float G = smithVisibilityGGX(roughness, NdotL, NdotV);\n\
+    float NdotH = clamp(dot(normal, halfwayDirection), 0.0, 1.0);\n\
+    float D = GGX(roughness, NdotH);\n\
+    return G * D;\n\
+}\n\
+\n\
 /**\n\
  * Compute the diffuse and specular contributions using physically based\n\
  * rendering. This function only handles direct lighting.\n\
  * <p>\n\
  * This function only handles the lighting calculations. Metallic/roughness\n\
- * and specular/glossy must be handled separately. See {@czm_pbrMetallicRoughnessMaterial}, {@czm_pbrSpecularGlossinessMaterial} and {@czm_defaultPbrMaterial}\n\
+ * and specular/glossy must be handled separately. See {@MaterialStageFS}\n\
  * </p>\n\
  *\n\
- * @name czm_pbrlighting\n\
+ * @name czm_pbrLighting\n\
  * @glslFunction\n\
  *\n\
- * @param {vec3} positionEC The position of the fragment 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 {vec3} lightDirectionEC Unit vector pointing to the light source in eye coordinates.\n\
- * @param {vec3} lightColorHdr radiance of the light source. This is a HDR value.\n\
- * @param {czm_pbrParameters} The computed PBR parameters.\n\
+ * @param {czm_modelMaterial} The material properties.\n\
  * @return {vec3} The computed HDR color\n\
- *\n\
- * @example\n\
- * czm_pbrParameters pbrParameters = czm_pbrMetallicRoughnessMaterial(\n\
- *  baseColor,\n\
- *  metallic,\n\
- *  roughness\n\
- * );\n\
- * vec3 color = czm_pbrlighting(\n\
- *  positionEC,\n\
- *  normalEC,\n\
- *  lightDirectionEC,\n\
- *  lightColorHdr,\n\
- *  pbrParameters);\n\
  */\n\
-vec3 czm_pbrLighting(\n\
-    vec3 positionEC,\n\
-    vec3 normalEC,\n\
-    vec3 lightDirectionEC,\n\
-    vec3 lightColorHdr,\n\
-    czm_pbrParameters pbrParameters\n\
-)\n\
+vec3 czm_pbrLighting(vec3 viewDirectionEC, vec3 normalEC, vec3 lightDirectionEC, czm_modelMaterial material)\n\
 {\n\
-    vec3 v = -normalize(positionEC);\n\
-    vec3 l = normalize(lightDirectionEC);\n\
-    vec3 h = normalize(v + l);\n\
-    vec3 n = normalEC;\n\
-    float NdotL = clamp(dot(n, l), 0.001, 1.0);\n\
-    float NdotV = abs(dot(n, v)) + 0.001;\n\
-    float NdotH = clamp(dot(n, h), 0.0, 1.0);\n\
-    float LdotH = clamp(dot(l, h), 0.0, 1.0);\n\
-    float VdotH = clamp(dot(v, h), 0.0, 1.0);\n\
+    vec3 halfwayDirectionEC = normalize(viewDirectionEC + lightDirectionEC);\n\
+    float VdotH = clamp(dot(viewDirectionEC, halfwayDirectionEC), 0.0, 1.0);\n\
+    float NdotL = clamp(dot(normalEC, lightDirectionEC), 0.001, 1.0);\n\
 \n\
-    vec3 f0 = pbrParameters.f0;\n\
-    float reflectance = max(max(f0.r, f0.g), f0.b);\n\
+    vec3 f0 = material.specular;\n\
+    float reflectance = czm_maximumComponent(f0);\n\
+    // Typical dielectrics will have reflectance 0.04, so f90 will be 1.0.\n\
+    // In this case, at grazing angle, all incident energy is reflected.\n\
     vec3 f90 = vec3(clamp(reflectance * 25.0, 0.0, 1.0));\n\
     vec3 F = fresnelSchlick2(f0, f90, VdotH);\n\
 \n\
-    float alpha = pbrParameters.roughness;\n\
-    float G = smithVisibilityGGX(alpha, NdotL, NdotV);\n\
-    float D = GGX(alpha, NdotH);\n\
-    vec3 specularContribution = F * G * D / (4.0 * NdotL * NdotV);\n\
+    #if defined(USE_SPECULAR)\n\
+        F *= material.specularWeight;\n\
+    #endif\n\
+\n\
+    float alpha = material.roughness;\n\
+    #ifdef USE_ANISOTROPY\n\
+        mat3 tbn = mat3(material.anisotropicT, material.anisotropicB, normalEC);\n\
+        vec3 lightDirection = lightDirectionEC * tbn;\n\
+        vec3 viewDirection = viewDirectionEC * tbn;\n\
+        vec3 halfwayDirection = halfwayDirectionEC * tbn;\n\
+        float anisotropyStrength = material.anisotropyStrength;\n\
+        float tangentialRoughness = mix(alpha, 1.0, anisotropyStrength * anisotropyStrength);\n\
+        float G = smithVisibilityGGX_anisotropic(alpha, tangentialRoughness, lightDirection, viewDirection);\n\
+        float D = GGX_anisotropic(alpha, tangentialRoughness, halfwayDirection);\n\
+        vec3 specularContribution = F * G * D;\n\
+    #else\n\
+        float specularStrength = computeDirectSpecularStrength(normalEC, lightDirectionEC, viewDirectionEC, halfwayDirectionEC, alpha);\n\
+        vec3 specularContribution = F * specularStrength;\n\
+    #endif\n\
 \n\
-    vec3 diffuseColor = pbrParameters.diffuseColor;\n\
+    vec3 diffuseColor = material.diffuse;\n\
     // F here represents the specular contribution\n\
     vec3 diffuseContribution = (1.0 - F) * lambertianDiffuse(diffuseColor);\n\
 \n\
     // Lo = (diffuse + specular) * Li * NdotL\n\
-    return (diffuseContribution + specularContribution) * NdotL * lightColorHdr;\n\
+    return (diffuseContribution + specularContribution) * NdotL;\n\
 }\n\
 ";

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

@@ -10,7 +10,7 @@
  * @property {vec3} normalEC Unperturbed surface normal in eye coordinates.
  * @property {mat3} tangentToEyeMatrix Matrix for converting a tangent space normal to eye space.
  * @property {vec3} positionToEyeEC Vector from the fragment to the eye in eye coordinates.  The magnitude is the distance in meters from the fragment to the eye.
- * @property {float} height The height of the terrain in meters above or below the WGS84 ellipsoid.  Only available for globe materials.
+ * @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.
  */

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

@@ -11,7 +11,7 @@ export default "/**\n\
  * @property {vec3} normalEC Unperturbed surface normal in eye coordinates.\n\
  * @property {mat3} tangentToEyeMatrix Matrix for converting a tangent space normal to eye space.\n\
  * @property {vec3} positionToEyeEC Vector from the fragment to the eye in eye coordinates.  The magnitude is the distance in meters from the fragment to the eye.\n\
- * @property {float} height The height of the terrain in meters above or below the WGS84 ellipsoid.  Only available for globe materials.\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\
  */\n\

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

@@ -10,6 +10,7 @@
  * @name czm_modelMaterial
  * @glslStruct
  *
+ * @property {vec4} baseColor The base color of the material.
  * @property {vec3} diffuse Incoming light that scatters evenly in all directions.
  * @property {float} alpha Alpha of this material. 0.0 is completely transparent; 1.0 is completely opaque.
  * @property {vec3} specular Color of reflected light at normal incidence in PBR materials. This is sometimes referred to as f0 in the literature.
@@ -19,6 +20,7 @@
  * @property {vec3} emissive Light emitted by the material equally in all directions. The default is vec3(0.0), which emits no light.
  */
 struct czm_modelMaterial {
+    vec4 baseColor;
     vec3 diffuse;
     float alpha;
     vec3 specular;
@@ -26,4 +28,18 @@ struct czm_modelMaterial {
     vec3 normalEC;
     float occlusion;
     vec3 emissive;
+#ifdef USE_SPECULAR
+    float specularWeight;
+#endif
+#ifdef USE_ANISOTROPY
+    vec3 anisotropicT;
+    vec3 anisotropicB;
+    float anisotropyStrength;
+#endif
+#ifdef USE_CLEARCOAT
+    float clearcoatFactor;
+    float clearcoatRoughness;
+    vec3 clearcoatNormal;
+    // Add clearcoatF0 when KHR_materials_ior is implemented
+#endif
 };

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

@@ -11,6 +11,7 @@ export default "/**\n\
  * @name czm_modelMaterial\n\
  * @glslStruct\n\
  *\n\
+ * @property {vec4} baseColor The base color of the material.\n\
  * @property {vec3} diffuse Incoming light that scatters evenly in all directions.\n\
  * @property {float} alpha Alpha of this material. 0.0 is completely transparent; 1.0 is completely opaque.\n\
  * @property {vec3} specular Color of reflected light at normal incidence in PBR materials. This is sometimes referred to as f0 in the literature.\n\
@@ -20,6 +21,7 @@ export default "/**\n\
  * @property {vec3} emissive Light emitted by the material equally in all directions. The default is vec3(0.0), which emits no light.\n\
  */\n\
 struct czm_modelMaterial {\n\
+    vec4 baseColor;\n\
     vec3 diffuse;\n\
     float alpha;\n\
     vec3 specular;\n\
@@ -27,5 +29,19 @@ struct czm_modelMaterial {\n\
     vec3 normalEC;\n\
     float occlusion;\n\
     vec3 emissive;\n\
+#ifdef USE_SPECULAR\n\
+    float specularWeight;\n\
+#endif\n\
+#ifdef USE_ANISOTROPY\n\
+    vec3 anisotropicT;\n\
+    vec3 anisotropicB;\n\
+    float anisotropyStrength;\n\
+#endif\n\
+#ifdef USE_CLEARCOAT\n\
+    float clearcoatFactor;\n\
+    float clearcoatRoughness;\n\
+    vec3 clearcoatNormal;\n\
+    // Add clearcoatF0 when KHR_materials_ior is implemented\n\
+#endif\n\
 };\n\
 ";

package/Source/Shaders/EllipsoidFS.glsl

@@ -12,7 +12,7 @@ vec4 computeEllipsoidColor(czm_ray ray, float intersection, float side)
     vec3 normalMC = geodeticNormal * side;              // normalized surface normal (always facing the viewer) in model coordinates
     vec3 normalEC = normalize(czm_normal * normalMC);   // normalized surface normal in eye coordinates
 
-    vec2 st = czm_ellipsoidWgs84TextureCoordinates(sphericalNormal);
+    vec2 st = czm_ellipsoidTextureCoordinates(sphericalNormal);
     vec3 positionToEyeEC = -positionEC;
 
     czm_materialInput materialInput;

package/Source/Shaders/EllipsoidFS.js

@@ -13,7 +13,7 @@ vec4 computeEllipsoidColor(czm_ray ray, float intersection, float side)\n\
     vec3 normalMC = geodeticNormal * side;              // normalized surface normal (always facing the viewer) in model coordinates\n\
     vec3 normalEC = normalize(czm_normal * normalMC);   // normalized surface normal in eye coordinates\n\
 \n\
-    vec2 st = czm_ellipsoidWgs84TextureCoordinates(sphericalNormal);\n\
+    vec2 st = czm_ellipsoidTextureCoordinates(sphericalNormal);\n\
     vec3 positionToEyeEC = -positionEC;\n\
 \n\
     czm_materialInput materialInput;\n\

package/Source/Shaders/GlobeFS.glsl

@@ -207,7 +207,7 @@ vec4 sampleAndBlend(
 
 #ifdef APPLY_COLOR_TO_ALPHA
     vec3 colorDiff = abs(color.rgb - colorToAlpha.rgb);
-    colorDiff.r = max(max(colorDiff.r, colorDiff.g), colorDiff.b);
+    colorDiff.r = czm_maximumComponent(colorDiff);
     alpha = czm_branchFreeTernary(colorDiff.r < colorToAlpha.a, 0.0, alpha);
 #endif
 
@@ -374,8 +374,8 @@ void main()
     {
         mat3 enuToEye = czm_eastNorthUpToEyeCoordinates(v_positionMC, normalEC);
 
-        vec2 ellipsoidTextureCoordinates = czm_ellipsoidWgs84TextureCoordinates(normalMC);
-        vec2 ellipsoidFlippedTextureCoordinates = czm_ellipsoidWgs84TextureCoordinates(normalMC.zyx);
+        vec2 ellipsoidTextureCoordinates = czm_ellipsoidTextureCoordinates(normalMC);
+        vec2 ellipsoidFlippedTextureCoordinates = czm_ellipsoidTextureCoordinates(normalMC.zyx);
 
         vec2 textureCoordinates = mix(ellipsoidTextureCoordinates, ellipsoidFlippedTextureCoordinates, czm_morphTime * smoothstep(0.9, 0.95, normalMC.z));
 

package/Source/Shaders/GlobeFS.js

@@ -208,7 +208,7 @@ vec4 sampleAndBlend(\n\
 \n\
 #ifdef APPLY_COLOR_TO_ALPHA\n\
     vec3 colorDiff = abs(color.rgb - colorToAlpha.rgb);\n\
-    colorDiff.r = max(max(colorDiff.r, colorDiff.g), colorDiff.b);\n\
+    colorDiff.r = czm_maximumComponent(colorDiff);\n\
     alpha = czm_branchFreeTernary(colorDiff.r < colorToAlpha.a, 0.0, alpha);\n\
 #endif\n\
 \n\
@@ -375,8 +375,8 @@ void main()\n\
     {\n\
         mat3 enuToEye = czm_eastNorthUpToEyeCoordinates(v_positionMC, normalEC);\n\
 \n\
-        vec2 ellipsoidTextureCoordinates = czm_ellipsoidWgs84TextureCoordinates(normalMC);\n\
-        vec2 ellipsoidFlippedTextureCoordinates = czm_ellipsoidWgs84TextureCoordinates(normalMC.zyx);\n\
+        vec2 ellipsoidTextureCoordinates = czm_ellipsoidTextureCoordinates(normalMC);\n\
+        vec2 ellipsoidFlippedTextureCoordinates = czm_ellipsoidTextureCoordinates(normalMC.zyx);\n\
 \n\
         vec2 textureCoordinates = mix(ellipsoidTextureCoordinates, ellipsoidFlippedTextureCoordinates, czm_morphTime * smoothstep(0.9, 0.95, normalMC.z));\n\
 \n\