@cesium/engine 9.1.0 → 9.2.0

package/Source/Scene/ModelComponents.js

@@ -1337,10 +1337,151 @@ SpecularGlossiness.DEFAULT_SPECULAR_FACTOR = Cartesian3.ONE;
  */
 SpecularGlossiness.DEFAULT_GLOSSINESS_FACTOR = 1.0;
 
+function Specular() {
+  /**
+   * The specular factor.
+   *
+   * @type {number}
+   * @default 1.0
+   * @private
+   */
+  this.specularFactor = Specular.DEFAULT_SPECULAR_FACTOR;
+
+  /**
+   * The specular texture reader.
+   *
+   * @type {ModelComponents.TextureReader}
+   * @private
+   */
+  this.specularTexture = undefined;
+
+  /**
+   * The specular color factor.
+   *
+   * @type {Cartesian3}
+   * @default new Cartesian3(1.0, 1.0, 1.0)
+   * @private
+   */
+  this.specularColorFactor = Cartesian3.clone(
+    Specular.DEFAULT_SPECULAR_COLOR_FACTOR
+  );
+
+  /**
+   * The specular color texture reader.
+   *
+   * @type {ModelComponents.TextureReader}
+   * @private
+   */
+  this.specularColorTexture = undefined;
+}
+
+/**
+ * @private
+ */
+Specular.DEFAULT_SPECULAR_FACTOR = 1.0;
+
+/**
+ * @private
+ */
+Specular.DEFAULT_SPECULAR_COLOR_FACTOR = Cartesian3.ONE;
+
+function Anisotropy() {
+  /**
+   * The anisotropy strength.
+   *
+   * @type {number}
+   * @default 0.0
+   * @private
+   */
+  this.anisotropyStrength = Anisotropy.DEFAULT_ANISOTROPY_STRENGTH;
+
+  /**
+   * The rotation of the anisotropy in tangent, bitangent space,
+   * measured in radians counter-clockwise from the tangent.
+   *
+   * @type {number}
+   * @default 0.0
+   * @private
+   */
+  this.anisotropyRotation = Anisotropy.DEFAULT_ANISOTROPY_ROTATION;
+
+  /**
+   * The anisotropy texture reader.
+   *
+   * @type {ModelComponents.TextureReader}
+   * @private
+   */
+  this.anisotropyTexture = undefined;
+}
+
+/**
+ * @private
+ */
+Anisotropy.DEFAULT_ANISOTROPY_STRENGTH = 0.0;
+
+/**
+ * @private
+ */
+Anisotropy.DEFAULT_ANISOTROPY_ROTATION = 0.0;
+
+function Clearcoat() {
+  /**
+   * The clearcoat layer intensity.
+   *
+   * @type {number}
+   * @default 0.0
+   * @private
+   */
+  this.clearcoatFactor = Clearcoat.DEFAULT_CLEARCOAT_FACTOR;
+
+  /**
+   * The clearcoat layer intensity texture reader.
+   *
+   * @type {ModelComponents.TextureReader}
+   * @private
+   */
+  this.clearcoatTexture = undefined;
+
+  /**
+   * The clearcoat layer roughness.
+   *
+   * @type {number}
+   * @default 0.0
+   * @private
+   */
+  this.clearcoatRoughnessFactor = Clearcoat.DEFAULT_CLEARCOAT_ROUGHNESS_FACTOR;
+
+  /**
+   * The clearcoat layer roughness texture.
+   *
+   * @type {ModelComponents.TextureReader}
+   * @private
+   */
+  this.clearcoatRoughnessTexture = undefined;
+
+  /**
+   * The clearcoat normal map texture.
+   *
+   * @type {ModelComponents.TextureReader}
+   * @private
+   */
+  this.clearcoatNormalTexture = undefined;
+}
+
+/**
+ * @private
+ */
+Clearcoat.DEFAULT_CLEARCOAT_FACTOR = 0.0;
+
+/**
+ * @private
+ */
+Clearcoat.DEFAULT_CLEARCOAT_ROUGHNESS_FACTOR = 0.0;
+
 /**
  * The material appearance of a primitive.
  *
- * @alias ModelComponent.Material
+ * @alias ModelComponents.Material
  * @constructor
  *
  * @private
@@ -1362,6 +1503,30 @@ function Material() {
    */
   this.specularGlossiness = undefined;
 
