@cesium/engine 9.2.0 → 10.1.0

package/Source/Shaders/GlobeFS.js

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

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;
@@ -173,11 +175,12 @@ vec3 sampleSpecularEnvironment(vec3 cubeDir, float roughness)
         return czm_sampleOctahedralProjection(czm_specularEnvironmentMaps, czm_specularEnvironmentMapSize, cubeDir, lod, maxLod);
     #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);
@@ -202,34 +205,31 @@ vec3 textureIBL(
     vec3 lightDirectionEC,
     czm_modelMaterial material
 ) {
-    // Find the direction in which to sample the environment map
-    vec3 cubeDir = normalize(model_iblReferenceFrameMatrix * normalize(reflect(-viewDirectionEC, normalEC)));
-
     #ifdef DIFFUSE_IBL
-        vec3 diffuseContribution = computeDiffuseIBL(cubeDir) * material.diffuse;
+        vec3 normalMC = normalize(model_iblReferenceFrameMatrix * normalEC);
+        vec3 diffuseContribution = computeDiffuseIBL(normalMC) * material.diffuse;
     #else
         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 bendFactor = 1.0 - material.anisotropyStrength * (1.0 - material.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 reflectMC = normalize(model_iblReferenceFrameMatrix * reflectEC);
+        float NdotV = clamp(dot(normalEC, viewDirectionEC), 0.0, 1.0);
         vec3 f0 = material.specular;
-        vec3 specularContribution = computeSpecularIBL(cubeDir, NdotV, VdotH, f0, roughness);
+        vec3 specularContribution = computeSpecularIBL(reflectMC, NdotV, f0, material.roughness);
     #else
         vec3 specularContribution = vec3(0.0); 
     #endif

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\
@@ -174,11 +176,12 @@ vec3 sampleSpecularEnvironment(vec3 cubeDir, float roughness)\n\
         return czm_sampleOctahedralProjection(czm_specularEnvironmentMaps, czm_specularEnvironmentMapSize, cubeDir, lod, maxLod);\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\
@@ -203,34 +206,31 @@ vec3 textureIBL(\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\
-\n\
     #ifdef DIFFUSE_IBL\n\
-        vec3 diffuseContribution = computeDiffuseIBL(cubeDir) * material.diffuse;\n\
+        vec3 normalMC = normalize(model_iblReferenceFrameMatrix * normalEC);\n\
+        vec3 diffuseContribution = computeDiffuseIBL(normalMC) * material.diffuse;\n\
     #else\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 bendFactor = 1.0 - material.anisotropyStrength * (1.0 - material.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 reflectMC = normalize(model_iblReferenceFrameMatrix * reflectEC);\n\
+        float NdotV = clamp(dot(normalEC, viewDirectionEC), 0.0, 1.0);\n\
         vec3 f0 = material.specular;\n\
-        vec3 specularContribution = computeSpecularIBL(cubeDir, NdotV, VdotH, f0, roughness);\n\
+        vec3 specularContribution = computeSpecularIBL(reflectMC, NdotV, f0, material.roughness);\n\
     #else\n\
         vec3 specularContribution = vec3(0.0); \n\
     #endif\n\

package/Source/Shaders/Model/LightingStageFS.glsl

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

package/Source/Shaders/Model/LightingStageFS.js

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

package/Source/Shaders/Model/MaterialStageFS.glsl

@@ -65,7 +65,11 @@ NormalInfo getNormalInfo(ProcessedAttributes attributes)
     #ifdef HAS_NORMAL_TEXTURE
         mat3 tbn = mat3(tangent, bitangent, geometryNormal);
         vec3 normalSample = texture(u_normalTexture, normalTexCoords).rgb;
-        vec3 normal = normalize(tbn * (2.0 * normalSample - 1.0));
+        normalSample = 2.0 * normalSample - 1.0;
+        #ifdef HAS_NORMAL_TEXTURE_SCALE
+            normalSample.xy *= u_normalTextureScale;
+        #endif
+        vec3 normal = normalize(tbn * normalSample);
     #else
         vec3 normal = geometryNormal;
     #endif
@@ -105,10 +109,12 @@ vec3 getNormalFromTexture(ProcessedAttributes attributes, vec3 geometryNormal)
     #endif
 
     mat3 tbn = mat3(t, b, geometryNormal);
-    vec3 n = texture(u_normalTexture, normalTexCoords).rgb;
-    vec3 textureNormal = normalize(tbn * (2.0 * n - 1.0));
-
-    return textureNormal;
+    vec3 normalSample = texture(u_normalTexture, normalTexCoords).rgb;
+    normalSample = 2.0 * normalSample - 1.0;
+    #ifdef HAS_NORMAL_TEXTURE_SCALE
+        normalSample.xy *= u_normalTextureScale;
+    #endif
+    return normalize(tbn * normalSample);
 }
 #endif
 
@@ -131,10 +137,12 @@ vec3 getClearcoatNormalFromTexture(ProcessedAttributes attributes, vec3 geometry
     #endif
 
     mat3 tbn = mat3(t, b, geometryNormal);
-    vec3 n = texture(u_clearcoatNormalTexture, normalTexCoords).rgb;
-    vec3 textureNormal = normalize(tbn * (2.0 * n - 1.0));
-
-    return textureNormal;
+    vec3 normalSample = texture(u_clearcoatNormalTexture, normalTexCoords).rgb;
+    normalSample = 2.0 * normalSample - 1.0;
+    #ifdef HAS_CLEARCOAT_NORMAL_TEXTURE_SCALE
+        normalSample.xy *= u_clearcoatNormalTextureScale;
+    #endif
+    return normalize(tbn * normalSample);
 }
 #endif
 
@@ -250,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)
@@ -264,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
@@ -280,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
@@ -288,16 +295,15 @@ float setMetallicRoughness(inout czm_modelMaterial material)
 
     // dielectrics use f0 = 0.04, metals use albedo as f0
     const vec3 REFLECTANCE_DIELECTRIC = vec3(0.04);
-    vec3 f0 = mix(REFLECTANCE_DIELECTRIC, material.diffuse, metalness);
+    vec3 f0 = mix(REFLECTANCE_DIELECTRIC, material.baseColor.rgb, metalness);
 
     material.specular = f0;
 
     // diffuse only applies to dielectrics.
-    material.diffuse = material.diffuse * (1.0 - f0) * (1.0 - metalness);
+    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;
 }
