@cesium/engine 18.3.1-ion.1 → 20.0.0

package/Source/Scene/GltfLoader.js

@@ -32,6 +32,8 @@ import VertexAttributeSemantic from "./VertexAttributeSemantic.js";
 import GltfGpmLoader from "./Model/Extensions/Gpm/GltfGpmLoader.js";
 import GltfMeshPrimitiveGpmLoader from "./Model/Extensions/Gpm/GltfMeshPrimitiveGpmLoader.js";
 import oneTimeWarning from "../Core/oneTimeWarning.js";
+import addAllToArray from "../Core/addAllToArray.js";
+import getMeshPrimitives from "./getMeshPrimitives.js";
 
 const {
   Attribute,
@@ -1981,6 +1983,22 @@ function loadMorphTarget(
   return morphTarget;
 }
 
+function fetchSpzExtensionFrom(extensions) {
+  const gaussianSplatting = extensions?.KHR_gaussian_splatting;
+  const gsExtensions = gaussianSplatting?.extensions;
+  const spz = gsExtensions?.KHR_gaussian_splatting_compression_spz_2;
+  if (defined(spz)) {
+    return spz;
+  }
+
+  const legacySpz = extensions?.KHR_spz_gaussian_splats_compression;
+  if (defined(legacySpz)) {
+    return legacySpz;
+  }
+
+  return undefined;
+}
+
 /**
  * Load resources associated with a mesh primitive for a glTF node
  * @param {GltfLoader} loader
@@ -2018,7 +2036,8 @@ function loadPrimitive(loader, gltfPrimitive, hasInstances, frameState) {
     );
   }
 
-  const spzExtension = extensions.KHR_spz_gaussian_splats_compression;
+  //support the latest glTF spec and the legacy extension
+  const spzExtension = fetchSpzExtensionFrom(extensions);
   if (defined(spzExtension)) {
     needsPostProcessing = true;
     primitivePlan.needsGaussianSplats = true;
@@ -2431,7 +2450,7 @@ function loadNode(loader, gltfNode, frameState) {
   const meshId = gltfNode.mesh;
   if (defined(meshId)) {
     const mesh = loader.gltfJson.meshes[meshId];
-    const primitives = mesh.primitives;
+    const primitives = getMeshPrimitives(mesh);
     for (let i = 0; i < primitives.length; ++i) {
       node.primitives.push(
         loadPrimitive(
@@ -2827,12 +2846,12 @@ function parse(loader, frameState) {
 
   // Gather promises and handle any errors
   const readyPromises = [];
-  readyPromises.push.apply(readyPromises, loader._loaderPromises);
+  addAllToArray(readyPromises, loader._loaderPromises);
 
   // When incrementallyLoadTextures is true, the errors are caught and thrown individually
   // since it doesn't affect the overall loader state
   if (!loader._incrementallyLoadTextures) {
-    readyPromises.push.apply(readyPromises, loader._texturesPromises);
+    addAllToArray(readyPromises, loader._texturesPromises);
   }
 
   return Promise.all(readyPromises);

package/Source/Scene/GltfPipeline/ForEach.js

@@ -80,7 +80,7 @@ ForEach.accessorWithSemantic = function (gltf, semantic, handler) {
               return value;
             }
           }
-        }
+        },
       );
 
       if (defined(valueForEach)) {
@@ -102,7 +102,7 @@ ForEach.accessorWithSemantic = function (gltf, semantic, handler) {
                 return value;
               }
             }
-          }
+          },
         );
       });
     });
@@ -124,7 +124,7 @@ ForEach.accessorContainingVertexAttributeData = function (gltf, handler) {
               return value;
             }
           }
-        }
+        },
       );
 
       if (defined(valueForEach)) {
@@ -143,7 +143,7 @@ ForEach.accessorContainingVertexAttributeData = function (gltf, handler) {
                 return value;
               }
             }
-          }
+          },
         );
       });
     });
@@ -322,7 +322,7 @@ ForEach.program = function (gltf, handler) {
   if (usesExtension(gltf, "KHR_techniques_webgl")) {
     return ForEach.object(
       gltf.extensions.KHR_techniques_webgl.programs,
-      handler
+      handler,
     );
   }
 
@@ -341,7 +341,7 @@ ForEach.shader = function (gltf, handler) {
   if (usesExtension(gltf, "KHR_techniques_webgl")) {
     return ForEach.object(
       gltf.extensions.KHR_techniques_webgl.shaders,
-      handler
+      handler,
     );
   }
 
@@ -410,7 +410,7 @@ ForEach.technique = function (gltf, handler) {
   if (usesExtension(gltf, "KHR_techniques_webgl")) {
     return ForEach.object(
       gltf.extensions.KHR_techniques_webgl.techniques,
-      handler
+      handler,
     );
   }
 

package/Source/Scene/GltfPipeline/addDefaults.js

@@ -1,7 +1,6 @@
 import addToArray from "./addToArray.js";
 import ForEach from "./ForEach.js";
 import getAccessorByteStride from "./getAccessorByteStride.js";
-import Frozen from "../../Core/Frozen.js";
 import defined from "../../Core/defined.js";
 import WebGLConstants from "../../Core/WebGLConstants.js";
 
@@ -62,7 +61,7 @@ function addDefaults(gltf) {
   });
 
   ForEach.material(gltf, function (material) {
-    const extensions = material.extensions ?? Frozen.EMPTY_OBJECT;
+    const extensions = material.extensions ?? {};
     const materialsCommon = extensions.KHR_materials_common;
     if (defined(materialsCommon)) {
       const technique = materialsCommon.technique;

package/Source/Scene/GltfPipeline/addToArray.js

@@ -1,3 +1,5 @@
+
+
 /**
  * Adds an element to an array and returns the element's index.
  *

package/Source/Scene/GltfPipeline/findAccessorMinMax.js

@@ -52,7 +52,7 @@ function findAccessorMinMax(gltf, accessor) {
       byteOffset,
       numberOfComponents,
       componentTypeByteLength,
-      components
+      components,
     );
     for (let j = 0; j < numberOfComponents; j++) {
       const value = components[j];

package/Source/Scene/GltfPipeline/getComponentReader.js

@@ -16,11 +16,11 @@ function getComponentReader(componentType) {
         byteOffset,
         numberOfComponents,
         componentTypeByteLength,
-        result
+        result,
       ) {
         for (let i = 0; i < numberOfComponents; ++i) {
           result[i] = dataView.getInt8(
-            byteOffset + i * componentTypeByteLength
+            byteOffset + i * componentTypeByteLength,
           );
         }
       };
@@ -30,11 +30,11 @@ function getComponentReader(componentType) {
         byteOffset,
         numberOfComponents,
         componentTypeByteLength,
-        result
+        result,
       ) {
         for (let i = 0; i < numberOfComponents; ++i) {
           result[i] = dataView.getUint8(
-            byteOffset + i * componentTypeByteLength
+            byteOffset + i * componentTypeByteLength,
           );
         }
       };
@@ -44,12 +44,12 @@ function getComponentReader(componentType) {
         byteOffset,
         numberOfComponents,
         componentTypeByteLength,
-        result
+        result,
       ) {
         for (let i = 0; i < numberOfComponents; ++i) {
           result[i] = dataView.getInt16(
             byteOffset + i * componentTypeByteLength,
-            true
+            true,
           );
         }
       };
@@ -59,12 +59,12 @@ function getComponentReader(componentType) {
         byteOffset,
         numberOfComponents,
         componentTypeByteLength,
-        result
+        result,
       ) {
         for (let i = 0; i < numberOfComponents; ++i) {
           result[i] = dataView.getUint16(
             byteOffset + i * componentTypeByteLength,
-            true
+            true,
           );
         }
       };
@@ -74,12 +74,12 @@ function getComponentReader(componentType) {
         byteOffset,
         numberOfComponents,
         componentTypeByteLength,
-        result
+        result,
       ) {
         for (let i = 0; i < numberOfComponents; ++i) {
           result[i] = dataView.getInt32(
             byteOffset + i * componentTypeByteLength,
-            true
+            true,
           );
         }
       };
@@ -89,12 +89,12 @@ function getComponentReader(componentType) {
         byteOffset,
         numberOfComponents,
         componentTypeByteLength,
-        result
+        result,
       ) {
         for (let i = 0; i < numberOfComponents; ++i) {
           result[i] = dataView.getUint32(
             byteOffset + i * componentTypeByteLength,
-            true
+            true,
           );
         }
       };
@@ -104,12 +104,12 @@ function getComponentReader(componentType) {
         byteOffset,
         numberOfComponents,
         componentTypeByteLength,
-        result
+        result,
       ) {
         for (let i = 0; i < numberOfComponents; ++i) {
           result[i] = dataView.getFloat32(
             byteOffset + i * componentTypeByteLength,
-            true
+            true,
           );
         }
       };
@@ -119,12 +119,12 @@ function getComponentReader(componentType) {
         byteOffset,
         numberOfComponents,
         componentTypeByteLength,
-        result
+        result,
       ) {
         for (let i = 0; i < numberOfComponents; ++i) {
           result[i] = dataView.getFloat64(
             byteOffset + i * componentTypeByteLength,
-            true
+            true,
           );
         }
       };

package/Source/Scene/GltfPipeline/moveTechniqueRenderStates.js

@@ -87,7 +87,7 @@ function moveTechniqueRenderStates(gltf) {
               blendFunctions.blendEquationSeparate ?? defaultBlendEquation,
             blendFactors: getSupportedBlendFactors(
               blendFunctions.blendFuncSeparate,
-              defaultBlendFactors
+              defaultBlendFactors,
             ),
           };
         }

package/Source/Scene/GltfPipeline/moveTechniquesToExtension.js

@@ -44,7 +44,7 @@ function moveTechniquesToExtension(gltf) {
           technique.attributes[attributeName] = {
             semantic: parameterLegacy.semantic,
           };
-        }
+        },
       );
 
       ForEach.techniqueUniform(
@@ -64,7 +64,7 @@ function moveTechniquesToExtension(gltf) {
             mappedUniforms[techniqueId] = {};
           }
           mappedUniforms[techniqueId][parameterName] = uniformName;
-        }
+        },
       );
 
       if (!defined(seenPrograms[techniqueLegacy.program])) {
@@ -92,7 +92,7 @@ function moveTechniquesToExtension(gltf) {
       // Store the index of the new technique to reference instead.
       updatedTechniqueIndices[techniqueId] = addToArray(
         extension.techniques,
-        technique
+        technique,
       );
     });
 

package/Source/Scene/GltfPipeline/parseGlb.js

@@ -43,7 +43,7 @@ function readHeader(glb, byteOffset, count) {
   for (let i = 0; i < count; ++i) {
     header[i] = dataView.getUint32(
       glb.byteOffset + byteOffset + i * sizeOfUint32,
-      true
+      true,
     );
   }
   return header;

package/Source/Scene/GltfPipeline/readAccessorPacked.js

@@ -16,7 +16,7 @@ import defined from "../../Core/defined.js";
 function readAccessorPacked(gltf, accessor) {
   const byteStride = getAccessorByteStride(gltf, accessor);
   const componentTypeByteLength = ComponentDatatype.getSizeInBytes(
-    accessor.componentType
+    accessor.componentType,
   );
   const numberOfComponents = numberOfComponentsForType(accessor.type);
   const count = accessor.count;
@@ -41,7 +41,7 @@ function readAccessorPacked(gltf, accessor) {
       byteOffset,
       numberOfComponents,
       componentTypeByteLength,
-      components
+      components,
     );
     for (let j = 0; j < numberOfComponents; ++j) {
       values[i * numberOfComponents + j] = components[j];

package/Source/Scene/GltfPipeline/removeUnusedElements.js

@@ -87,7 +87,7 @@ Remove.accessor = function (gltf, accessorId) {
           if (attributeAccessorId > accessorId) {
             primitive.attributes[semantic]--;
           }
-        }
+        },
       );
 
       // Update accessor ids for the targets.
@@ -98,7 +98,7 @@ Remove.accessor = function (gltf, accessorId) {
             if (attributeAccessorId > accessorId) {
               target[semantic]--;
             }
-          }
+          },
         );
       });
       const indices = primitive.indices;
@@ -548,7 +548,7 @@ getListOfElementsIdsInUse.accessor = function (gltf) {
             const attributeAccessorId =
               node.extensions.EXT_mesh_gpu_instancing.attributes[key];
             usedAccessorIds[attributeAccessorId] = true;
-          }
+          },
         );
       }
     });
@@ -587,9 +587,8 @@ getListOfElementsIdsInUse.buffer = function (gltf) {
       defined(bufferView.extensions) &&
       defined(bufferView.extensions.EXT_meshopt_compression)
     ) {
-      usedBufferIds[
-        bufferView.extensions.EXT_meshopt_compression.buffer
-      ] = true;
+      usedBufferIds[bufferView.extensions.EXT_meshopt_compression.buffer] =
+        true;
     }
   });
 

package/Source/Scene/GltfPipeline/updateAccessorComponentTypes.js

@@ -42,7 +42,7 @@ function updateAccessorComponentTypes(gltf) {
 function convertType(gltf, accessor, updatedComponentType) {
   const typedArray = ComponentDatatype.createTypedArray(
     updatedComponentType,
-    readAccessorPacked(gltf, accessor)
+    readAccessorPacked(gltf, accessor),
   );
   const newBuffer = new Uint8Array(typedArray.buffer);
   accessor.bufferView = addBuffer(gltf, newBuffer);

package/Source/Scene/GltfPipeline/updateVersion.js

@@ -13,7 +13,6 @@ 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 Frozen from "../../Core/Frozen.js";
 import defined from "../../Core/defined.js";
 import Matrix4 from "../../Core/Matrix4.js";
 import Quaternion from "../../Core/Quaternion.js";
@@ -40,11 +39,13 @@ const updateFunctions = {
  * @private
  */
 function updateVersion(gltf, options) {
-  options = options ?? Frozen.EMPTY_OBJECT;
+  options = options ?? {};
   const targetVersion = options.targetVersion;
   let version = gltf.version;
 
-  gltf.asset = gltf.asset ?? { version: "1.0" };
+  gltf.asset = gltf.asset ?? {
+    version: "1.0",
+  };
 
   gltf.asset.version = gltf.asset.version ?? "1.0";
   version = (version ?? gltf.asset.version).toString();
@@ -176,7 +177,7 @@ function updateAnimations(gltf) {
               componentType,
               source.buffer,
               byteOffset,
-              length
+              length,
             );
 
             for (let j = 0; j < count; j++) {
@@ -416,7 +417,7 @@ function objectsToArrays(gltf) {
         primitive,
         function (accessorId, semantic) {
           primitive.attributes[semantic] = globalMapping.accessors[accessorId];
-        }
+        },
       );
       if (defined(primitive.material)) {
         primitive.material = globalMapping.materials[primitive.material];
@@ -636,7 +637,7 @@ function requireAttributeSetIndex(gltf) {
           } else if (semantic === "COLOR") {
             primitive.attributes.COLOR_0 = accessorId;
           }
-        }
+        },
       );
       delete primitive.attributes.TEXCOORD;
       delete primitive.attributes.COLOR;
