@cesium/engine 22.3.0 → 23.0.0

package/Source/Scene/GlobeSurfaceShaderSet.js

@@ -161,39 +161,43 @@ GlobeSurfaceShaderSet.prototype.getShaderProgram = function (options) {
   }
 
   const sceneMode = frameState.mode;
+  // Bitwise OR uses 32-bit integers; bits 0-31 are packed below.
+  // Flags beyond bit 31 use arithmetic to avoid silent wrap-around
+  // (x << 32 === x << 0 in JavaScript).
   const flags =
-    sceneMode |
-    (applyBrightness << 2) |
-    (applyContrast << 3) |
-    (applyHue << 4) |
-    (applySaturation << 5) |
-    (applyGamma << 6) |
-    (applyAlpha << 7) |
-    (hasWaterMask << 8) |
-    (showReflectiveOcean << 9) |
-    (showOceanWaves << 10) |
-    (enableLighting << 11) |
-    (dynamicAtmosphereLighting << 12) |
-    (dynamicAtmosphereLightingFromSun << 13) |
-    (showGroundAtmosphere << 14) |
-    (perFragmentGroundAtmosphere << 15) |
-    (hasVertexNormals << 16) |
-    (useWebMercatorProjection << 17) |
-    (enableFog << 18) |
-    (quantization << 19) |
-    (applySplit << 20) |
-    (enableClippingPlanes << 21) |
-    (enableClippingPolygons << 22) |
-    (cartographicLimitRectangleFlag << 23) |
-    (imageryCutoutFlag << 24) |
-    (colorCorrect << 25) |
-    (highlightFillTile << 26) |
-    (colorToAlpha << 27) |
-    (hasGeodeticSurfaceNormals << 28) |
-    (hasExaggeration << 29) |
-    (showUndergroundColor << 30) |
-    (translucent << 31) |
-    (applyDayNightAlpha << 32);
+    ((sceneMode |
+      (applyBrightness << 2) |
+      (applyContrast << 3) |
+      (applyHue << 4) |
+      (applySaturation << 5) |
+      (applyGamma << 6) |
+      (applyAlpha << 7) |
+      (hasWaterMask << 8) |
+      (showReflectiveOcean << 9) |
+      (showOceanWaves << 10) |
+      (enableLighting << 11) |
+      (dynamicAtmosphereLighting << 12) |
+      (dynamicAtmosphereLightingFromSun << 13) |
+      (showGroundAtmosphere << 14) |
+      (perFragmentGroundAtmosphere << 15) |
+      (hasVertexNormals << 16) |
+      (useWebMercatorProjection << 17) |
+      (enableFog << 18) |
+      (quantization << 19) |
+      (applySplit << 20) |
+      (enableClippingPlanes << 21) |
+      (enableClippingPolygons << 22) |
+      (cartographicLimitRectangleFlag << 23) |
+      (imageryCutoutFlag << 24) |
+      (colorCorrect << 25) |
+      (highlightFillTile << 26) |
+      (colorToAlpha << 27) |
+      (hasGeodeticSurfaceNormals << 28) |
+      (hasExaggeration << 29) |
+      (showUndergroundColor << 30) |
+      (translucent << 31)) >>>
+      0) +
+    (applyDayNightAlpha ? 0x100000000 : 0);
 
   let currentClippingShaderState = 0;
   if (defined(clippingPlanes) && clippingPlanes.length > 0) {

package/Source/Scene/GltfBufferViewLoader.js

@@ -12,89 +12,83 @@ import ResourceLoaderState from "./ResourceLoaderState.js";
  * Implements the {@link ResourceLoader} interface.
  * </p>
  *
- * @alias GltfBufferViewLoader
- * @constructor
- * @augments ResourceLoader
- *
- * @param {object} options Object with the following properties:
- * @param {ResourceCache} options.resourceCache The {@link ResourceCache} (to avoid circular dependencies).
- * @param {object} options.gltf The glTF JSON.
- * @param {number} options.bufferViewId The buffer view ID.
- * @param {Resource} options.gltfResource The {@link Resource} containing the glTF.
- * @param {Resource} options.baseResource The {@link Resource} that paths in the glTF JSON are relative to.
- * @param {string} [options.cacheKey] The cache key of the resource.
- *
  * @private
  */
-function GltfBufferViewLoader(options) {
-  options = options ?? Frozen.EMPTY_OBJECT;
-  const resourceCache = options.resourceCache;
-  const gltf = options.gltf;
-  const bufferViewId = options.bufferViewId;
-  const gltfResource = options.gltfResource;
-  const baseResource = options.baseResource;
-  const cacheKey = options.cacheKey;
-
-  //>>includeStart('debug', pragmas.debug);
-  Check.typeOf.func("options.resourceCache", resourceCache);
-  Check.typeOf.object("options.gltf", gltf);
-  Check.typeOf.number("options.bufferViewId", bufferViewId);
-  Check.typeOf.object("options.gltfResource", gltfResource);
-  Check.typeOf.object("options.baseResource", baseResource);
-  //>>includeEnd('debug');
-
-  const bufferView = gltf.bufferViews[bufferViewId];
-  let bufferId = bufferView.buffer;
-  let byteOffset = bufferView.byteOffset;
-  let byteLength = bufferView.byteLength;
-
-  let hasMeshopt = false;
-  let meshoptByteStride;
-  let meshoptCount;
-  let meshoptMode;
-  let meshoptFilter;
-
-  if (hasExtension(bufferView, "EXT_meshopt_compression")) {
-    const meshopt = bufferView.extensions.EXT_meshopt_compression;
-    bufferId = meshopt.buffer;
-    byteOffset = meshopt.byteOffset ?? 0;
-    byteLength = meshopt.byteLength;
-
-    hasMeshopt = true;
-    meshoptByteStride = meshopt.byteStride;
-    meshoptCount = meshopt.count;
-    meshoptMode = meshopt.mode;
-    meshoptFilter = meshopt.filter ?? "NONE";
-  }
-
-  const buffer = gltf.buffers[bufferId];
-
-  this._hasMeshopt = hasMeshopt;
-  this._meshoptByteStride = meshoptByteStride;
-  this._meshoptCount = meshoptCount;
-  this._meshoptMode = meshoptMode;
-  this._meshoptFilter = meshoptFilter;
-
-  this._resourceCache = resourceCache;
-  this._gltfResource = gltfResource;
-  this._baseResource = baseResource;
-  this._buffer = buffer;
-  this._bufferId = bufferId;
-  this._byteOffset = byteOffset;
-  this._byteLength = byteLength;
-  this._cacheKey = cacheKey;
-  this._bufferLoader = undefined;
-  this._typedArray = undefined;
-  this._state = ResourceLoaderState.UNLOADED;
-  this._promise = undefined;
-}
+class GltfBufferViewLoader extends ResourceLoader {
+  /**
+   * @param {object} options Object with the following properties:
+   * @param {ResourceCache} options.resourceCache The {@link ResourceCache} (to avoid circular dependencies).
+   * @param {object} options.gltf The glTF JSON.
+   * @param {number} options.bufferViewId The buffer view ID.
+   * @param {Resource} options.gltfResource The {@link Resource} containing the glTF.
+   * @param {Resource} options.baseResource The {@link Resource} that paths in the glTF JSON are relative to.
+   * @param {string} [options.cacheKey] The cache key of the resource.
+   */
+  constructor(options) {
+    super();
+
+    options = options ?? Frozen.EMPTY_OBJECT;
+    const resourceCache = options.resourceCache;
+    const gltf = options.gltf;
+    const bufferViewId = options.bufferViewId;
+    const gltfResource = options.gltfResource;
+    const baseResource = options.baseResource;
+    const cacheKey = options.cacheKey;
+
+    //>>includeStart('debug', pragmas.debug);
+    Check.typeOf.func("options.resourceCache", resourceCache);
+    Check.typeOf.object("options.gltf", gltf);
+    Check.typeOf.number("options.bufferViewId", bufferViewId);
+    Check.typeOf.object("options.gltfResource", gltfResource);
+    Check.typeOf.object("options.baseResource", baseResource);
+    //>>includeEnd('debug');
+
+    const bufferView = gltf.bufferViews[bufferViewId];
+    let bufferId = bufferView.buffer;
+    let byteOffset = bufferView.byteOffset;
+    let byteLength = bufferView.byteLength;
+
+    let hasMeshopt = false;
+    let meshoptByteStride;
+    let meshoptCount;
+    let meshoptMode;
+    let meshoptFilter;
+
+    if (hasExtension(bufferView, "EXT_meshopt_compression")) {
+      const meshopt = bufferView.extensions.EXT_meshopt_compression;
+      bufferId = meshopt.buffer;
+      byteOffset = meshopt.byteOffset ?? 0;
+      byteLength = meshopt.byteLength;
+
+      hasMeshopt = true;
+      meshoptByteStride = meshopt.byteStride;
+      meshoptCount = meshopt.count;
+      meshoptMode = meshopt.mode;
+      meshoptFilter = meshopt.filter ?? "NONE";
+    }
 
-if (defined(Object.create)) {
-  GltfBufferViewLoader.prototype = Object.create(ResourceLoader.prototype);
-  GltfBufferViewLoader.prototype.constructor = GltfBufferViewLoader;
-}
+    const buffer = gltf.buffers[bufferId];
+
+    this._hasMeshopt = hasMeshopt;
+    this._meshoptByteStride = meshoptByteStride;
+    this._meshoptCount = meshoptCount;
+    this._meshoptMode = meshoptMode;
+    this._meshoptFilter = meshoptFilter;
+
+    this._resourceCache = resourceCache;
+    this._gltfResource = gltfResource;
+    this._baseResource = baseResource;
+    this._buffer = buffer;
+    this._bufferId = bufferId;
+    this._byteOffset = byteOffset;
+    this._byteLength = byteLength;
+    this._cacheKey = cacheKey;
+    this._bufferLoader = undefined;
+    this._typedArray = undefined;
+    this._state = ResourceLoaderState.UNLOADED;
+    this._promise = undefined;
+  }
 
-Object.defineProperties(GltfBufferViewLoader.prototype, {
   /**
    * The cache key of the resource.
    *
@@ -104,11 +98,10 @@ Object.defineProperties(GltfBufferViewLoader.prototype, {
    * @readonly
    * @private
    */
-  cacheKey: {
-    get: function () {
-      return this._cacheKey;
-    },
-  },
+  get cacheKey() {
+    return this._cacheKey;
+  }
+
   /**
    * The typed array containing buffer view data.
    *
@@ -118,12 +111,38 @@ Object.defineProperties(GltfBufferViewLoader.prototype, {
    * @readonly
    * @private
    */
-  typedArray: {
-    get: function () {
-      return this._typedArray;
-    },
-  },
-});
+  get typedArray() {
+    return this._typedArray;
+  }
+
+  /**
+   * Loads the resource.
+   * @returns {Promise<GltfBufferViewLoader>} A promise which resolves to the loader when the resource loading is completed.
+   * @private
+   */
+  async load() {
+    if (defined(this._promise)) {
+      return this._promise;
+    }
+
+    this._state = ResourceLoaderState.LOADING;
+    this._promise = loadResources(this);
+    return this._promise;
+  }
+
+  /**
+   * Unloads the resource.
+   * @private
+   */
+  unload() {
+    if (defined(this._bufferLoader) && !this._bufferLoader.isDestroyed()) {
+      this._resourceCache.unload(this._bufferLoader);
+    }
+
+    this._bufferLoader = undefined;
+    this._typedArray = undefined;
+  }
+}
 
 /**
  * Load the resources associated with the loader.
@@ -181,21 +200,6 @@ async function loadResources(loader) {
   }
 }
 
-/**
- * Loads the resource.
- * @returns {Promise<GltfBufferViewLoader>} A promise which resolves to the loader when the resource loading is completed.
- * @private
- */
-GltfBufferViewLoader.prototype.load = async function () {
-  if (defined(this._promise)) {
-    return this._promise;
-  }
-
-  this._state = ResourceLoaderState.LOADING;
-  this._promise = loadResources(this);
-  return this._promise;
-};
-
 /**
  * Get the buffer loader for the specified buffer view loader.
  * Attempts to retrieve from the resource cache first. If a buffer loader is
@@ -226,17 +230,4 @@ function getBufferLoader(bufferViewLoader) {
   });
 }
 
-/**
- * Unloads the resource.
- * @private
- */
-GltfBufferViewLoader.prototype.unload = function () {
-  if (defined(this._bufferLoader) && !this._bufferLoader.isDestroyed()) {
-    this._resourceCache.unload(this._bufferLoader);
-  }
-
-  this._bufferLoader = undefined;
-  this._typedArray = undefined;
-};
-
 export default GltfBufferViewLoader;