@@ -341,7 +347,7 @@ void setSpecular(inout czm_modelMaterial material, in float metalness)
     material.specularWeight = specularWeight;
     vec3 f0 = material.specular;
     vec3 dielectricSpecularF0 = min(f0 * specularColorFactor, vec3(1.0));
-    material.specular = mix(dielectricSpecularF0, material.diffuse, metalness);
+    material.specular = mix(dielectricSpecularF0, material.baseColor.rgb, metalness);
 }
 #endif
 #ifdef USE_ANISOTROPY
@@ -410,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
@@ -450,12 +455,12 @@ void materialStage(inout czm_modelMaterial material, ProcessedAttributes attribu
         baseColorWithAlpha *= color;
     #endif
 
-    material.diffuse = baseColorWithAlpha.rgb;
-    material.alpha = baseColorWithAlpha.a;
-
     #ifdef USE_CPU_STYLING
-        material.diffuse = blend(material.diffuse, feature.color.rgb, model_colorBlend);
+        baseColorWithAlpha.rgb = blend(baseColorWithAlpha.rgb, feature.color.rgb, model_colorBlend);
     #endif
+    material.baseColor = baseColorWithAlpha;
+    material.diffuse = baseColorWithAlpha.rgb;
+    material.alpha = baseColorWithAlpha.a;
 
     #ifdef HAS_OCCLUSION_TEXTURE
         vec2 occlusionTexCoords = TEXCOORD_OCCLUSION;

package/Source/Shaders/Model/MaterialStageFS.js

@@ -66,7 +66,11 @@ NormalInfo getNormalInfo(ProcessedAttributes attributes)\n\
     #ifdef HAS_NORMAL_TEXTURE\n\
         mat3 tbn = mat3(tangent, bitangent, geometryNormal);\n\
         vec3 normalSample = texture(u_normalTexture, normalTexCoords).rgb;\n\
-        vec3 normal = normalize(tbn * (2.0 * normalSample - 1.0));\n\
+        normalSample = 2.0 * normalSample - 1.0;\n\
+        #ifdef HAS_NORMAL_TEXTURE_SCALE\n\
+            normalSample.xy *= u_normalTextureScale;\n\
+        #endif\n\
+        vec3 normal = normalize(tbn * normalSample);\n\
     #else\n\
         vec3 normal = geometryNormal;\n\
     #endif\n\
@@ -106,10 +110,12 @@ vec3 getNormalFromTexture(ProcessedAttributes attributes, vec3 geometryNormal)\n
     #endif\n\
 \n\
     mat3 tbn = mat3(t, b, geometryNormal);\n\
-    vec3 n = texture(u_normalTexture, normalTexCoords).rgb;\n\
-    vec3 textureNormal = normalize(tbn * (2.0 * n - 1.0));\n\
-\n\
-    return textureNormal;\n\
+    vec3 normalSample = texture(u_normalTexture, normalTexCoords).rgb;\n\
+    normalSample = 2.0 * normalSample - 1.0;\n\
+    #ifdef HAS_NORMAL_TEXTURE_SCALE\n\
+        normalSample.xy *= u_normalTextureScale;\n\
+    #endif\n\
+    return normalize(tbn * normalSample);\n\
 }\n\
 #endif\n\
 \n\