@@ -695,7 +696,7 @@ function underscoreApplicationSpecificSemantics(gltf) {
               mappedSemantics[semantic] = newSemantic;
             }
           }
-        }
+        },
       );
       for (const semantic in mappedSemantics) {
         if (Object.prototype.hasOwnProperty.call(mappedSemantics, semantic)) {
@@ -756,7 +757,7 @@ function requireByteLength(gltf) {
         accessor.byteOffset + accessor.count * accessorByteStride;
       bufferView.byteLength = Math.max(
         bufferView.byteLength ?? 0,
-        accessorByteEnd
+        accessorByteEnd,
       );
     }
   });
@@ -861,7 +862,7 @@ function isNodeEmpty(node) {
       Cartesian3.fromArray(node.scale).equals(new Cartesian3(1.0, 1.0, 1.0))) &&
     (!defined(node.rotation) ||
       Cartesian4.fromArray(node.rotation).equals(
-        new Cartesian4(0.0, 0.0, 0.0, 1.0)
+        new Cartesian4(0.0, 0.0, 0.0, 1.0),
       )) &&
     (!defined(node.matrix) ||
       Matrix4.fromColumnMajorArray(node.matrix).equals(Matrix4.IDENTITY)) &&
@@ -1028,7 +1029,7 @@ function srgbToLinear(srgb) {
       linear[i] = Math.pow(
         // eslint-disable-next-line no-loss-of-precision
         (c + 0.055) * 0.94786729857819905213270142180095,
-        2.4
+        2.4,
       );
     }
   }
