@cesium/engine 15.0.0 → 17.0.0

package/Source/Scene/GltfLoader.js

@@ -5,7 +5,7 @@ import Cartesian4 from "../Core/Cartesian4.js";
 import Check from "../Core/Check.js";
 import ComponentDatatype from "../Core/ComponentDatatype.js";
 import Credit from "../Core/Credit.js";
-import defaultValue from "../Core/defaultValue.js";
+import Frozen from "../Core/Frozen.js";
 import defined from "../Core/defined.js";
 import FeatureDetection from "../Core/FeatureDetection.js";
 import InterpolationType from "../Core/InterpolationType.js";
@@ -195,7 +195,7 @@ const GltfLoaderState = {
  * @private
  */
 function GltfLoader(options) {
-  options = defaultValue(options, defaultValue.EMPTY_OBJECT);
+  options = options ?? Frozen.EMPTY_OBJECT;
   const {
     gltfResource,
     typedArray,
@@ -855,7 +855,7 @@ async function loadAccessorBufferView(
     bufferViewLoader.typedArray,
   );
 
-  useQuaternion = defaultValue(useQuaternion, false);
+  useQuaternion = useQuaternion ?? false;
   loadAccessorValues(accessor, typedArray, values, useQuaternion);
 }
 
@@ -1004,7 +1004,7 @@ function setQuantizationFromWeb3dQuantizedAttributes(
 function createAttribute(gltf, accessorId, name, semantic, setIndex) {
   const accessor = gltf.accessors[accessorId];
   const MathType = AttributeType.getMathType(accessor.type);
-  const normalized = defaultValue(accessor.normalized, false);
+  const normalized = accessor.normalized ?? false;
 
   const attribute = new Attribute();
   attribute.name = name;
@@ -1670,10 +1670,7 @@ function loadClearcoat(loader, clearcoatInfo, frameState) {
 function loadMaterial(loader, gltfMaterial, frameState) {
   const material = new Material();
 
-  const extensions = defaultValue(
-    gltfMaterial.extensions,
-    defaultValue.EMPTY_OBJECT,
-  );
+  const extensions = gltfMaterial.extensions ?? Frozen.EMPTY_OBJECT;
   const pbrSpecularGlossiness = extensions.KHR_materials_pbrSpecularGlossiness;
   const pbrSpecular = extensions.KHR_materials_specular;
   const pbrAnisotropy = extensions.KHR_materials_anisotropy;
@@ -1794,9 +1791,9 @@ function loadFeatureIdImplicitRangeLegacy(
   featureIdRange.featureCount = featureCount;
 
   // constant/divisor was renamed to offset/repeat
-  featureIdRange.offset = defaultValue(featureIds.constant, 0);
+  featureIdRange.offset = featureIds.constant ?? 0;
   // The default is now undefined
-  const divisor = defaultValue(featureIds.divisor, 0);
+  const divisor = featureIds.divisor ?? 0;
   featureIdRange.repeat = divisor === 0 ? undefined : divisor;
 
   featureIdRange.positionalLabel = positionalLabel;
@@ -1936,10 +1933,7 @@ function loadPrimitive(loader, gltfPrimitive, hasInstances, frameState) {
     );
   }
 
-  const extensions = defaultValue(
-    gltfPrimitive.extensions,
-    defaultValue.EMPTY_OBJECT,
-  );
+  const extensions = gltfPrimitive.extensions ?? Frozen.EMPTY_OBJECT;
 
   let needsPostProcessing = false;
   const outlineExtension = extensions.CESIUM_primitive_outline;
@@ -2240,10 +2234,8 @@ function loadInstances(loader, nodeExtensions, frameState) {
     }
   }
 
-  const instancingExtExtensions = defaultValue(
-    instancingExtension.extensions,
-    defaultValue.EMPTY_OBJECT,
-  );
+  const instancingExtExtensions =
+    instancingExtension.extensions ?? Frozen.EMPTY_OBJECT;
   const instanceFeatures = nodeExtensions.EXT_instance_features;
   const featureMetadataLegacy = instancingExtExtensions.EXT_feature_metadata;
 
@@ -2341,10 +2333,7 @@ function loadNode(loader, gltfNode, frameState) {
   node.rotation = fromArray(Quaternion, gltfNode.rotation);
   node.scale = fromArray(Cartesian3, gltfNode.scale);
 
-  const nodeExtensions = defaultValue(
-    gltfNode.extensions,
-    defaultValue.EMPTY_OBJECT,
-  );
+  const nodeExtensions = gltfNode.extensions ?? Frozen.EMPTY_OBJECT;
   const instancingExtension = nodeExtensions.EXT_mesh_gpu_instancing;
   const articulationsExtension = nodeExtensions.AGI_articulations;
 
@@ -2378,7 +2367,7 @@ function loadNode(loader, gltfNode, frameState) {
 
     // If the node has no weights array, it will look for the weights array provided
     // by the mesh. If both are undefined, it will default to an array of zero weights.
-    const morphWeights = defaultValue(gltfNode.weights, mesh.weights);
+    const morphWeights = gltfNode.weights ?? mesh.weights;
     const targets = node.primitives[0].morphTargets;
 
     // Since meshes are not stored as separate components, the mesh weights will still
@@ -2508,10 +2497,8 @@ function loadAnimationSampler(loader, gltfSampler) {
   animationSampler.input = loadAccessor(loader, inputAccessor);
 
   const gltfInterpolation = gltfSampler.interpolation;
-  animationSampler.interpolation = defaultValue(
-    InterpolationType[gltfInterpolation],
-    InterpolationType.LINEAR,
-  );
+  animationSampler.interpolation =
+    InterpolationType[gltfInterpolation] ?? InterpolationType.LINEAR;
 
   const outputAccessor = accessors[gltfSampler.output];
   animationSampler.output = loadAccessor(loader, outputAccessor, true);
@@ -2606,7 +2593,7 @@ function loadArticulation(articulationJson) {
 }
 
 function loadArticulations(gltf) {
-  const extensions = defaultValue(gltf.extensions, defaultValue.EMPTY_OBJECT);
+  const extensions = gltf.extensions ?? Frozen.EMPTY_OBJECT;
   const articulationJsons = extensions.AGI_articulations?.articulations;
   if (!defined(articulationJsons)) {
     return [];
@@ -2619,7 +2606,7 @@ function getSceneNodeIds(gltf) {
   if (defined(gltf.scenes) && defined(gltf.scene)) {
     nodesIds = gltf.scenes[gltf.scene].nodes;
   }
-  nodesIds = defaultValue(nodesIds, gltf.nodes);
+  nodesIds = nodesIds ?? gltf.nodes;
   nodesIds = defined(nodesIds) ? nodesIds : [];
   return nodesIds;
 }
@@ -2652,7 +2639,7 @@ const scratchCenter = new Cartesian3();
  */
 function parse(loader, frameState) {
   const gltf = loader.gltfJson;
-  const extensions = defaultValue(gltf.extensions, defaultValue.EMPTY_OBJECT);
+  const extensions = gltf.extensions ?? Frozen.EMPTY_OBJECT;
   const structuralMetadataExtension = extensions.EXT_structural_metadata;
   const featureMetadataExtensionLegacy = extensions.EXT_feature_metadata;
   const cesiumRtcExtension = extensions.CESIUM_RTC;

package/Source/Scene/GltfLoaderUtil.js

@@ -1,6 +1,6 @@
 import Cartesian2 from "../Core/Cartesian2.js";
 import Check from "../Core/Check.js";
-import defaultValue from "../Core/defaultValue.js";
+import Frozen from "../Core/Frozen.js";
 import defined from "../Core/defined.js";
 import Matrix3 from "../Core/Matrix3.js";
 import Sampler from "../Renderer/Sampler.js";
@@ -34,7 +34,7 @@ const GltfLoaderUtil = {};
  * @private
  */
 GltfLoaderUtil.getImageIdFromTexture = function (options) {
-  options = defaultValue(options, defaultValue.EMPTY_OBJECT);
+  options = options ?? Frozen.EMPTY_OBJECT;
   const { gltf, textureId, supportedImageFormats } = options;
 
   //>>includeStart('debug', pragmas.debug);
@@ -70,7 +70,7 @@ GltfLoaderUtil.getImageIdFromTexture = function (options) {
  * @private
  */
 GltfLoaderUtil.createSampler = function (options) {
-  options = defaultValue(options, defaultValue.EMPTY_OBJECT);
+  options = options ?? Frozen.EMPTY_OBJECT;
   const { gltf, textureInfo, compressedTextureNoMipmap = false } = options;
 
   //>>includeStart('debug', pragmas.debug);
@@ -90,10 +90,10 @@ GltfLoaderUtil.createSampler = function (options) {
 
   if (defined(samplerId)) {
     const sampler = gltf.samplers[samplerId];
-    wrapS = defaultValue(sampler.wrapS, wrapS);
-    wrapT = defaultValue(sampler.wrapT, wrapT);
-    minFilter = defaultValue(sampler.minFilter, minFilter);
-    magFilter = defaultValue(sampler.magFilter, magFilter);
+    wrapS = sampler.wrapS ?? wrapS;
+    wrapT = sampler.wrapT ?? wrapT;
+    minFilter = sampler.minFilter ?? minFilter;
+    magFilter = sampler.magFilter ?? magFilter;
   }
 
   if (
@@ -132,25 +132,25 @@ const defaultScale = new Cartesian2(1.0, 1.0);
  * @returns {ModelComponents.TextureReader} The texture reader for this model.
  */
 GltfLoaderUtil.createModelTextureReader = function (options) {
-  options = defaultValue(options, defaultValue.EMPTY_OBJECT);
+  options = options ?? Frozen.EMPTY_OBJECT;
   const { textureInfo, channels, texture } = options;
 
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.object("options.textureInfo", textureInfo);
   //>>includeEnd('debug');
 
-  let texCoord = defaultValue(textureInfo.texCoord, 0);
+  let texCoord = textureInfo.texCoord ?? 0;
   let transform;
 
   const textureTransform = textureInfo.extensions?.KHR_texture_transform;
 
   if (defined(textureTransform)) {
-    texCoord = defaultValue(textureTransform.texCoord, texCoord);
+    texCoord = textureTransform.texCoord ?? texCoord;
 
     const offset = defined(textureTransform.offset)
       ? Cartesian2.unpack(textureTransform.offset)
       : Cartesian2.ZERO;
-    let rotation = defaultValue(textureTransform.rotation, 0.0);
+    let rotation = textureTransform.rotation ?? 0.0;
     const scale = defined(textureTransform.scale)
       ? Cartesian2.unpack(textureTransform.scale)
       : defaultScale;

package/Source/Scene/GltfPipeline/addDefaults.js

@@ -1,7 +1,7 @@
 import addToArray from "./addToArray.js";
 import ForEach from "./ForEach.js";
 import getAccessorByteStride from "./getAccessorByteStride.js";
-import defaultValue from "../../Core/defaultValue.js";
+import Frozen from "../../Core/Frozen.js";
 import defined from "../../Core/defined.js";
 import WebGLConstants from "../../Core/WebGLConstants.js";
 
@@ -16,19 +16,19 @@ import WebGLConstants from "../../Core/WebGLConstants.js";
 function addDefaults(gltf) {
   ForEach.accessor(gltf, function (accessor) {
     if (defined(accessor.bufferView)) {
-      accessor.byteOffset = defaultValue(accessor.byteOffset, 0);
+      accessor.byteOffset = accessor.byteOffset ?? 0;
     }
   });
 
   ForEach.bufferView(gltf, function (bufferView) {
     if (defined(bufferView.buffer)) {
-      bufferView.byteOffset = defaultValue(bufferView.byteOffset, 0);
+      bufferView.byteOffset = bufferView.byteOffset ?? 0;
     }
   });
 
   ForEach.mesh(gltf, function (mesh) {
     ForEach.meshPrimitive(mesh, function (primitive) {
-      primitive.mode = defaultValue(primitive.mode, WebGLConstants.TRIANGLES);
+      primitive.mode = primitive.mode ?? WebGLConstants.TRIANGLES;
       if (!defined(primitive.material)) {
         if (!defined(gltf.materials)) {
           gltf.materials = [];
@@ -44,7 +44,7 @@ function addDefaults(gltf) {
   ForEach.accessorContainingVertexAttributeData(gltf, function (accessorId) {
     const accessor = gltf.accessors[accessorId];
     const bufferViewId = accessor.bufferView;
-    accessor.normalized = defaultValue(accessor.normalized, false);
+    accessor.normalized = accessor.normalized ?? false;
     if (defined(bufferViewId)) {
       const bufferView = gltf.bufferViews[bufferViewId];
       bufferView.byteStride = getAccessorByteStride(gltf, accessor);
@@ -62,10 +62,7 @@ function addDefaults(gltf) {
   });
 
   ForEach.material(gltf, function (material) {
-    const extensions = defaultValue(
-      material.extensions,
-      defaultValue.EMPTY_OBJECT
-    );
+    const extensions = material.extensions ?? Frozen.EMPTY_OBJECT;
     const materialsCommon = extensions.KHR_materials_common;
     if (defined(materialsCommon)) {
       const technique = materialsCommon.technique;
@@ -81,7 +78,7 @@ function addDefaults(gltf) {
         ? values.emission
         : [0.0, 0.0, 0.0, 1.0];
 
-      values.transparency = defaultValue(values.transparency, 1.0);
+      values.transparency = values.transparency ?? 1.0;
 
       if (technique !== "CONSTANT") {
         values.diffuse = defined(values.diffuse)
@@ -91,32 +88,23 @@ function addDefaults(gltf) {
           values.specular = defined(values.specular)
             ? values.specular
             : [0.0, 0.0, 0.0, 1.0];
-          values.shininess = defaultValue(values.shininess, 0.0);
+          values.shininess = values.shininess ?? 0.0;
         }
       }
 
       // These actually exist on the extension object, not the values object despite what's shown in the spec
-      materialsCommon.transparent = defaultValue(
-        materialsCommon.transparent,
-        false
-      );
-      materialsCommon.doubleSided = defaultValue(
-        materialsCommon.doubleSided,
-        false
-      );
+      materialsCommon.transparent = materialsCommon.transparent ?? false;
+      materialsCommon.doubleSided = materialsCommon.doubleSided ?? false;
 
       return;
     }
 
-    material.emissiveFactor = defaultValue(
-      material.emissiveFactor,
-      [0.0, 0.0, 0.0]
-    );
-    material.alphaMode = defaultValue(material.alphaMode, "OPAQUE");
-    material.doubleSided = defaultValue(material.doubleSided, false);
+    material.emissiveFactor = material.emissiveFactor ?? [0.0, 0.0, 0.0];
+    material.alphaMode = material.alphaMode ?? "OPAQUE";
+    material.doubleSided = material.doubleSided ?? false;
 
     if (material.alphaMode === "MASK") {
-      material.alphaCutoff = defaultValue(material.alphaCutoff, 0.5);
+      material.alphaCutoff = material.alphaCutoff ?? 0.5;
     }
 
     const techniquesExtension = extensions.KHR_techniques_webgl;
@@ -135,18 +123,12 @@ function addDefaults(gltf) {
 
     const pbrMetallicRoughness = material.pbrMetallicRoughness;
     if (defined(pbrMetallicRoughness)) {
-      pbrMetallicRoughness.baseColorFactor = defaultValue(
-        pbrMetallicRoughness.baseColorFactor,
-        [1.0, 1.0, 1.0, 1.0]
-      );
-      pbrMetallicRoughness.metallicFactor = defaultValue(
-        pbrMetallicRoughness.metallicFactor,
-        1.0
-      );
-      pbrMetallicRoughness.roughnessFactor = defaultValue(
-        pbrMetallicRoughness.roughnessFactor,
-        1.0
-      );
+      pbrMetallicRoughness.baseColorFactor =
+        pbrMetallicRoughness.baseColorFactor ?? [1.0, 1.0, 1.0, 1.0];
+      pbrMetallicRoughness.metallicFactor =
+        pbrMetallicRoughness.metallicFactor ?? 1.0;
+      pbrMetallicRoughness.roughnessFactor =
+        pbrMetallicRoughness.roughnessFactor ?? 1.0;
       addTextureDefaults(pbrMetallicRoughness.baseColorTexture);
       addTextureDefaults(pbrMetallicRoughness.metallicRoughnessTexture);
     }
@@ -154,25 +136,19 @@ function addDefaults(gltf) {
     const pbrSpecularGlossiness =
       extensions.KHR_materials_pbrSpecularGlossiness;
     if (defined(pbrSpecularGlossiness)) {
-      pbrSpecularGlossiness.diffuseFactor = defaultValue(
-        pbrSpecularGlossiness.diffuseFactor,
-        [1.0, 1.0, 1.0, 1.0]
-      );
-      pbrSpecularGlossiness.specularFactor = defaultValue(
-        pbrSpecularGlossiness.specularFactor,
-        [1.0, 1.0, 1.0]
-      );
-      pbrSpecularGlossiness.glossinessFactor = defaultValue(
-        pbrSpecularGlossiness.glossinessFactor,
-        1.0
-      );
+      pbrSpecularGlossiness.diffuseFactor =
+        pbrSpecularGlossiness.diffuseFactor ?? [1.0, 1.0, 1.0, 1.0];
+      pbrSpecularGlossiness.specularFactor =
+        pbrSpecularGlossiness.specularFactor ?? [1.0, 1.0, 1.0];
+      pbrSpecularGlossiness.glossinessFactor =
+        pbrSpecularGlossiness.glossinessFactor ?? 1.0;
       addTextureDefaults(pbrSpecularGlossiness.specularGlossinessTexture);
     }
   });
 
   ForEach.animation(gltf, function (animation) {
     ForEach.animationSampler(animation, function (sampler) {
-      sampler.interpolation = defaultValue(sampler.interpolation, "LINEAR");
+      sampler.interpolation = sampler.interpolation ?? "LINEAR";
     });
   });
 
@@ -185,23 +161,20 @@ function addDefaults(gltf) {
       defined(node.rotation) ||
       defined(node.scale)
     ) {
-      node.translation = defaultValue(node.translation, [0.0, 0.0, 0.0]);
-      node.rotation = defaultValue(node.rotation, [0.0, 0.0, 0.0, 1.0]);
-      node.scale = defaultValue(node.scale, [1.0, 1.0, 1.0]);
+      node.translation = node.translation ?? [0.0, 0.0, 0.0];
+      node.rotation = node.rotation ?? [0.0, 0.0, 0.0, 1.0];
+      node.scale = node.scale ?? [1.0, 1.0, 1.0];
     } else {
-      node.matrix = defaultValue(
-        node.matrix,
-        [
-          1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0,
-          0.0, 1.0,
-        ]
-      );
+      node.matrix = node.matrix ?? [
+        1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0,
+        0.0, 1.0,
+      ];
     }
   });
 
   ForEach.sampler(gltf, function (sampler) {
-    sampler.wrapS = defaultValue(sampler.wrapS, WebGLConstants.REPEAT);
-    sampler.wrapT = defaultValue(sampler.wrapT, WebGLConstants.REPEAT);
+    sampler.wrapS = sampler.wrapS ?? WebGLConstants.REPEAT;
+    sampler.wrapT = sampler.wrapT ?? WebGLConstants.REPEAT;
   });
 
   if (defined(gltf.scenes) && !defined(gltf.scene)) {
@@ -229,7 +202,7 @@ function getAnimatedNodes(gltf) {
 
 function addTextureDefaults(texture) {
   if (defined(texture)) {
-    texture.texCoord = defaultValue(texture.texCoord, 0);
+    texture.texCoord = texture.texCoord ?? 0;
   }
 }
 

package/Source/Scene/GltfPipeline/addToArray.js

@@ -1,5 +1,3 @@
-import defaultValue from "../../Core/defaultValue.js";
-
 /**
  * Adds an element to an array and returns the element's index.
  *
@@ -10,7 +8,7 @@ import defaultValue from "../../Core/defaultValue.js";
  * @private
  */
 function addToArray(array, element, checkDuplicates) {
-  checkDuplicates = defaultValue(checkDuplicates, false);
+  checkDuplicates = checkDuplicates ?? false;
   if (checkDuplicates) {
     const index = array.indexOf(element);
     if (index > -1) {

package/Source/Scene/GltfPipeline/moveTechniqueRenderStates.js

@@ -1,6 +1,5 @@
 import addExtensionsUsed from "./addExtensionsUsed.js";
 import ForEach from "./ForEach.js";
-import defaultValue from "../../Core/defaultValue.js";
 import defined from "../../Core/defined.js";
 import WebGLConstants from "../../Core/WebGLConstants.js";
 
@@ -84,10 +83,8 @@ function moveTechniqueRenderStates(gltf) {
             defined(blendFunctions.blendFuncSeparate))
         ) {
           blendingForTechnique[techniqueIndex] = {
-            blendEquation: defaultValue(
-              blendFunctions.blendEquationSeparate,
-              defaultBlendEquation
-            ),
+            blendEquation:
+              blendFunctions.blendEquationSeparate ?? defaultBlendEquation,
             blendFactors: getSupportedBlendFactors(
               blendFunctions.blendFuncSeparate,
               defaultBlendFactors

package/Source/Scene/GltfPipeline/parseGlb.js

@@ -1,6 +1,5 @@
 import addPipelineExtras from "./addPipelineExtras.js";
 import removeExtensionsUsed from "./removeExtensionsUsed.js";
-import defaultValue from "../../Core/defaultValue.js";
 import defined from "../../Core/defined.js";
 import getMagic from "../../Core/getMagic.js";
 import getStringFromTypedArray from "../../Core/getStringFromTypedArray.js";
@@ -72,10 +71,7 @@ function parseGlbVersion1(glb, header) {
   const buffers = gltf.buffers;
   if (defined(buffers) && Object.keys(buffers).length > 0) {
     // In some older models, the binary glTF buffer is named KHR_binary_glTF
-    const binaryGltfBuffer = defaultValue(
-      buffers.binary_glTF,
-      buffers.KHR_binary_glTF
-    );
+    const binaryGltfBuffer = buffers.binary_glTF ?? buffers.KHR_binary_glTF;
     if (defined(binaryGltfBuffer)) {
       binaryGltfBuffer.extras._pipeline.source = binaryBuffer;
       delete binaryGltfBuffer.uri;

package/Source/Scene/GltfPipeline/removeUnusedElements.js

@@ -1,7 +1,6 @@
 import ForEach from "./ForEach.js";
 import forEachTextureInMaterial from "./forEachTextureInMaterial.js";
 import usesExtension from "./usesExtension.js";
-import defaultValue from "../../Core/defaultValue.js";
 import defined from "../../Core/defined.js";
 
 const allElementTypes = [
@@ -25,7 +24,7 @@ const allElementTypes = [
  * @private
  */
 function removeUnusedElements(gltf, elementTypes) {
-  elementTypes = defaultValue(elementTypes, allElementTypes);
+  elementTypes = elementTypes ?? allElementTypes;
   allElementTypes.forEach(function (type) {
     if (elementTypes.indexOf(type) > -1) {
       removeUnusedElementsByType(gltf, type);

package/Source/Scene/GltfPipeline/updateVersion.js

@@ -13,7 +13,7 @@ import Cartesian3 from "../../Core/Cartesian3.js";
 import Cartesian4 from "../../Core/Cartesian4.js";
 import clone from "../../Core/clone.js";
 import ComponentDatatype from "../../Core/ComponentDatatype.js";
-import defaultValue from "../../Core/defaultValue.js";
+import Frozen from "../../Core/Frozen.js";
 import defined from "../../Core/defined.js";
 import Matrix4 from "../../Core/Matrix4.js";
 import Quaternion from "../../Core/Quaternion.js";
@@ -40,16 +40,14 @@ const updateFunctions = {
  * @private
  */
 function updateVersion(gltf, options) {
-  options = defaultValue(options, defaultValue.EMPTY_OBJECT);
+  options = options ?? Frozen.EMPTY_OBJECT;
   const targetVersion = options.targetVersion;
   let version = gltf.version;
 
-  gltf.asset = defaultValue(gltf.asset, {
-    version: "1.0",
-  });
+  gltf.asset = gltf.asset ?? { version: "1.0" };
 
-  gltf.asset.version = defaultValue(gltf.asset.version, "1.0");
-  version = defaultValue(version, gltf.asset.version).toString();
+  gltf.asset.version = gltf.asset.version ?? "1.0";
+  version = (version ?? gltf.asset.version).toString();
 
   // Invalid version
   if (!Object.prototype.hasOwnProperty.call(updateFunctions, version)) {
@@ -107,11 +105,8 @@ function setPrimitiveModes(gltf) {
         const primitivesLength = primitives.length;
         for (let i = 0; i < primitivesLength; ++i) {
           const primitive = primitives[i];
-          const defaultMode = defaultValue(
-            primitive.primitive,
-            WebGLConstants.TRIANGLES
-          );
-          primitive.mode = defaultValue(primitive.mode, defaultMode);
+          const defaultMode = primitive.primitive ?? WebGLConstants.TRIANGLES;
+          primitive.mode = primitive.mode ?? defaultMode;
           delete primitive.primitive;
         }
       }
@@ -205,23 +200,15 @@ function removeTechniquePasses(gltf) {
       const technique = techniques[techniqueId];
       const passes = technique.passes;
       if (defined(passes)) {
-        const passName = defaultValue(technique.pass, "defaultPass");
+        const passName = technique.pass ?? "defaultPass";
         if (Object.prototype.hasOwnProperty.call(passes, passName)) {
           const pass = passes[passName];
           const instanceProgram = pass.instanceProgram;
-          technique.attributes = defaultValue(
-            technique.attributes,
-            instanceProgram.attributes
-          );
-          technique.program = defaultValue(
-            technique.program,
-            instanceProgram.program
-          );
-          technique.uniforms = defaultValue(
-            technique.uniforms,
-            instanceProgram.uniforms
-          );
-          technique.states = defaultValue(technique.states, pass.states);
+          technique.attributes =
+            technique.attributes ?? instanceProgram.attributes;
+          technique.program = technique.program ?? instanceProgram.program;
+          technique.uniforms = technique.uniforms ?? instanceProgram.uniforms;
+          technique.states = technique.states ?? pass.states;
         }
         delete technique.passes;
         delete technique.pass;
@@ -269,9 +256,9 @@ function glTF08to10(gltf) {
   }
   // gltf.lights -> khrMaterialsCommon.lights
   if (defined(gltf.lights)) {
-    const extensions = defaultValue(gltf.extensions, {});
+    const extensions = gltf.extensions ?? {};
     gltf.extensions = extensions;
-    const materialsCommon = defaultValue(extensions.KHR_materials_common, {});
+    const materialsCommon = extensions.KHR_materials_common ?? {};
     extensions.KHR_materials_common = materialsCommon;
     materialsCommon.lights = gltf.lights;
     delete gltf.lights;
@@ -611,7 +598,7 @@ const knownExtensions = {
 };
 function requireKnownExtensions(gltf) {
   const extensionsUsed = gltf.extensionsUsed;
-  gltf.extensionsRequired = defaultValue(gltf.extensionsRequired, []);
+  gltf.extensionsRequired = gltf.extensionsRequired ?? [];
   if (defined(extensionsUsed)) {
     const extensionsUsedLength = extensionsUsed.length;
     for (let i = 0; i < extensionsUsedLength; ++i) {
@@ -768,7 +755,7 @@ function requireByteLength(gltf) {
       const accessorByteEnd =
         accessor.byteOffset + accessor.count * accessorByteStride;
       bufferView.byteLength = Math.max(
-        defaultValue(bufferView.byteLength, 0),
+        bufferView.byteLength ?? 0,
         accessorByteEnd
       );
     }
@@ -793,10 +780,8 @@ function moveByteStrideToBufferView(gltf) {
   const bufferViewMap = {};
   ForEach.accessor(gltf, function (accessor) {
     if (defined(accessor.bufferView)) {
-      bufferViewMap[accessor.bufferView] = defaultValue(
-        bufferViewMap[accessor.bufferView],
-        []
-      );
+      bufferViewMap[accessor.bufferView] =
+        bufferViewMap[accessor.bufferView] ?? [];
       bufferViewMap[accessor.bufferView].push(accessor);
     }
   });
@@ -955,7 +940,7 @@ function validatePresentAccessorMinMax(gltf) {
 }
 
 function glTF10to20(gltf) {
-  gltf.asset = defaultValue(gltf.asset, {});
+  gltf.asset = gltf.asset ?? {};
   gltf.asset.version = "2.0";
   // material.instanceTechnique properties should be directly on the material. instanceTechnique is a gltf 0.8 property but is seen in some 1.0 models.
   updateInstanceTechniques(gltf);
@@ -1052,15 +1037,11 @@ function srgbToLinear(srgb) {
 }
 
 function convertTechniquesToPbr(gltf, options) {
-  options = defaultValue(options, defaultValue.EMPTY_OBJECT);
-  const baseColorTextureNames = defaultValue(
-    options.baseColorTextureNames,
-    defaultBaseColorTextureNames
-  );
-  const baseColorFactorNames = defaultValue(
-    options.baseColorFactorNames,
-    defaultBaseColorFactorNames
-  );
+  options = options ?? Frozen.EMPTY_OBJECT;
+  const baseColorTextureNames =
+    options.baseColorTextureNames ?? defaultBaseColorTextureNames;
+  const baseColorFactorNames =
+    options.baseColorFactorNames ?? defaultBaseColorFactorNames;
 
   // Future work: convert other values like emissive, specular, etc. Only handling diffuse right now.
   ForEach.material(gltf, function (material) {
@@ -1102,16 +1083,14 @@ function assignAsEmissive(material, emissive) {
 function convertMaterialsCommonToPbr(gltf) {
   // Future work: convert KHR_materials_common lights to KHR_lights_punctual
   ForEach.material(gltf, function (material) {
-    const materialsCommon = defaultValue(
-      material.extensions,
-      defaultValue.EMPTY_OBJECT
-    ).KHR_materials_common;
+    const materialsCommon = (material.extensions ?? Frozen.EMPTY_OBJECT)
+      .KHR_materials_common;
     if (!defined(materialsCommon)) {
       // Nothing to do
       return;
     }
 
-    const values = defaultValue(materialsCommon.values, {});
+    const values = materialsCommon.values ?? {};
     const ambient = values.ambient;
     const diffuse = values.diffuse;
     const emission = values.emission;