@cesium/engine 23.0.0 → 24.0.0

package/Source/Scene/BufferPrimitiveMaterial.js

@@ -0,0 +1,140 @@
+// @ts-check
+
+import Color from "../Core/Color.js";
+import Frozen from "../Core/Frozen.js";
+
+/** @import Packable from "../Core/Packable.js"; */
+/** @import BufferPrimitive from "./BufferPrimitive.js"; */
+
+/**
+ * @typedef {object} BufferPrimitiveMaterialOptions
+ * @property {Color} [color=Color.WHITE] Color of fill.
+ * @property {Color} [outlineColor=Color.WHITE] Color of outline.
+ * @property {number} [outlineWidth=0.0] Width of outline, 0-255px.
+ */
+
+/**
+ * Material description for a {@link BufferPrimitive}. Abstract.
+ *
+ * <p>BufferPrimitiveMaterial objects are {@link Packable|packable}, stored
+ * when calling {@link BufferPrimitive#setMaterial}. Subsequent changes to the
+ * material will not affect the primitive until setMaterial() is called again.</p>
+ *
+ * @see BufferPointMaterial
+ * @see BufferPolylineMaterial
+ * @see BufferPolygonMaterial
+ * @see Packable
+ *
+ * @abstract
+ * @experimental This feature is not final and is subject to change without Cesium's standard deprecation policy.
+ */
+class BufferPrimitiveMaterial {
+  /** @ignore */
+  static Layout = {
+    COLOR_U32: 0,
+    OUTLINE_COLOR_U32: 4,
+    OUTLINE_WIDTH_U8: 8,
+    __BYTE_LENGTH: 12,
+  };
+
+  /**
+   * @type {BufferPrimitiveMaterial}
+   * @ignore
+   */
+  static DEFAULT_MATERIAL;
+
+  /**
+   * @param {BufferPrimitiveMaterialOptions} [options]
+   */
+  constructor(options = Frozen.EMPTY_OBJECT) {
+    /**
+     * Color of fill.
+     * @type {Color}
+     */
+    this.color = Color.clone(options.color ?? Color.WHITE);
+
+    /**
+     * Color of outline.
+     * @type {Color}
+     */
+    this.outlineColor = Color.clone(options.outlineColor ?? Color.WHITE);
+
+    /**
+     * Width of outline, 0-255px.
+     * @type {number}
+     */
+    this.outlineWidth = options.outlineWidth ?? 0;
+  }
+
+  /** @type {number} */
+  static get packedLength() {
+    return this.Layout.__BYTE_LENGTH;
+  }
+
+  /**
+   * Stores the provided material into the provided array.
+   *
+   * @param {BufferPrimitiveMaterial} material
+   * @param {DataView} view
+   * @param {number} byteOffset
+   */
+  static pack(material, view, byteOffset) {
+    view.setUint32(
+      this.Layout.COLOR_U32 + byteOffset,
+      material.color.toRgba(),
+      true,
+    );
+    view.setUint32(
+      this.Layout.OUTLINE_COLOR_U32 + byteOffset,
+      material.outlineColor.toRgba(),
+      true,
+    );
+    view.setUint8(
+      this.Layout.OUTLINE_WIDTH_U8 + byteOffset,
+      material.outlineWidth,
+    );
+  }
+
+  /**
+   * Retrieves a material from a packed array.
+   *
+   * @param {DataView} view The packed array.
+   * @param {number} byteOffset Starting index of the element to be unpacked.
+   * @param {BufferPrimitiveMaterial} result Material into which results are unpacked.
+   * @returns {BufferPrimitiveMaterial} Modified result material, with results unpacked.
+   */
+  static unpack(view, byteOffset, result) {
+    Color.fromRgba(
+      view.getUint32(this.Layout.COLOR_U32 + byteOffset, true),
+      result.color,
+    );
+    Color.fromRgba(
+      view.getUint32(this.Layout.OUTLINE_COLOR_U32 + byteOffset, true),
+      result.outlineColor,
+    );
+    result.outlineWidth = view.getUint8(
+      this.Layout.OUTLINE_WIDTH_U8 + byteOffset,
+    );
+    return result;
+  }
+
+  /////////////////////////////////////////////////////////////////////////////
+  // DEBUG
+
+  /**
+   * Returns a JSON-serializable object representing the material. This encoding
+   * is not memory-efficient, and should generally be used for debugging and
+   * testing.
+   *
+   * @returns {Object} JSON-serializable object.
+   */
+  toJSON() {
+    return {
+      color: this.color.toCssHexString(),
+      outlineColor: this.outlineColor.toCssHexString(),
+      outlineWidth: this.outlineWidth,
+    };
+  }
+}
+
+export default BufferPrimitiveMaterial;

package/Source/Scene/Cesium3DTileContent.js

