@cesium/engine 9.1.0 → 9.2.0

package/Source/Scene/GltfLoaderUtil.js

@@ -35,9 +35,7 @@ const GltfLoaderUtil = {};
  */
 GltfLoaderUtil.getImageIdFromTexture = function (options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
-  const gltf = options.gltf;
-  const textureId = options.textureId;
-  const supportedImageFormats = options.supportedImageFormats;
+  const { gltf, textureId, supportedImageFormats } = options;
 
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.object("options.gltf", gltf);
@@ -73,12 +71,7 @@ GltfLoaderUtil.getImageIdFromTexture = function (options) {
  */
 GltfLoaderUtil.createSampler = function (options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
-  const gltf = options.gltf;
-  const textureInfo = options.textureInfo;
-  const compressedTextureNoMipmap = defaultValue(
-    options.compressedTextureNoMipmap,
-    false
-  );
+  const { gltf, textureInfo, compressedTextureNoMipmap = false } = options;
 
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.object("options.gltf", gltf);
@@ -140,9 +133,7 @@ const defaultScale = new Cartesian2(1.0, 1.0);
  */
 GltfLoaderUtil.createModelTextureReader = function (options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
-  const textureInfo = options.textureInfo;
-  const channels = options.channels;
-  const texture = options.texture;
+  const { textureInfo, channels, texture } = options;
 
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.object("options.textureInfo", textureInfo);

package/Source/Scene/GltfPipeline/forEachTextureInMaterial.js

@@ -33,10 +33,11 @@ function forEachTextureInMaterial(material, handler) {
     }
   }
 
-  if (defined(material.extensions)) {
+  const { extensions } = material;
+  if (defined(extensions)) {
     // Spec gloss extension
     const pbrSpecularGlossiness =
-      material.extensions.KHR_materials_pbrSpecularGlossiness;
+      extensions.KHR_materials_pbrSpecularGlossiness;
     if (defined(pbrSpecularGlossiness)) {
       if (defined(pbrSpecularGlossiness.diffuseTexture)) {
         const textureInfo = pbrSpecularGlossiness.diffuseTexture;
@@ -54,13 +55,28 @@ function forEachTextureInMaterial(material, handler) {
       }
     }
 
+    // Specular extension
+    const specular = extensions.KHR_materials_specular;
+    if (defined(specular)) {
+      const { specularTexture, specularColorTexture } = specular;
+      if (defined(specularTexture)) {
+        const value = handler(specularTexture.index, specularTexture);
+        if (defined(value)) {
+          return value;
+        }
+      }
+      if (defined(specularColorTexture)) {
+        const value = handler(specularColorTexture.index, specularColorTexture);
+        if (defined(value)) {
+          return value;
+        }
+      }
+    }
+
     // Materials common extension (may be present in models converted from glTF 1.0)
-    const materialsCommon = material.extensions.KHR_materials_common;
+    const materialsCommon = extensions.KHR_materials_common;
     if (defined(materialsCommon) && defined(materialsCommon.values)) {
-      const diffuse = materialsCommon.values.diffuse;
-      const ambient = materialsCommon.values.ambient;
-      const emission = materialsCommon.values.emission;
-      const specular = materialsCommon.values.specular;
+      const { diffuse, ambient, emission, specular } = materialsCommon.values;
       if (defined(diffuse) && defined(diffuse.index)) {
         const value = handler(diffuse.index, diffuse);
         if (defined(value)) {

package/Source/Scene/GltfStructuralMetadataLoader.js

@@ -34,15 +34,17 @@ import ResourceLoaderState from "./ResourceLoaderState.js";
  */
 function GltfStructuralMetadataLoader(options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
-  const gltf = options.gltf;
-  const extension = options.extension;
-  const extensionLegacy = options.extensionLegacy;
-  const gltfResource = options.gltfResource;
-  const baseResource = options.baseResource;
-  const supportedImageFormats = options.supportedImageFormats;
-  const frameState = options.frameState;
-  const cacheKey = options.cacheKey;
-  const asynchronous = defaultValue(options.asynchronous, true);
+  const {
+    gltf,
+    extension,
+    extensionLegacy,
+    gltfResource,
+    baseResource,
+    supportedImageFormats,
+    frameState,
+    cacheKey,
+    asynchronous = true,
+  } = options;
 
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.object("options.gltf", gltf);

package/Source/Scene/Label.js

@@ -91,7 +91,7 @@ function parseFont(label) {
  * Initialization options for the Label constructor
  *
  * @property {Cartesian3} position The cartesian position of the label.
- * @property {string} [id] A user-defined object to return when the label is picked with {@link Scene#pick}.
+ * @property {*} [id] A user-defined object to return when the label is picked with {@link Scene#pick}.
  * @property {boolean} [show=true] Determines if this label will be shown.
  * @property {string} [text] A string specifying the text of the label.
  * @property {string} [font='30px sans-serif'] A string specifying the font used to draw this label. Fonts are specified using the same syntax as the CSS 'font' property.

package/Source/Scene/Model/AlphaPipelineStage.js

@@ -7,7 +7,7 @@ import Pass from "../../Renderer/Pass.js";
 /**
  * A pipeline stage for configuring the alpha options for handling translucency.
  *
- * @namespace MaterialPipelineStage
+ * @namespace AlphaPipelineStage
  *
  * @private
  */

package/Source/Scene/Model/GeometryPipelineStage.js

@@ -63,8 +63,7 @@ GeometryPipelineStage.process = function (
   primitive,
   frameState
 ) {
-  const shaderBuilder = renderResources.shaderBuilder;
-  const model = renderResources.model;
+  const { shaderBuilder, model } = renderResources;
 
   // These structs are similar, though the fragment shader version has a couple
   // additional fields.
@@ -125,8 +124,7 @@ GeometryPipelineStage.process = function (
   );
 
   // .pnts point clouds store sRGB color rather than linear color
-  const modelType = model.type;
-  if (modelType === ModelType.TILE_PNTS) {
+  if (model.type === ModelType.TILE_PNTS) {
     shaderBuilder.addDefine(
       "HAS_SRGB_COLOR",
       undefined,
@@ -246,8 +244,7 @@ function processAttribute(
 }
 
 function addSemanticDefine(shaderBuilder, attribute) {
-  const semantic = attribute.semantic;
-  const setIndex = attribute.setIndex;
+  const { semantic, setIndex } = attribute;
   switch (semantic) {
     case VertexAttributeSemantic.NORMAL:
       shaderBuilder.addDefine("HAS_NORMALS");
@@ -272,19 +269,11 @@ function addAttributeToRenderResources(
   attributeIndex,
   modifyFor2D
 ) {
-  const quantization = attribute.quantization;
-  let type;
-  let componentDatatype;
-  if (defined(quantization)) {
-    type = quantization.type;
-    componentDatatype = quantization.componentDatatype;
-  } else {
-    type = attribute.type;
-    componentDatatype = attribute.componentDatatype;
-  }
+  const { quantization, semantic, setIndex } = attribute;
+  const { type, componentDatatype } = defined(quantization)
+    ? quantization
+    : attribute;
 
-  const semantic = attribute.semantic;
-  const setIndex = attribute.setIndex;
   if (
     semantic === VertexAttributeSemantic.FEATURE_ID &&
     setIndex >= renderResources.featureIdVertexAttributeSetIndex
@@ -337,18 +326,10 @@ function addMatrixAttributeToRenderResources(
   attributeIndex,
   columnCount
 ) {
-  const quantization = attribute.quantization;
-  let type;
-  let componentDatatype;
-  if (defined(quantization)) {
-    type = quantization.type;
-    componentDatatype = quantization.componentDatatype;
-  } else {
-    type = attribute.type;
-    componentDatatype = attribute.componentDatatype;
-  }
-
-  const normalized = attribute.normalized;
+  const { quantization, normalized } = attribute;
+  const { type, componentDatatype } = defined(quantization)
+    ? quantization
+    : attribute;
 
   // componentCount is either 4, 9 or 16
   const componentCount = AttributeType.getNumberOfComponents(type);
@@ -435,7 +416,7 @@ function addAttributeDeclaration(shaderBuilder, attributeInfo, modifyFor2D) {
 function updateAttributesStruct(shaderBuilder, attributeInfo, use2D) {
   const vsStructId = GeometryPipelineStage.STRUCT_ID_PROCESSED_ATTRIBUTES_VS;
   const fsStructId = GeometryPipelineStage.STRUCT_ID_PROCESSED_ATTRIBUTES_FS;
-  const variableName = attributeInfo.variableName;
+  const { variableName, glslType } = attributeInfo;
 
   if (variableName === "tangentMC") {
     // The w component of the tangent is only used for computing the bitangent,
@@ -451,16 +432,8 @@ function updateAttributesStruct(shaderBuilder, attributeInfo, use2D) {
     shaderBuilder.addStructField(vsStructId, "vec3", "normalMC");
     shaderBuilder.addStructField(fsStructId, "vec3", "normalEC");
   } else {
-    shaderBuilder.addStructField(
-      vsStructId,
-      attributeInfo.glslType,
-      variableName
-    );
-    shaderBuilder.addStructField(
-      fsStructId,
-      attributeInfo.glslType,
-      variableName
-    );
+    shaderBuilder.addStructField(vsStructId, glslType, variableName);
+    shaderBuilder.addStructField(fsStructId, glslType, variableName);
   }
 
   if (variableName === "positionMC" && use2D) {
@@ -501,8 +474,7 @@ function updateInitializeAttributesFunction(
 }
 
 function updateSetDynamicVaryingsFunction(shaderBuilder, attributeInfo) {
-  const semantic = attributeInfo.attribute.semantic;
-  const setIndex = attributeInfo.attribute.setIndex;
+  const { semantic, setIndex } = attributeInfo.attribute;
   if (defined(semantic) && !defined(setIndex)) {
     // positions, normals, and tangents are handled statically in
     // GeometryStageVS

package/Source/Scene/Model/ImageBasedLightingPipelineStage.js

@@ -8,6 +8,13 @@ const ImageBasedLightingPipelineStage = {
   name: "ImageBasedLightingPipelineStage", // Helps with debugging
 };
 
+/**
+ * Add shader code, uniforms, and defines related to image based lighting
+ * @param {ModelRenderResources} renderResources
+ * @param {Model} model
+ * @param {FrameState} frameState
+ * @private
+ */
 ImageBasedLightingPipelineStage.process = function (
   renderResources,
   model,

package/Source/Scene/Model/LightingPipelineStage.js

@@ -28,9 +28,7 @@ const LightingPipelineStage = {
  * @private
  */
 LightingPipelineStage.process = function (renderResources, primitive) {
-  const model = renderResources.model;
-  const lightingOptions = renderResources.lightingOptions;
-  const shaderBuilder = renderResources.shaderBuilder;
+  const { model, lightingOptions, shaderBuilder } = renderResources;
 
   if (defined(model.lightColor)) {
     shaderBuilder.addDefine(
@@ -53,7 +51,7 @@ LightingPipelineStage.process = function (renderResources, primitive) {
 
   // The lighting model is always set by the material. However, custom shaders
   // can override this.
-  const lightingModel = lightingOptions.lightingModel;
+  const { lightingModel } = lightingOptions;
 
   if (lightingModel === LightingModel.PBR) {
     shaderBuilder.addDefine(