@@ -132,10 +138,12 @@ vec3 getClearcoatNormalFromTexture(ProcessedAttributes attributes, vec3 geometry
     #endif\n\
 \n\
     mat3 tbn = mat3(t, b, geometryNormal);\n\
-    vec3 n = texture(u_clearcoatNormalTexture, normalTexCoords).rgb;\n\
-    vec3 textureNormal = normalize(tbn * (2.0 * n - 1.0));\n\
-\n\
-    return textureNormal;\n\
+    vec3 normalSample = texture(u_clearcoatNormalTexture, normalTexCoords).rgb;\n\
+    normalSample = 2.0 * normalSample - 1.0;\n\
+    #ifdef HAS_CLEARCOAT_NORMAL_TEXTURE_SCALE\n\
+        normalSample.xy *= u_clearcoatNormalTextureScale;\n\
+    #endif\n\
+    return normalize(tbn * normalSample);\n\
 }\n\
 #endif\n\
 \n\
@@ -251,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\
@@ -265,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\
@@ -281,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\
@@ -289,16 +296,15 @@ float setMetallicRoughness(inout czm_modelMaterial material)\n\
 \n\
     // dielectrics use f0 = 0.04, metals use albedo as f0\n\
     const vec3 REFLECTANCE_DIELECTRIC = vec3(0.04);\n\
-    vec3 f0 = mix(REFLECTANCE_DIELECTRIC, material.diffuse, metalness);\n\
+    vec3 f0 = mix(REFLECTANCE_DIELECTRIC, material.baseColor.rgb, metalness);\n\
 \n\
     material.specular = f0;\n\
 \n\
     // diffuse only applies to dielectrics.\n\
-    material.diffuse = material.diffuse * (1.0 - f0) * (1.0 - metalness);\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\
@@ -342,7 +348,7 @@ void setSpecular(inout czm_modelMaterial material, in float metalness)\n\
     material.specularWeight = specularWeight;\n\
     vec3 f0 = material.specular;\n\
     vec3 dielectricSpecularF0 = min(f0 * specularColorFactor, vec3(1.0));\n\
-    material.specular = mix(dielectricSpecularF0, material.diffuse, metalness);\n\
+    material.specular = mix(dielectricSpecularF0, material.baseColor.rgb, metalness);\n\
 }\n\
 #endif\n\
 #ifdef USE_ANISOTROPY\n\
@@ -411,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\
@@ -450,13 +455,13 @@ void materialStage(inout czm_modelMaterial material, ProcessedAttributes attribu
         #endif\n\
         baseColorWithAlpha *= color;\n\
     #endif\n\
-\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\
+        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 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;
 }