@cesium/engine 3.0.1 → 4.0.0

package/Source/{WorkersES6 → Workers}/decodeI3S.js

@@ -1,4 +1,3 @@
-/* global require */
 import createTaskProcessorWorker from "./createTaskProcessorWorker.js";
 import defined from "../Core/defined.js";
 import WebMercatorProjection from "../Core/WebMercatorProjection.js";
@@ -7,6 +6,7 @@ import Cartographic from "../Core/Cartographic.js";
 import Cartesian3 from "../Core/Cartesian3.js";
 import Matrix3 from "../Core/Matrix3.js";
 import CesiumMath from "../Core/Math.js";
+import dracoModule from "draco3d/draco_decoder_nodejs.js";
 
 let draco;
 
@@ -171,7 +171,6 @@ function transformToLocal(
       const rotatedNormal = {};
       Matrix3.multiplyByVector(parentRotation, normal, rotatedNormal);
 
-      // TODO: check if normals are Z-UP or Y-UP and flip y and z
       normals[indexOffset] = rotatedNormal.x;
       normals[indexOffset1] = rotatedNormal.y;
       normals[indexOffset2] = rotatedNormal.z;
@@ -890,17 +889,11 @@ function decodeBinaryGeometry(data, schema, bufferInfo, featureData) {
       // Use default geometry schema
       for (let i = 0; i < ordering.length; i++) {
         const decoder = binaryAttributeDecoders[ordering[i]];
-        if (!defined(decoder)) {
-          console.log(ordering[i]);
-        }
         offset = decoder(decodedGeometry, data, offset);
       }
 
       for (let j = 0; j < featureAttributeOrder.length; j++) {
         const curDecoder = binaryAttributeDecoders[featureAttributeOrder[j]];
-        if (!defined(curDecoder)) {
-          console.log(featureAttributeOrder[j]);
-        }
         offset = curDecoder(decodedGeometry, data, offset);
       }
     }
@@ -914,7 +907,7 @@ function decodeBinaryGeometry(data, schema, bufferInfo, featureData) {
   return decodedGeometry;
 }
 
-function decodeI3S(parameters) {
+function decodeAndCreateGltf(parameters) {
   // Decode the data into geometry
   const geometryData = decode(
     parameters.binaryData,
@@ -1012,33 +1005,26 @@ function decodeI3S(parameters) {
   return results;
 }
 
-function initWorker(dracoModule) {
-  draco = dracoModule;
-  self.onmessage = createTaskProcessorWorker(decodeI3S);
-  self.postMessage(true);
-}
+async function initWorker(parameters, transferableObjects) {
+  // Require and compile WebAssembly module, or use fallback if not supported
+  const wasmConfig = parameters.webAssemblyConfig;
+  if (defined(wasmConfig) && defined(wasmConfig.wasmBinaryFile)) {
+    draco = await dracoModule(wasmConfig);
+  } else {
+    draco = await dracoModule();
+  }
 
-function decodeI3SStart(event) {
-  const data = event.data;
+  return true;
+}
 
+function decodeI3S(parameters, transferableObjects) {
   // Expect the first message to be to load a web assembly module
-  const wasmConfig = data.webAssemblyConfig;
+  const wasmConfig = parameters.webAssemblyConfig;
   if (defined(wasmConfig)) {
-    // Require and compile WebAssembly module, or use fallback if not supported
-    return require([wasmConfig.modulePath], function (dracoModule) {
-      if (defined(wasmConfig.wasmBinaryFile)) {
-        if (!defined(dracoModule)) {
-          dracoModule = self.DracoDecoderModule;
-        }
-
-        dracoModule(wasmConfig).then(function (compiledModule) {
-          initWorker(compiledModule);
-        });
-      } else {
-        initWorker(dracoModule());
-      }
-    });
+    return initWorker(parameters, transferableObjects);
   }
+
+  return decodeAndCreateGltf(parameters, transferableObjects);
 }
 
-export default decodeI3SStart;
+export default createTaskProcessorWorker(decodeI3S);

package/Source/{WorkersES6 → Workers}/transcodeKTX2.js

@@ -1,4 +1,4 @@
-/* global require */
+import defaultValue from "../Core/defaultValue.js";
 import defined from "../Core/defined.js";
 import Check from "../Core/Check.js";
 import PixelFormat from "../Core/PixelFormat.js";
@@ -7,6 +7,7 @@ import VulkanConstants from "../Core//VulkanConstants.js";
 import PixelDatatype from "../Renderer/PixelDatatype.js";
 import createTaskProcessorWorker from "./createTaskProcessorWorker.js";
 import { read } from "ktx-parse";
+import basis from "../ThirdParty/Workers/basis_transcoder.js";
 
 const faceOrder = [
   "positiveX",
@@ -281,36 +282,28 @@ function transcodeCompressed(
   return result;
 }
 
-function initWorker(compiledModule) {
-  transcoderModule = compiledModule;
+async function initWorker(parameters, transferableObjects) {
+  // Require and compile WebAssembly module, or use fallback if not supported
+  const wasmConfig = parameters.webAssemblyConfig;
+  const basisTranscoder = defaultValue(basis, self.BASIS);
+  if (defined(wasmConfig.wasmBinaryFile)) {
+    transcoderModule = await basisTranscoder(wasmConfig);
+  } else {
+    transcoderModule = await basisTranscoder();
+  }
+
   transcoderModule.initializeBasis();
 
-  self.onmessage = createTaskProcessorWorker(transcode);
-  self.postMessage(true);
+  return true;
 }
 
-function transcodeKTX2(event) {
-  const data = event.data;
-
+function transcodeKTX2(parameters, transferableObjects) {
   // Expect the first message to be to load a web assembly module
-  const wasmConfig = data.webAssemblyConfig;
+  const wasmConfig = parameters.webAssemblyConfig;
   if (defined(wasmConfig)) {
-    // Require and compile WebAssembly module, or use fallback if not supported
-    return require([wasmConfig.modulePath], function (mscBasisTranscoder) {
-      if (defined(wasmConfig.wasmBinaryFile)) {
-        if (!defined(mscBasisTranscoder)) {
-          mscBasisTranscoder = self.MSC_TRANSCODER;
-        }
-
-        mscBasisTranscoder(wasmConfig).then(function (compiledModule) {
-          initWorker(compiledModule);
-        });
-      } else {
-        return mscBasisTranscoder().then(function (transcoder) {
-          initWorker(transcoder);
-        });
-      }
-    });
+    return initWorker(parameters, transferableObjects);
   }
+
+  return transcode(parameters, transferableObjects);
 }
-export default transcodeKTX2;
+export default createTaskProcessorWorker(transcodeKTX2);

package/Source/Workers/transferTypedArrayTest.js

@@ -1,9 +1,3 @@
-// make sure self is defined so that the Dojo build can evaluate this file without crashing.
-if (typeof self === "undefined") {
-  //eslint-disable-next-line no-implicit-globals, no-global-assign
-  self = {};
-}
-
 self.onmessage = function (event) {
   const array = event.data.array;
   const postMessage = self.webkitPostMessage || self.postMessage;

package/index.d.ts

@@ -6405,6 +6405,11 @@ export namespace FeatureDetection {
      * @returns true if the browser supports a WebGL2 rendering context, false if not.
      */
     function supportsWebgl2(scene: Scene): boolean;
+    /**
+     * Detects whether the current browser supports ECMAScript modules in web workers.
+     * @returns true if the browser supports ECMAScript modules in web workers.
+     */
+    function supportsEsmWebWorkers(): boolean;
 }
 
 /**
@@ -16120,7 +16125,7 @@ export class TaskProcessor {
     scheduleTask(parameters: any, transferableObjects?: object[]): Promise<object> | undefined;
     /**
      * Posts a message to a web worker with configuration to initialize loading
-     * and compiling a web assembly module asychronously, as well as an optional
+     * and compiling a web assembly module asynchronously, as well as an optional
      * fallback JavaScript module to use if Web Assembly is not supported.
      * @param [webAssemblyOptions] - An object with the following properties:
      * @param [webAssemblyOptions.modulePath] - The path of the web assembly JavaScript wrapper module.
@@ -16132,7 +16137,7 @@ export class TaskProcessor {
         modulePath?: string;
         wasmBinaryFile?: string;
         fallbackModulePath?: string;
-    }): Promise<object>;
+    }): Promise<any>;
     /**
      * Returns true if this object was destroyed; otherwise, false.
      * <br /><br />
@@ -17183,10 +17188,10 @@ export namespace Transforms {
      * at a given time.  This function may return undefined if the data necessary to
      * do the transformation is not yet loaded.
      * @example
-     * // Transform a point from the ICRF axes to the Fixed axes.
+     * // Transform a point from the Fixed axes to the ICRF axes.
      * const now = Cesium.JulianDate.now();
      * const pointInFixed = Cesium.Cartesian3.fromDegrees(0.0, 0.0);
-     * const fixedToIcrf = Cesium.Transforms.computeIcrfToFixedMatrix(now);
+     * const fixedToIcrf = Cesium.Transforms.computeFixedToIcrfMatrix(now);
      * let pointInInertial = new Cesium.Cartesian3();
      * if (Cesium.defined(fixedToIcrf)) {
      *     pointInInertial = Cesium.Matrix3.multiplyByVector(fixedToIcrf, pointInFixed, pointInInertial);
@@ -32913,8 +32918,8 @@ export namespace ImageryLayer {
  * on a {@link Globe}.
  * @example
  * // Add an OpenStreetMaps layer
- * const imageryLayer = new Cesium.ImageryLayer(OpenStreetMapImageryProvider({
- *   url: "https://a.tile.openstreetmap.org/"
+ * const imageryLayer = new Cesium.ImageryLayer(new Cesium.OpenStreetMapImageryProvider({
+ *   url: "https://tile.openstreetmap.org/"
  * })),
  * scene.imageryLayers.add(imageryLayer);
  * @example
@@ -36817,8 +36822,9 @@ export class NeverTileDiscardPolicy {
 export namespace OpenStreetMapImageryProvider {
     /**
      * Initialization options for the OpenStreetMapImageryProvider constructor
-     * @property [url = 'https://a.tile.openstreetmap.org'] - The OpenStreetMap server url.
+     * @property [url = 'https://tile.openstreetmap.org'] - The OpenStreetMap server url.
      * @property [fileExtension = 'png'] - The file extension for images on the server.
+     * @property [retinaTiles = false] - When true, request tiles at the 2x resolution for retina displays.
      * @property [rectangle = Rectangle.MAX_VALUE] - The rectangle of the layer.
      * @property [minimumLevel = 0] - The minimum level-of-detail supported by the imagery provider.
      * @property [maximumLevel] - The maximum level-of-detail supported by the imagery provider, or undefined if there is no limit.
@@ -36828,6 +36834,7 @@ export namespace OpenStreetMapImageryProvider {
     type ConstructorOptions = {
         url?: string;
         fileExtension?: string;
+        retinaTiles?: boolean;
         rectangle?: Rectangle;
         minimumLevel?: number;
         maximumLevel?: number;
@@ -36843,7 +36850,7 @@ export namespace OpenStreetMapImageryProvider {
  * {@link http://wiki.openstreetmap.org/wiki/Tile_usage_policy|Tile Usage Policy}.
  * @example
  * const osm = new Cesium.OpenStreetMapImageryProvider({
- *     url : 'https://a.tile.openstreetmap.org/'
+ *     url : 'https://tile.openstreetmap.org/'
  * });
  * @param options - Object describing initialization options
  */
@@ -40102,8 +40109,9 @@ export namespace SingleTileImageryProvider {
 }
 
 /**
- * Provides a single, top-level imagery tile.  The single image is assumed to use a
- * {@link GeographicTilingScheme}.
+ * Provides a single, top-level imagery tile.  The single image is assumed to be in
+ * the Geographic projection (i.e. WGS84 / EPSG:4326),
+ * and will be rendered using a {@link GeographicTilingScheme}.
  * @param options - Object describing initialization options
  */
 export class SingleTileImageryProvider {
@@ -40171,8 +40179,9 @@ export class SingleTileImageryProvider {
      * const provider = await SingleTileImageryProvider.fromUrl("https://yoururl.com/image.png");
      * @param url - The url for the tile
      * @param [options] - Object describing initialization options.
+     * @returns The resolved SingleTileImageryProvider.
      */
-    static fromUrl(url: Resource | string, options?: SingleTileImageryProvider.fromUrlOptions): void;
+    static fromUrl(url: Resource | string, options?: SingleTileImageryProvider.fromUrlOptions): Promise<SingleTileImageryProvider>;
     /**
      * Gets the credits to be displayed when a given tile is displayed.
      * @param x - The tile X coordinate.