@cesium/engine 26.0.0 → 26.1.0

package/Source/Scene/GltfBufferViewLoader.js

@@ -1,7 +1,7 @@
 import Check from "../Core/Check.js";
 import Frozen from "../Core/Frozen.js";
 import defined from "../Core/defined.js";
-import hasExtension from "./hasExtension.js";
+import findMeshoptExtension from "./findMeshoptExtension.js";
 import { MeshoptDecoder } from "meshoptimizer";
 import ResourceLoader from "./ResourceLoader.js";
 import ResourceLoaderState from "./ResourceLoaderState.js";
@@ -54,8 +54,8 @@ class GltfBufferViewLoader extends ResourceLoader {
     let meshoptMode;
     let meshoptFilter;
 
-    if (hasExtension(bufferView, "EXT_meshopt_compression")) {
-      const meshopt = bufferView.extensions.EXT_meshopt_compression;
+    const meshopt = findMeshoptExtension(bufferView);
+    if (defined(meshopt)) {
       bufferId = meshopt.buffer;
       byteOffset = meshopt.byteOffset ?? 0;
       byteLength = meshopt.byteLength;

package/Source/Scene/GltfLoader.js

@@ -534,6 +534,7 @@ class GltfLoader extends ResourceLoader {
 
 /**
  * Loads the gltf object
+ * @ignore
  */
 async function loadGltfJson(loader) {
   loader._state = GltfLoaderState.LOADING;

package/Source/Scene/GltfLoaderUtil.js

@@ -111,6 +111,22 @@ GltfLoaderUtil.createSampler = function (options) {
     }
   }
 
+  if (!TextureWrap.validate(wrapS)) {
+    wrapS = TextureWrap.REPEAT;
+  }
+
+  if (!TextureWrap.validate(wrapT)) {
+    wrapT = TextureWrap.REPEAT;
+  }
+
+  if (!TextureMinificationFilter.validate(minFilter)) {
+    minFilter = TextureMinificationFilter.LINEAR;
+  }
+
+  if (!TextureMagnificationFilter.validate(magFilter)) {
+    magFilter = TextureMagnificationFilter.LINEAR;
+  }
+
   return new Sampler({
     wrapS: wrapS,
     wrapT: wrapT,
@@ -164,10 +180,10 @@ GltfLoaderUtil.createModelTextureReader = function (options) {
 
     // prettier-ignore
     transform = new Matrix3(
-        Math.cos(rotation) * scale.x, -Math.sin(rotation) * scale.y, offset.x,
-        Math.sin(rotation) * scale.x, Math.cos(rotation) * scale.y, offset.y,
-        0.0, 0.0, 1.0
-      );
+      Math.cos(rotation) * scale.x, -Math.sin(rotation) * scale.y, offset.x,
+      Math.sin(rotation) * scale.x, Math.cos(rotation) * scale.y, offset.y,
+      0.0, 0.0, 1.0
+    );
   }
 
   const modelTextureReader = new ModelComponents.TextureReader();

package/Source/Scene/GltfPipeline/forEachTextureInMaterial.js

@@ -73,6 +73,16 @@ function forEachTextureInMaterial(material, handler) {
       }
     }
 
+    // Transmission extension
+    const transmission = extensions.KHR_materials_transmission;
+    if (defined(transmission) && defined(transmission.transmissionTexture)) {
+      const textureInfo = transmission.transmissionTexture;
+      const value = handler(textureInfo.index, textureInfo);
+      if (defined(value)) {
+        return value;
+      }
+    }
+
     // Materials common extension (may be present in models converted from glTF 1.0)
     const materialsCommon = extensions.KHR_materials_common;
     if (defined(materialsCommon) && defined(materialsCommon.values)) {

package/Source/Scene/GltfPipeline/removeUnusedElements.js

@@ -148,11 +148,16 @@ Remove.buffer = function (gltf, bufferId) {
       bufferView.buffer--;
     }
 
-    if (
-      defined(bufferView.extensions) &&
-      defined(bufferView.extensions.EXT_meshopt_compression)
-    ) {
-      bufferView.extensions.EXT_meshopt_compression.buffer--;
+    const extensions = bufferView.extensions;
+    if (defined(extensions)) {
+      const ext = extensions.EXT_meshopt_compression;
+      if (defined(ext) && ext.buffer > bufferId) {
+        ext.buffer--;
+      }
+      const khr = extensions.KHR_meshopt_compression;
+      if (defined(khr) && khr.buffer > bufferId) {
+        khr.buffer--;
+      }
     }
   });
 };
@@ -583,12 +588,17 @@ getListOfElementsIdsInUse.buffer = function (gltf) {
     if (defined(bufferView.buffer)) {
       usedBufferIds[bufferView.buffer] = true;
     }
-    if (
-      defined(bufferView.extensions) &&
-      defined(bufferView.extensions.EXT_meshopt_compression)
-    ) {
-      usedBufferIds[bufferView.extensions.EXT_meshopt_compression.buffer] =
-        true;
+
+    const extensions = bufferView.extensions;
+    if (defined(extensions)) {
+      const ext = extensions.EXT_meshopt_compression;
+      if (defined(ext)) {
+        usedBufferIds[ext.buffer] = true;
+      }
+      const khr = extensions.KHR_meshopt_compression;
+      if (defined(khr)) {
+        usedBufferIds[khr.buffer] = true;
+      }
     }
   });
 

package/Source/Scene/ImageryLayer.js

@@ -676,11 +676,11 @@ ImageryLayer.prototype.getImageryRectangle = function () {
  * Create skeletons for the imagery tiles that partially or completely overlap a given terrain
  * tile.
  *
- * @private
+ * @ignore
  *
  * @param {QuadtreeTile} tile The terrain tile.
  * @param {TerrainProvider|undefined} terrainProvider The terrain provider associated with the terrain tile.
- * @param {number} insertionPoint The position to insert new skeletons before in the tile's imagery list.
+ * @param {number} [insertionPoint] The position to insert new skeletons before in the tile's imagery list.
  * @returns {boolean} true if this layer overlaps any portion of the terrain tile; otherwise, false.
  */
 ImageryLayer.prototype._createTileImagerySkeletons = function (

package/Source/Scene/ImageryLayerCollection.js

@@ -545,7 +545,7 @@ ImageryLayerCollection.prototype.pickImageryLayerFeatures = function (
 /**
  * Updates frame state to execute any queued texture re-projections.
  *
- * @private
+ * @ignore
  *
  * @param {FrameState} frameState The frameState.
  */
@@ -561,7 +561,7 @@ ImageryLayerCollection.prototype.queueReprojectionCommands = function (
 /**
  * Cancels re-projection commands queued for the next frame.
  *
- * @private
+ * @ignore
  */
 ImageryLayerCollection.prototype.cancelReprojections = function () {
   const layers = this._layers;

package/Source/Scene/Material.js

@@ -1099,6 +1099,7 @@ function createCubeMapUpdateFunction(uniformId) {
  * @param {Material} material The material to load the cubemap images for.
  * @param {string} uniformId The ID of the uniform that corresponds to the cubemap images.
  * @returns A promise that resolves when the images are loaded, or a resolved promise if image loading is not necessary.
+ * @ignore
  */
 function loadCubeMapImagesForUniform(material, uniformId) {
   const uniforms = material.uniforms;

package/Source/Scene/Model/Extensions/Gpm/GltfGpmLoader.js

@@ -30,6 +30,7 @@ function GltfGpmLoader() {}
  *
  * @param {number[]} array The input array
  * @returns {Matrix3} The Matrix3
+ * @ignore
  */
 function createCovarianceMatrixFromUpperTriangle(array) {
   const covarianceMatrix = new Matrix3(
@@ -51,6 +52,7 @@ function createCovarianceMatrixFromUpperTriangle(array) {
  *
  * @param {object} anchorPointDirectJson The input JSON
  * @returns {AnchorPointDirect} The direct anchor point
+ * @ignore
  */
 function createAnchorPointDirect(anchorPointDirectJson) {
   const position = Cartesian3.fromArray(
@@ -75,6 +77,7 @@ function createAnchorPointDirect(anchorPointDirectJson) {
  *
  * @param {object} anchorPointIndirectJson The input JSON
  * @returns {AnchorPointIndirect} The indirect anchor point
+ * @ignore
  */
 function createAnchorPointIndirect(anchorPointIndirectJson) {
   const position = Cartesian3.fromArray(
@@ -103,6 +106,7 @@ function createAnchorPointIndirect(anchorPointIndirectJson) {
  *
  * @param {object} correlationGroupJson The input JSON
  * @returns {CorrelationGroup} The correlation group
+ * @ignore
  */
 function createCorrelationGroup(correlationGroupJson) {
   const groupFlags = correlationGroupJson.groupFlags;

package/Source/Scene/Model/Model.js

@@ -108,6 +108,9 @@ import ModelImagery from "./ModelImagery.js";
  *  {@link https://github.com/KhronosGroup/glTF/tree/main/extensions/2.0/Khronos/KHR_mesh_quantization|KHR_mesh_quantization}
  *  </li>
  *  <li>
+ *  {@link https://github.com/KhronosGroup/glTF/tree/main/extensions/2.0/Khronos/KHR_meshopt_compression|KHR_meshopt_compression}
+ *  </li>
+ *  <li>
  *  {@link https://github.com/KhronosGroup/glTF/blob/master/extensions/2.0/Khronos/KHR_texture_basisu|KHR_texture_basisu}
  *  </li>
  *  <li>

package/Source/Scene/Model/ModelUtility.js

@@ -371,6 +371,7 @@ ModelUtility.supportedExtensions = {
   KHR_materials_unlit: true,
   KHR_mesh_quantization: true,
   KHR_mesh_primitive_restart: true,
+  KHR_meshopt_compression: true,
   KHR_techniques_webgl: true,
   KHR_texture_basisu: true,
   KHR_texture_transform: true,

package/Source/Scene/Picking.js

@@ -247,6 +247,7 @@ const scratchColorZero = new Color(0.0, 0.0, 0.0, 0.0);
  * height will default to the value of <code>width</code>
  * @param {BoundingRectangle} result The result rectangle
  * @returns {BoundingRectangle} The result rectangle
+ * @ignore
  */
 function computePickingDrawingBufferRectangle(
   drawingBufferHeight,
@@ -270,6 +271,7 @@ function computePickingDrawingBufferRectangle(
  * @param {BoundingRectangle} drawingBufferRectangle The output drawing buffer recangle.
  * @param {number} [width=3] Width of the pick rectangle.
  * @param {number} [height=3] Height of the pick rectangle.
+ * @ignore
  */
 function pickBegin(
   scene,
@@ -332,6 +334,7 @@ function pickBegin(
  * Teardown needed after picking.
  *
  * @param {Scene} scene
+ * @ignore
  */
 function pickEnd(scene) {
   const { context } = scene;
@@ -808,6 +811,7 @@ Picking.prototype.pickPosition = function (scene, windowPosition, result) {
  * @param {object[]} pickedAttributes
  * @param {object[]} pickedFeatures
  * @returns {boolean} whether picking should end
+ * @ignore
  */
 function addDrillPickedResults(
   pickedResults,
@@ -875,6 +879,7 @@ function addDrillPickedResults(
  * @param {function(number): object[]} pickCallback Pick callback to execute each iteration
  * @param {number} [limit=Number.MAX_VALUE] If supplied, stop drilling after collecting this many picks
  * @returns {object[]} List of picked results
+ * @ignore
  */
 function drillPick(pickCallback, limit) {
   // PERFORMANCE_IDEA: This function calls each primitive's update for each pass. Instead

package/Source/Scene/PntsParser.js

@@ -214,6 +214,7 @@ PntsParser.parse = function (arrayBuffer, byteOffset) {
  * a one-time warning will be printed.
  *
  * @param {object} parsedContent The parsed content
+ * @ignore
  */
 function removeInvalidBinaryBodyReferences(parsedContent) {
   const batchTableJson = parsedContent.batchTableJson;

package/Source/Scene/QuadtreePrimitive.js

@@ -1527,11 +1527,12 @@ function updateHeights(primitive, frameState) {
           );
 
           if (defined(position)) {
-            // Store the computed position in the cache for future reuse
+            // `pick` wrote into the module-level `scratchPosition`, so `position`
+            // aliases it — clone before caching or the next pick mutates every entry.
             tile.setPositionCacheEntry(
               data.positionCartographic,
               primitive.maximumScreenSpaceError,
-              position,
+              Cartesian3.clone(position),
             );
           }
         }

package/Source/Scene/ResourceCacheKey.js

@@ -3,8 +3,8 @@ import Frozen from "../Core/Frozen.js";
 import defined from "../Core/defined.js";
 import DeveloperError from "../Core/DeveloperError.js";
 import getAbsoluteUri from "../Core/getAbsoluteUri.js";
+import findMeshoptExtension from "./findMeshoptExtension.js";
 import GltfLoaderUtil from "./GltfLoaderUtil.js";
-import hasExtension from "./hasExtension.js";
 
 /**
  * Compute cache keys for resources in {@link ResourceCache}.
@@ -22,8 +22,8 @@ function getExternalResourceCacheKey(resource) {
 function getBufferViewCacheKey(bufferView) {
   let { byteOffset, byteLength } = bufferView;
 
-  if (hasExtension(bufferView, "EXT_meshopt_compression")) {
-    const meshopt = bufferView.extensions.EXT_meshopt_compression;
+  const meshopt = findMeshoptExtension(bufferView);
+  if (defined(meshopt)) {
     byteOffset = meshopt.byteOffset ?? 0;
     byteLength = meshopt.byteLength;
   }
@@ -247,8 +247,8 @@ ResourceCacheKey.getBufferViewCacheKey = function (options) {
   const bufferView = gltf.bufferViews[bufferViewId];
   let bufferId = bufferView.buffer;
   const buffer = gltf.buffers[bufferId];
-  if (hasExtension(bufferView, "EXT_meshopt_compression")) {
-    const meshopt = bufferView.extensions.EXT_meshopt_compression;
+  const meshopt = findMeshoptExtension(bufferView);
+  if (defined(meshopt)) {
     bufferId = meshopt.buffer;
   }
 

package/Source/Scene/Scene.js

@@ -2466,6 +2466,7 @@ function createWorkingFrustum(camera) {
  *
  * @param {Scene} scene The scene.
  * @returns {Function} A function to execute translucent commands.
+ * @ignore
  */
 function obtainTranslucentCommandExecutionFunction(scene) {
   if (scene._environmentState.useOIT) {

package/Source/Scene/findMeshoptExtension.js

@@ -0,0 +1,23 @@
+import defined from "../Core/defined.js";
+
+/**
+ * Returns the meshopt compression extension object, KHR_meshopt_compression or
+ * EXT_meshopt_compression, on a glTF bufferView or buffer. If both are present,
+ * KHR is preferred.
+ * @param {object} gltfObject A glTF bufferView or buffer.
+ * @returns {object|undefined} The meshopt extension object, or undefined.
+ * @private
+ */
+function findMeshoptExtension(gltfObject) {
+  const extensions = gltfObject?.extensions;
+  if (!defined(extensions)) {
+    return undefined;
+  }
+
+  return (
+    extensions["KHR_meshopt_compression"] ??
+    extensions["EXT_meshopt_compression"]
+  );
+}
+
+export default findMeshoptExtension;

package/Source/Scene/renderBufferPointCollection.js

@@ -109,6 +109,8 @@ function renderBufferPointCollection(collection, frameState, renderContext) {
   if (collection._dirtyCount > 0) {
     const { attributeArrays } = renderContext;
 
+    const positionHighArray = attributeArrays.positionHigh;
+    const positionLowArray = attributeArrays.positionLow;
     const pickColorArray = attributeArrays.pickColor;
     const showSizeColorAlphaArray = attributeArrays.showSizeColorAlpha;
     const outlineWidthColorAlphaArray = attributeArrays.outlineWidthColorAlpha;
@@ -125,12 +127,10 @@ function renderBufferPointCollection(collection, frameState, renderContext) {
       if (useFloat64) {
         point.getPosition(cartesian);
         EncodedCartesian3.fromCartesian(cartesian, encodedCartesian);
-        attributeArrays.positionHigh[i * 3] = encodedCartesian.high.x;
-        attributeArrays.positionHigh[i * 3 + 1] = encodedCartesian.high.y;
-        attributeArrays.positionHigh[i * 3 + 2] = encodedCartesian.high.z;
-        attributeArrays.positionLow[i * 3] = encodedCartesian.low.x;
-        attributeArrays.positionLow[i * 3 + 1] = encodedCartesian.low.y;
-        attributeArrays.positionLow[i * 3 + 2] = encodedCartesian.low.z;
+        // @ts-expect-error https://github.com/CesiumGS/cesium/pull/13302
+        Cartesian3.pack(encodedCartesian.high, positionHighArray, i * 3);
+        // @ts-expect-error https://github.com/CesiumGS/cesium/pull/13302
+        Cartesian3.pack(encodedCartesian.low, positionLowArray, i * 3);
       }
 
       point.getMaterial(material);
@@ -150,9 +150,14 @@ function renderBufferPointCollection(collection, frameState, renderContext) {
 
       outlineWidthColorAlphaArray[i * 3] = material.outlineWidth;
       outlineWidthColorAlphaArray[i * 3 + 1] = AttributeCompression.encodeRGB8(
-        material.outlineColor,
+        // When outlineWidth=0, overwrite outlineColor to prevent subpixel bleeding.
+        material.outlineWidth > 0 ? material.outlineColor : material.color,
       );
-      outlineWidthColorAlphaArray[i * 3 + 2] = material.outlineColor.alpha;
+      outlineWidthColorAlphaArray[i * 3 + 2] =
+        // When outlineWidth=0, overwrite outlineAlpha to prevent subpixel bleeding.
+        material.outlineWidth > 0
+          ? material.outlineColor.alpha
+          : material.color.alpha;
 
       point._dirty = false;
     }

package/Source/Scene/renderBufferPolygonCollection.js

@@ -73,7 +73,7 @@ const polygon = new BufferPolygon();
 const material = new BufferPolygonMaterial();
 const pickColor = new Color();
 const cartesian = new Cartesian3();
-const encodedCartesian = new EncodedCartesian3();
+const encodedC = new EncodedCartesian3();
 
 /**
  * @param {BufferPolygonCollection} collection
@@ -118,6 +118,8 @@ function renderBufferPolygonCollection(collection, frameState, renderContext) {
     const { attributeArrays } = renderContext;
     const { _dirtyOffset, _dirtyCount } = collection;
 
+    const positionHighArray = attributeArrays.positionHigh;
+    const positionLowArray = attributeArrays.positionLow;
     const indexArray = renderContext.indexArray;
     const pickColorArray = attributeArrays.pickColor;
     const showColorAlphaArray = attributeArrays.showColorAlpha;
@@ -152,19 +154,13 @@ function renderBufferPolygonCollection(collection, frameState, renderContext) {
       // Update vertex arrays.
       for (let j = 0, jl = polygon.vertexCount; j < jl; j++) {
         if (useFloat64) {
-          // @ts-expect-error TODO(tsd-jsdoc): See https://github.com/CesiumGS/cesium/pull/13302.
+          // @ts-expect-error https://github.com/CesiumGS/cesium/pull/13302
           Cartesian3.fromArray(cartesianArray, j * 3, cartesian);
-          EncodedCartesian3.fromCartesian(cartesian, encodedCartesian);
-
-          attributeArrays.positionHigh[vOffset * 3] = encodedCartesian.high.x;
-          attributeArrays.positionHigh[vOffset * 3 + 1] =
-            encodedCartesian.high.y;
-          attributeArrays.positionHigh[vOffset * 3 + 2] =
-            encodedCartesian.high.z;
-
-          attributeArrays.positionLow[vOffset * 3] = encodedCartesian.low.x;
-          attributeArrays.positionLow[vOffset * 3 + 1] = encodedCartesian.low.y;
-          attributeArrays.positionLow[vOffset * 3 + 2] = encodedCartesian.low.z;
+          EncodedCartesian3.fromCartesian(cartesian, encodedC);
+          // @ts-expect-error https://github.com/CesiumGS/cesium/pull/13302
+          Cartesian3.pack(encodedC.high, positionHighArray, vOffset * 3);
+          // @ts-expect-error https://github.com/CesiumGS/cesium/pull/13302
+          Cartesian3.pack(encodedC.low, positionLowArray, vOffset * 3);
         }
 
         pickColorArray[vOffset * 4] = Color.floatToByte(pickColor.red);