@@ -255,7 +255,7 @@ Object.defineProperties(Cesium3DTileContent.prototype, {
    * not part of the public Cesium API.
    * </p>
    *
-   * @type {Cesium3DTileContentGroup|undefined}
+   * @type {Cesium3DContentGroup|undefined}
    *
    * @private
    * @experimental This feature is using part of the 3D Tiles spec that is not final and is subject to change without Cesium's standard deprecation policy.
@@ -325,6 +325,7 @@ Cesium3DTileContent.prototype.applyDebugSettings = function (enabled, color) {
  * </p>
  *
  * @param {Cesium3DTileStyle} style The style.
+ * @returns {void}
  *
  * @private
  */
@@ -343,6 +344,7 @@ Cesium3DTileContent.prototype.applyStyle = function (style) {
  *
  * @param {Cesium3DTileset} tileset The tileset containing this tile.
  * @param {FrameState} frameState The frame state.
+ * @returns {void}
  *
  * @private
  */
@@ -403,6 +405,8 @@ Cesium3DTileContent.prototype.isDestroyed = function () {
  *
  * @see Cesium3DTileContent#isDestroyed
  *
+ * @returns {void}
+ *
  * @private
  */
 Cesium3DTileContent.prototype.destroy = function () {

package/Source/Scene/Cesium3DTileContentFactory.js

@@ -4,6 +4,7 @@ import Implicit3DTileContent from "./Implicit3DTileContent.js";
 import Model3DTileContent from "./Model/Model3DTileContent.js";
 import Tileset3DTileContent from "./Tileset3DTileContent.js";
 import Vector3DTileContent from "./Vector3DTileContent.js";
+import VectorGltf3DTileContent from "./VectorGltf3DTileContent.js";
 import GaussianSplat3DTileContent from "./GaussianSplat3DTileContent.js";
 import RuntimeError from "../Core/RuntimeError.js";
 
@@ -100,6 +101,10 @@ const Cesium3DTileContentFactory = {
       return GaussianSplat3DTileContent.fromGltf(tileset, tile, resource, glb);
     }
 
+    if (tileset.isGltfExtensionUsed("CESIUM_mesh_vector")) {
+      return VectorGltf3DTileContent.fromGltf(tileset, tile, resource, glb);
+    }
+
     return Model3DTileContent.fromGltf(tileset, tile, resource, glb);
   },
   gltf: function (tileset, tile, resource, json) {
@@ -109,6 +114,10 @@ const Cesium3DTileContentFactory = {
       return GaussianSplat3DTileContent.fromGltf(tileset, tile, resource, json);
     }
 
+    if (tileset.isGltfExtensionUsed("CESIUM_mesh_vector")) {
+      return VectorGltf3DTileContent.fromGltf(tileset, tile, resource, json);
+    }
+
     return Model3DTileContent.fromGltf(tileset, tile, resource, json);
   },
   geoJson: function (tileset, tile, resource, json) {

package/Source/Scene/Cesium3DTileStyle.js

@@ -74,6 +74,9 @@ function Cesium3DTileStyle(style) {
   this._labelVerticalOrigin = undefined;
   this._meta = undefined;
 
+  // Vector Tiles in 3D Tiles 2.0.
+  this._lineWidth = undefined;
+
   this._colorShaderFunction = undefined;
   this._showShaderFunction = undefined;
   this._pointSizeShaderFunction = undefined;
@@ -117,6 +120,9 @@ function setup(that, styleJson) {
   that.labelHorizontalOrigin = styleJson.labelHorizontalOrigin;
   that.labelVerticalOrigin = styleJson.labelVerticalOrigin;
 
+  // Vector Tiles in 3D Tiles 2.0.
+  that.lineWidth = styleJson.lineWidth;
+
   const meta = {};
   if (defined(styleJson.meta)) {
     const defines = styleJson.defines;
@@ -1284,6 +1290,22 @@ Object.defineProperties(Cesium3DTileStyle.prototype, {
     },
   },
 
+  /**
+   * Internal-only, supported in Vector Tiles with 3D Tiles 2.0.
+   * @memberof Cesium3DTileStyle.prototype
+   * @type {StyleExpression}
+   * @ignore
+   */
+  lineWidth: {
+    get: function () {
+      return this._lineWidth;
+    },
+    set: function (value) {
+      this._lineWidth = getExpression(this, value);
+      this._style.lineWidth = getJsonFromExpression(this._lineWidth);
+    },
+  },
+
   /**
    * Gets or sets the object containing application-specific expression that can be explicitly
    * evaluated, e.g., for display in a UI.

package/Source/Scene/Cesium3DTileset.js

@@ -3674,6 +3674,7 @@ Cesium3DTileset.supportedExtensions = {
   "3DTILES_bounding_volume_S2": true,
   "3DTILES_batch_table_hierarchy": true,
   "3DTILES_draco_point_compression": true,
+  CESIUM_mesh_vector: true,
   MAXAR_content_geojson: true,
 };