@@ -1037,7 +1038,7 @@ function srgbToLinear(srgb) {
 }
 
 function convertTechniquesToPbr(gltf, options) {
-  options = options ?? Frozen.EMPTY_OBJECT;
+  options = options ?? {};
   const baseColorTextureNames =
     options.baseColorTextureNames ?? defaultBaseColorTextureNames;
   const baseColorFactorNames =
@@ -1083,8 +1084,7 @@ 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 = (material.extensions ?? Frozen.EMPTY_OBJECT)
-      .KHR_materials_common;
+    const materialsCommon = (material.extensions ?? {}).KHR_materials_common;
     if (!defined(materialsCommon)) {
       // Nothing to do
       return;

package/Source/Scene/GltfSpzLoader.js

@@ -194,7 +194,9 @@ GltfSpzLoader.prototype.process = function (frameState) {
     return false;
   }
 
-  const decodePromise = loadSpz(this._bufferViewTypedArray);
+  const decodePromise = loadSpz(this._bufferViewTypedArray, {
+    unpackOptions: { coordinateSystem: "UNSPECIFIED" },
+  });
 
   if (!defined(decodePromise)) {
     return false;

package/Source/Scene/GltfVertexBufferLoader.js

@@ -306,6 +306,26 @@ async function loadFromSpz(vertexBufferLoader) {
   }
 }
 
+function getShAttributePrefix(attribute) {
+  const prefix = attribute.startsWith("KHR_gaussian_splatting:")
+    ? "KHR_gaussian_splatting:"
+    : "_";
+  return `${prefix}SH_DEGREE_`;
+}
+
+function extractSHDegreeAndCoef(attribute) {
+  const prefix = getShAttributePrefix(attribute);
+  const separator = "_COEF_";
+
+  const lStart = prefix.length;
+  const coefIndex = attribute.indexOf(separator, lStart);
+
+  const l = parseInt(attribute.slice(lStart, coefIndex), 10);
+  const n = parseInt(attribute.slice(coefIndex + separator.length), 10);
+
+  return { l, n };
+}
+
 function processSpz(vertexBufferLoader) {
   vertexBufferLoader._state = ResourceLoaderState.PROCESSING;
   const spzLoader = vertexBufferLoader._spzLoader;
@@ -314,9 +334,16 @@ function processSpz(vertexBufferLoader) {
 
   if (vertexBufferLoader._attributeSemantic === "POSITION") {
     vertexBufferLoader._typedArray = gcloudData.positions;
-  } else if (vertexBufferLoader._attributeSemantic === "_SCALE") {
+  } else if (
+    vertexBufferLoader._attributeSemantic === "KHR_gaussian_splatting:SCALE" ||
+    vertexBufferLoader._attributeSemantic === "_SCALE"
+  ) {
     vertexBufferLoader._typedArray = gcloudData.scales;
-  } else if (vertexBufferLoader._attributeSemantic === "_ROTATION") {
+  } else if (
+    vertexBufferLoader._attributeSemantic ===
+      "KHR_gaussian_splatting:ROTATION" ||
+    vertexBufferLoader._attributeSemantic === "_ROTATION"
+  ) {
     vertexBufferLoader._typedArray = gcloudData.rotations;
   } else if (vertexBufferLoader._attributeSemantic === "COLOR_0") {
     const colors = gcloudData.colors;
@@ -344,6 +371,33 @@ function processSpz(vertexBufferLoader) {
         255.0,
       );
     }
+  } else if (vertexBufferLoader._attributeSemantic.includes("SH_DEGREE_")) {
+    const { l, n } = extractSHDegreeAndCoef(
+      vertexBufferLoader._attributeSemantic,
+    );
+    const sphericalHarmonicDegree = gcloudData.shDegree;
+    let stride = 0;
+    const base = [0, 9, 24];
+    switch (sphericalHarmonicDegree) {
+      case 1:
+        stride = 9;
+        break;
+      case 2:
+        stride = 24;
+        break;
+      case 3:
+        stride = 45;
+        break;
+    }
+    const count = gcloudData.numPoints;
+    const sh = gcloudData.sh;
+    vertexBufferLoader._typedArray = new Float32Array(count * 3);
+    for (let i = 0; i < count; i++) {
+      const idx = i * stride + base[l - 1] + n * 3;
+      vertexBufferLoader._typedArray[i * 3] = sh[idx];
+      vertexBufferLoader._typedArray[i * 3 + 1] = sh[idx + 1];
+      vertexBufferLoader._typedArray[i * 3 + 2] = sh[idx + 2];
+    }
   }
 }
 

package/Source/Scene/HeightReference.js

@@ -12,7 +12,7 @@ const HeightReference = {
   NONE: 0,
 
   /**
-   * The position is clamped to the terrain and 3D Tiles.
+   * The position is clamped to the terrain and 3D Tiles. When clamping to 3D Tilesets such as photorealistic 3D Tiles, ensure the tileset has {@link Cesium3DTileset#enableCollision} set to <code>true</code>. Otherwise, the entity may not be correctly clamped to the tileset surface.
    * @type {number}
    * @constant
    */