+  /**
+   * Material properties for the PBR specular shading model.
+   *
+   * @type {ModelComponents.Specular}
+   * @private
+   */
+  this.specular = undefined;
+
+  /**
+   * Material properties for the PBR anisotropy shading model.
+   *
+   * @type {ModelComponents.Anisotropy}
+   * @private
+   */
+  this.anisotropy = undefined;
+
+  /**
+   * Material properties for the PBR clearcoat shading model.
+   *
+   * @type {ModelComponents.Clearcoat}
+   * @private
+   */
+  this.clearcoat = undefined;
+
   /**
    * The emissive texture reader.
    *
@@ -1461,6 +1626,9 @@ ModelComponents.Components = Components;
 ModelComponents.TextureReader = TextureReader;
 ModelComponents.MetallicRoughness = MetallicRoughness;
 ModelComponents.SpecularGlossiness = SpecularGlossiness;
+ModelComponents.Specular = Specular;
+ModelComponents.Anisotropy = Anisotropy;
+ModelComponents.Clearcoat = Clearcoat;
 ModelComponents.Material = Material;
 
 export default ModelComponents;

package/Source/Scene/PickDepth.js

@@ -30,22 +30,30 @@ function updateFramebuffers(pickDepth, context, depthTexture) {
 
 function updateCopyCommands(pickDepth, context, depthTexture) {
   if (!defined(pickDepth._copyDepthCommand)) {
-    const fs =
-      "uniform highp sampler2D u_texture;\n" +
-      "in vec2 v_textureCoordinates;\n" +
-      "void main()\n" +
-      "{\n" +
-      "    out_FragColor = czm_packDepth(texture(u_texture, v_textureCoordinates).r);\n" +
-      "}\n";
-    pickDepth._copyDepthCommand = context.createViewportQuadCommand(fs, {
-      renderState: RenderState.fromCache(),
-      uniformMap: {
-        u_texture: function () {
-          return pickDepth._textureToCopy;
+    pickDepth._copyDepthCommand = context.createViewportQuadCommand(
+      `uniform highp sampler2D colorTexture;
+
+in vec2 v_textureCoordinates;
+
+void main()
+{
+  vec4 globeDepthPacked = texture(czm_globeDepthTexture, v_textureCoordinates);
+  float globeDepth = czm_unpackDepth(globeDepthPacked);
+  float depth = texture(colorTexture, v_textureCoordinates).r;
+  out_FragColor = czm_branchFreeTernary(globeDepth <= 0.0 || globeDepth >= 1.0 || depth < globeDepth && depth > 0.0 && depth < 1.0,
+    czm_packDepth(depth), globeDepthPacked);
+}
+`,
+      {
+        renderState: RenderState.fromCache(),
+        uniformMap: {
+          colorTexture: function () {
+            return pickDepth._textureToCopy;
+          },
         },
-      },
-      owner: pickDepth,
-    });
+        owner: pickDepth,
+      }
+    );
   }
 
   pickDepth._textureToCopy = depthTexture;

package/Source/Scene/ResourceCache.js

@@ -146,8 +146,7 @@ ResourceCache.unload = function (resourceLoader) {
  */
 ResourceCache.getSchemaLoader = function (options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
-  const schema = options.schema;
-  const resource = options.resource;
+  const { schema, resource } = options;
 
   //>>includeStart('debug', pragmas.debug);
   if (defined(schema) === defined(resource)) {
@@ -189,9 +188,7 @@ ResourceCache.getSchemaLoader = function (options) {
  */
 ResourceCache.getEmbeddedBufferLoader = function (options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
-  const parentResource = options.parentResource;
-  const bufferId = options.bufferId;
-  const typedArray = options.typedArray;
+  const { parentResource, bufferId, typedArray } = options;
 
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.object("options.parentResource", parentResource);
@@ -231,7 +228,7 @@ ResourceCache.getEmbeddedBufferLoader = function (options) {
  */
 ResourceCache.getExternalBufferLoader = function (options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
-  const resource = options.resource;
+  const { resource } = options;
 
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.object("options.resource", resource);
@@ -268,10 +265,7 @@ ResourceCache.getExternalBufferLoader = function (options) {
  */
 ResourceCache.getGltfJsonLoader = function (options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
-  const gltfResource = options.gltfResource;
-  const baseResource = options.baseResource;
-  const typedArray = options.typedArray;
-  const gltfJson = options.gltfJson;
+  const { gltfResource, baseResource, typedArray, gltfJson } = options;
 
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.object("options.gltfResource", gltfResource);
@@ -313,10 +307,7 @@ ResourceCache.getGltfJsonLoader = function (options) {
  */
 ResourceCache.getBufferViewLoader = function (options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
-  const gltf = options.gltf;
-  const bufferViewId = options.bufferViewId;
-  const gltfResource = options.gltfResource;
-  const baseResource = options.baseResource;
+  const { gltf, bufferViewId, gltfResource, baseResource } = options;
 
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.object("options.gltf", gltf);
@@ -363,10 +354,7 @@ ResourceCache.getBufferViewLoader = function (options) {
  */
 ResourceCache.getDracoLoader = function (options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
-  const gltf = options.gltf;
-  const draco = options.draco;
-  const gltfResource = options.gltfResource;
-  const baseResource = options.baseResource;
+  const { gltf, draco, gltfResource, baseResource } = options;
 
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.object("options.gltf", gltf);
@@ -424,18 +412,20 @@ ResourceCache.getDracoLoader = function (options) {
  */
 ResourceCache.getVertexBufferLoader = function (options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
-  const gltf = options.gltf;
-  const gltfResource = options.gltfResource;
-  const baseResource = options.baseResource;
-  const frameState = options.frameState;
-  const bufferViewId = options.bufferViewId;
-  const draco = options.draco;
-  const attributeSemantic = options.attributeSemantic;
-  const accessorId = options.accessorId;
-  const asynchronous = defaultValue(options.asynchronous, true);
-  const dequantize = defaultValue(options.dequantize, false);
-  const loadBuffer = defaultValue(options.loadBuffer, false);
-  const loadTypedArray = defaultValue(options.loadTypedArray, false);
+  const {
+    gltf,
+    gltfResource,
+    baseResource,
+    frameState,
+    bufferViewId,
+    draco,
+    attributeSemantic,
+    accessorId,
+    asynchronous = true,
+    dequantize = false,
+    loadBuffer = false,
+    loadTypedArray = false,
+  } = options;
 
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.object("options.gltf", gltf);
@@ -541,15 +531,17 @@ function hasDracoCompression(draco, semantic) {
  */
 ResourceCache.getIndexBufferLoader = function (options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
-  const gltf = options.gltf;
-  const accessorId = options.accessorId;
-  const gltfResource = options.gltfResource;
-  const baseResource = options.baseResource;
-  const frameState = options.frameState;
-  const draco = options.draco;
-  const asynchronous = defaultValue(options.asynchronous, true);
-  const loadBuffer = defaultValue(options.loadBuffer, false);
-  const loadTypedArray = defaultValue(options.loadTypedArray, false);
+  const {
+    gltf,
+    accessorId,
+    gltfResource,
+    baseResource,
+    frameState,
+    draco,
+    asynchronous = true,
+    loadBuffer = false,
+    loadTypedArray = false,
+  } = options;
 
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.object("options.gltf", gltf);
@@ -610,10 +602,7 @@ ResourceCache.getIndexBufferLoader = function (options) {
  */
 ResourceCache.getImageLoader = function (options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
-  const gltf = options.gltf;
-  const imageId = options.imageId;
-  const gltfResource = options.gltfResource;
-  const baseResource = options.baseResource;
+  const { gltf, imageId, gltfResource, baseResource } = options;
 
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.object("options.gltf", gltf);
@@ -663,13 +652,15 @@ ResourceCache.getImageLoader = function (options) {
  */
 ResourceCache.getTextureLoader = function (options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
-  const gltf = options.gltf;
-  const textureInfo = options.textureInfo;
-  const gltfResource = options.gltfResource;
-  const baseResource = options.baseResource;
-  const supportedImageFormats = options.supportedImageFormats;
-  const frameState = options.frameState;
-  const asynchronous = defaultValue(options.asynchronous, true);
+  const {
+    gltf,
+    textureInfo,
+    gltfResource,
+    baseResource,
+    supportedImageFormats,
+    frameState,
+    asynchronous = true,
+  } = options;
 
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.object("options.gltf", gltf);

package/Source/Scene/ResourceCacheKey.js

@@ -20,8 +20,7 @@ function getExternalResourceCacheKey(resource) {
 }
 
 function getBufferViewCacheKey(bufferView) {
-  let byteOffset = bufferView.byteOffset;
-  let byteLength = bufferView.byteLength;
+  let { byteOffset, byteLength } = bufferView;
 
   if (hasExtension(bufferView, "EXT_meshopt_compression")) {
     const meshopt = bufferView.extensions.EXT_meshopt_compression;
@@ -34,16 +33,10 @@ function getBufferViewCacheKey(bufferView) {
 
 function getAccessorCacheKey(accessor, bufferView) {
   const byteOffset = bufferView.byteOffset + accessor.byteOffset;
-  const componentType = accessor.componentType;
-  const type = accessor.type;
-  const count = accessor.count;
+  const { componentType, type, count } = accessor;
   return `${byteOffset}-${componentType}-${type}-${count}`;
 }
 
-function getExternalBufferCacheKey(resource) {
-  return getExternalResourceCacheKey(resource);
-}
-
 function getEmbeddedBufferCacheKey(parentResource, bufferId) {
   const parentCacheKey = getExternalResourceCacheKey(parentResource);
   return `${parentCacheKey}-buffer-id-${bufferId}`;
@@ -54,7 +47,7 @@ function getBufferCacheKey(buffer, bufferId, gltfResource, baseResource) {
     const resource = baseResource.getDerivedResource({
       url: buffer.uri,
     });
-    return getExternalBufferCacheKey(resource);
+    return getExternalResourceCacheKey(resource);
   }
 
   return getEmbeddedBufferCacheKey(gltfResource, bufferId);
@@ -128,8 +121,7 @@ function getSamplerCacheKey(gltf, textureInfo) {
  * @private
  */
 ResourceCacheKey.getSchemaCacheKey = function (options) {
-  const schema = options.schema;
-  const resource = options.resource;
+  const { schema, resource } = options;
 
   //>>includeStart('debug', pragmas.debug);
   if (defined(schema) === defined(resource)) {
@@ -157,13 +149,13 @@ ResourceCacheKey.getSchemaCacheKey = function (options) {
  */
 ResourceCacheKey.getExternalBufferCacheKey = function (options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
-  const resource = options.resource;
+  const { resource } = options;
 
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.object("options.resource", resource);
   //>>includeEnd('debug');
 
-  return `external-buffer:${getExternalBufferCacheKey(resource)}`;
+  return `external-buffer:${getExternalResourceCacheKey(resource)}`;
 };
 
 /**
@@ -178,8 +170,7 @@ ResourceCacheKey.getExternalBufferCacheKey = function (options) {
  */
 ResourceCacheKey.getEmbeddedBufferCacheKey = function (options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
-  const parentResource = options.parentResource;
-  const bufferId = options.bufferId;
+  const { parentResource, bufferId } = options;
 
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.object("options.parentResource", parentResource);
@@ -203,7 +194,7 @@ ResourceCacheKey.getEmbeddedBufferCacheKey = function (options) {
  */
 ResourceCacheKey.getGltfCacheKey = function (options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
-  const gltfResource = options.gltfResource;
+  const { gltfResource } = options;
 
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.object("options.gltfResource", gltfResource);
@@ -226,10 +217,7 @@ ResourceCacheKey.getGltfCacheKey = function (options) {
  */
 ResourceCacheKey.getBufferViewCacheKey = function (options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
-  const gltf = options.gltf;
-  const bufferViewId = options.bufferViewId;
-  const gltfResource = options.gltfResource;
-  const baseResource = options.baseResource;
+  const { gltf, bufferViewId, gltfResource, baseResource } = options;
 
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.object("options.gltf", gltf);
@@ -272,10 +260,7 @@ ResourceCacheKey.getBufferViewCacheKey = function (options) {
  */
 ResourceCacheKey.getDracoCacheKey = function (options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
-  const gltf = options.gltf;
-  const draco = options.draco;
-  const gltfResource = options.gltfResource;
-  const baseResource = options.baseResource;
+  const { gltf, draco, gltfResource, baseResource } = options;
 
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.object("options.gltf", gltf);
@@ -309,16 +294,18 @@ ResourceCacheKey.getDracoCacheKey = function (options) {
  */
 ResourceCacheKey.getVertexBufferCacheKey = function (options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
-  const gltf = options.gltf;
-  const gltfResource = options.gltfResource;
-  const baseResource = options.baseResource;
-  const frameState = options.frameState;
-  const bufferViewId = options.bufferViewId;
-  const draco = options.draco;
-  const attributeSemantic = options.attributeSemantic;
-  const dequantize = defaultValue(options.dequantize, false);
-  const loadBuffer = defaultValue(options.loadBuffer, false);
-  const loadTypedArray = defaultValue(options.loadTypedArray, false);
+  const {
+    gltf,
+    gltfResource,
+    baseResource,
+    frameState,
+    bufferViewId,
+    draco,
+    attributeSemantic,
+    dequantize = false,
+    loadBuffer = false,
+    loadTypedArray = false,
+  } = options;
 
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.object("options.gltf", gltf);
@@ -420,14 +407,16 @@ function hasDracoCompression(draco, semantic) {
  */
 ResourceCacheKey.getIndexBufferCacheKey = function (options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
-  const gltf = options.gltf;
-  const accessorId = options.accessorId;
-  const gltfResource = options.gltfResource;
-  const baseResource = options.baseResource;
-  const frameState = options.frameState;
-  const draco = options.draco;
-  const loadBuffer = defaultValue(options.loadBuffer, false);
-  const loadTypedArray = defaultValue(options.loadTypedArray, false);
+  const {
+    gltf,
+    accessorId,
+    gltfResource,
+    baseResource,
+    frameState,
+    draco,
+    loadBuffer = false,
+    loadTypedArray = false,
+  } = options;
 
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.object("options.gltf", gltf);
@@ -495,10 +484,7 @@ ResourceCacheKey.getIndexBufferCacheKey = function (options) {
  */
 ResourceCacheKey.getImageCacheKey = function (options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
-  const gltf = options.gltf;
-  const imageId = options.imageId;
-  const gltfResource = options.gltfResource;
-  const baseResource = options.baseResource;
+  const { gltf, imageId, gltfResource, baseResource } = options;
 
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.object("options.gltf", gltf);
@@ -533,12 +519,14 @@ ResourceCacheKey.getImageCacheKey = function (options) {
  */
 ResourceCacheKey.getTextureCacheKey = function (options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
-  const gltf = options.gltf;
-  const textureInfo = options.textureInfo;
-  const gltfResource = options.gltfResource;
-  const baseResource = options.baseResource;
-  const supportedImageFormats = options.supportedImageFormats;
-  const frameState = options.frameState;
+  const {
+    gltf,
+    textureInfo,
+    gltfResource,
+    baseResource,
+    supportedImageFormats,
+    frameState,
+  } = options;
 
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.object("options.gltf", gltf);

package/Source/Shaders/Builtin/CzmBuiltins.js

@@ -42,7 +42,6 @@ import czm_material from './Structs/material.js'
 import czm_materialInput from './Structs/materialInput.js'
 import czm_modelMaterial from './Structs/modelMaterial.js'
 import czm_modelVertexOutput from './Structs/modelVertexOutput.js'
-import czm_pbrParameters from './Structs/pbrParameters.js'
 import czm_ray from './Structs/ray.js'
 import czm_raySegment from './Structs/raySegment.js'
 import czm_shadowParameters from './Structs/shadowParameters.js'
@@ -72,7 +71,6 @@ import czm_computePosition from './Functions/computePosition.js'
 import czm_computeScattering from './Functions/computeScattering.js'
 import czm_cosineAndSine from './Functions/cosineAndSine.js'
 import czm_decompressTextureCoordinates from './Functions/decompressTextureCoordinates.js'
-import czm_defaultPbrMaterial from './Functions/defaultPbrMaterial.js'
 import czm_depthClamp from './Functions/depthClamp.js'
 import czm_eastNorthUpToEyeCoordinates from './Functions/eastNorthUpToEyeCoordinates.js'
 import czm_ellipsoidContainsPoint from './Functions/ellipsoidContainsPoint.js'
@@ -97,6 +95,7 @@ import czm_latitudeToWebMercatorFraction from './Functions/latitudeToWebMercator
 import czm_lineDistance from './Functions/lineDistance.js'
 import czm_linearToSrgb from './Functions/linearToSrgb.js'
 import czm_luminance from './Functions/luminance.js'
+import czm_maximumComponent from './Functions/maximumComponent.js'
 import czm_metersPerPixel from './Functions/metersPerPixel.js'
 import czm_modelToWindowCoordinates from './Functions/modelToWindowCoordinates.js'
 import czm_multiplyWithColorBalance from './Functions/multiplyWithColorBalance.js'
@@ -104,8 +103,6 @@ import czm_nearFarScalar from './Functions/nearFarScalar.js'
 import czm_octDecode from './Functions/octDecode.js'
 import czm_packDepth from './Functions/packDepth.js'
 import czm_pbrLighting from './Functions/pbrLighting.js'
-import czm_pbrMetallicRoughnessMaterial from './Functions/pbrMetallicRoughnessMaterial.js'
-import czm_pbrSpecularGlossinessMaterial from './Functions/pbrSpecularGlossinessMaterial.js'
 import czm_phong from './Functions/phong.js'
 import czm_planeDistance from './Functions/planeDistance.js'
 import czm_pointAlongRay from './Functions/pointAlongRay.js'
@@ -183,7 +180,6 @@ export default {
     czm_materialInput : czm_materialInput,
     czm_modelMaterial : czm_modelMaterial,
     czm_modelVertexOutput : czm_modelVertexOutput,
-    czm_pbrParameters : czm_pbrParameters,
     czm_ray : czm_ray,
     czm_raySegment : czm_raySegment,
     czm_shadowParameters : czm_shadowParameters,
@@ -213,7 +209,6 @@ export default {
     czm_computeScattering : czm_computeScattering,
     czm_cosineAndSine : czm_cosineAndSine,
     czm_decompressTextureCoordinates : czm_decompressTextureCoordinates,
-    czm_defaultPbrMaterial : czm_defaultPbrMaterial,
     czm_depthClamp : czm_depthClamp,
     czm_eastNorthUpToEyeCoordinates : czm_eastNorthUpToEyeCoordinates,
     czm_ellipsoidContainsPoint : czm_ellipsoidContainsPoint,
@@ -238,6 +233,7 @@ export default {
     czm_lineDistance : czm_lineDistance,
     czm_linearToSrgb : czm_linearToSrgb,
     czm_luminance : czm_luminance,
+    czm_maximumComponent : czm_maximumComponent,
     czm_metersPerPixel : czm_metersPerPixel,
     czm_modelToWindowCoordinates : czm_modelToWindowCoordinates,
     czm_multiplyWithColorBalance : czm_multiplyWithColorBalance,
@@ -245,8 +241,6 @@ export default {
     czm_octDecode : czm_octDecode,
     czm_packDepth : czm_packDepth,
     czm_pbrLighting : czm_pbrLighting,
-    czm_pbrMetallicRoughnessMaterial : czm_pbrMetallicRoughnessMaterial,
-    czm_pbrSpecularGlossinessMaterial : czm_pbrSpecularGlossinessMaterial,
     czm_phong : czm_phong,
     czm_planeDistance : czm_planeDistance,
     czm_pointAlongRay : czm_pointAlongRay,

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

@@ -0,0 +1,21 @@
+/**
+ * Find the maximum component of a vector.
+ *
+ * @name czm_maximumComponent
+ * @glslFunction
+ *
+ * @param {vec2|vec3|vec4} v The input vector.
+ * @returns {float} The value of the largest component.
+ */
+float czm_maximumComponent(vec2 v)
+{
+    return max(v.x, v.y);
+}
+float czm_maximumComponent(vec3 v)
+{
+    return max(max(v.x, v.y), v.z);
+}
+float czm_maximumComponent(vec4 v)
+{
+    return max(max(max(v.x, v.y), v.z), v.w);
+}