@hztxi/cesium-engine 25.0.0 → 25.0.1

package/Build/Workers/upsampleVerticesFromCesium3DTilesTerrain.js

@@ -1,7 +1,7 @@
 /**
  * @license
  * Cesium - https://github.com/CesiumGS/cesium
- * Version 1.141.0
+ * Version 1.141.1
  *
  * Copyright 2011-2022 Cesium Contributors
  *
@@ -25,33 +25,33 @@
 
 import {
   Cesium3DTilesTerrainGeometryProcessor_default
-} from "./chunk-DOB5JF3K.js";
-import "./chunk-P5SWEPTI.js";
-import "./chunk-VCJD4URC.js";
-import "./chunk-4VKEY67A.js";
+} from "./chunk-LU6LZORF.js";
+import "./chunk-K3SIFA6H.js";
+import "./chunk-HOOAYVKT.js";
+import "./chunk-WA2OK3VI.js";
 import {
   createTaskProcessorWorker_default
-} from "./chunk-FIBS5S7R.js";
-import "./chunk-DH3HFR2Z.js";
-import "./chunk-HZPEDSEN.js";
-import "./chunk-P7VT7DMK.js";
-import "./chunk-P3FP7NAM.js";
-import "./chunk-SPEMUYE5.js";
-import "./chunk-JUGOIC4O.js";
-import "./chunk-SGKTPOWQ.js";
-import "./chunk-6ZAVOU5L.js";
-import "./chunk-LOG5WXZZ.js";
-import "./chunk-4MTRQFJP.js";
-import "./chunk-NIJIKHQM.js";
-import "./chunk-GNBRTX2J.js";
-import "./chunk-77RL3MBD.js";
-import "./chunk-TA777BGS.js";
-import "./chunk-3TKLDHV3.js";
-import "./chunk-KSMUF4SU.js";
-import "./chunk-JQ4R7MXV.js";
-import "./chunk-WMMER2ET.js";
-import "./chunk-CZ23Y3RM.js";
-import "./chunk-DH26SNAB.js";
+} from "./chunk-S2SZ2HYA.js";
+import "./chunk-DWNGALVJ.js";
+import "./chunk-KTHM63AY.js";
+import "./chunk-4B3I4BQ3.js";
+import "./chunk-6V5GAERI.js";
+import "./chunk-7SUI2JKP.js";
+import "./chunk-Q2MV7V3J.js";
+import "./chunk-KFRGYJLT.js";
+import "./chunk-VG4FKBIJ.js";
+import "./chunk-MG54QB2S.js";
+import "./chunk-ZZIFOLD3.js";
+import "./chunk-3TK6563P.js";
+import "./chunk-SSNBEN3T.js";
+import "./chunk-I6PQQIM5.js";
+import "./chunk-APAN2W5B.js";
+import "./chunk-ZY636MPN.js";
+import "./chunk-7BWPTYVV.js";
+import "./chunk-LPWXXHTU.js";
+import "./chunk-PAO4TRRA.js";
+import "./chunk-6JM3OV5P.js";
+import "./chunk-AMW7Q4HY.js";
 
 // packages/engine/Source/Workers/upsampleVerticesFromCesium3DTilesTerrain.js
 function upsampleVerticesFromCesium3DTilesTerrain(options, transferableObjects) {

package/Source/DataSources/DynamicGeometryUpdater.js

@@ -112,6 +112,7 @@ DynamicGeometryUpdater.prototype.update = function (time) {
         this._material,
       );
       this._material = material;
+      material.update(this._geometryUpdater._scene.context);
       appearance = new MaterialAppearance({
         material: material,
         translucent: material.isTranslucent(),

package/Source/DataSources/GeometryVisualizer.js

@@ -94,6 +94,7 @@ function GeometryVisualizer(
       );
 
     this._closedMaterialBatches[i] = new StaticGeometryPerMaterialBatch(
+      this._scene,
       primitives,
       MaterialAppearance,
       undefined,
@@ -103,6 +104,7 @@ function GeometryVisualizer(
     );
     this._closedMaterialBatches[numberOfShadowModes + i] =
       new StaticGeometryPerMaterialBatch(
+        this._scene,
         primitives,
         MaterialAppearance,
         undefined,
@@ -130,6 +132,7 @@ function GeometryVisualizer(
       );
 
     this._openMaterialBatches[i] = new StaticGeometryPerMaterialBatch(
+      this._scene,
       primitives,
       MaterialAppearance,
       undefined,
@@ -139,6 +142,7 @@ function GeometryVisualizer(
     );
     this._openMaterialBatches[numberOfShadowModes + i] =
       new StaticGeometryPerMaterialBatch(
+        this._scene,
         primitives,
         MaterialAppearance,
         undefined,
@@ -156,6 +160,7 @@ function GeometryVisualizer(
     for (i = 0; i < numberOfClassificationTypes; ++i) {
       groundMaterialBatches.push(
         new StaticGroundGeometryPerMaterialBatch(
+          this._scene,
           groundPrimitives,
           i,
           MaterialAppearance,

package/Source/DataSources/PolylineVisualizer.js

@@ -112,6 +112,7 @@ function PolylineVisualizer(
       i,
     ); // no depth fail appearance
     this._materialBatches[i] = new StaticGeometryPerMaterialBatch(
+      this._scene,
       primitives,
       PolylineMaterialAppearance,
       undefined,
@@ -128,6 +129,7 @@ function PolylineVisualizer(
     ); //depth fail appearance variations
     this._materialBatches[i + numberOfShadowModes] =
       new StaticGeometryPerMaterialBatch(
+        this._scene,
         primitives,
         PolylineMaterialAppearance,
         PolylineColorAppearance,
@@ -145,6 +147,7 @@ function PolylineVisualizer(
       );
     this._materialBatches[i + numberOfShadowModes * 2] =
       new StaticGeometryPerMaterialBatch(
+        this._scene,
         primitives,
         PolylineMaterialAppearance,
         PolylineMaterialAppearance,

package/Source/DataSources/StaticGeometryPerMaterialBatch.js

@@ -19,6 +19,7 @@ const defaultOffset = Cartesian3.ZERO;
 const offsetScratch = new Cartesian3();
 
 function Batch(
+  scene,
   primitives,
   appearanceType,
   materialProperty,
@@ -27,6 +28,7 @@ function Batch(
   closed,
   shadows,
 ) {
+  this.scene = scene;
   this.primitives = primitives;
   this.appearanceType = appearanceType;
   this.materialProperty = materialProperty;
@@ -146,6 +148,9 @@ Batch.prototype.update = function (time) {
         this.materialProperty,
         this.material,
       );
+      if (defined(this.scene)) {
+        this.material.update(this.scene.context);
+      }
 
       let depthFailAppearance;
       if (defined(this.depthFailMaterialProperty)) {
@@ -154,6 +159,9 @@ Batch.prototype.update = function (time) {
           this.depthFailMaterialProperty,
           this.depthFailMaterial,
         );
+        if (defined(this.scene)) {
+          this.depthFailMaterial.update(this.scene.context);
+        }
 
         const DepthFailAppearanceType = this.depthFailAppearanceType;
 
@@ -208,6 +216,9 @@ Batch.prototype.update = function (time) {
       this.materialProperty,
       this.material,
     );
+    if (defined(this.scene)) {
+      this.material.update(this.scene.context);
+    }
     this.primitive.appearance.material = this.material;
 
     if (
@@ -219,6 +230,9 @@ Batch.prototype.update = function (time) {
         this.depthFailMaterialProperty,
         this.depthFailMaterial,
       );
+      if (defined(this.scene)) {
+        this.depthFailMaterial.update(this.scene.context);
+      }
       this.primitive.depthFailAppearance.material = this.depthFailMaterial;
     }
 
@@ -390,12 +404,14 @@ Batch.prototype.destroy = function () {
  * @private
  */
 function StaticGeometryPerMaterialBatch(
+  scene,
   primitives,
   appearanceType,
   depthFailAppearanceType,
   closed,
   shadows,
 ) {
+  this._scene = scene;
   this._items = [];
   this._primitives = primitives;
   this._appearanceType = appearanceType;
@@ -415,6 +431,7 @@ StaticGeometryPerMaterialBatch.prototype.add = function (time, updater) {
     }
   }
   const batch = new Batch(
+    this._scene,
     this._primitives,
     this._appearanceType,
     updater.fillMaterialProperty,

package/Source/DataSources/StaticGroundGeometryPerMaterialBatch.js

@@ -16,6 +16,7 @@ const defaultDistanceDisplayCondition = new DistanceDisplayCondition();
 
 // Encapsulates a Primitive and all the entities that it represents.
 function Batch(
+  scene,
   primitives,
   classificationType,
   appearanceType,
@@ -23,6 +24,7 @@ function Batch(
   usingSphericalTextureCoordinates,
   zIndex,
 ) {
+  this.scene = scene;
   this.primitives = primitives; // scene level primitive collection (each Batch manages its own Primitive from this collection)
   this.classificationType = classificationType;
   this.appearanceType = appearanceType;
@@ -157,6 +159,9 @@ Batch.prototype.update = function (time) {
         this.materialProperty,
         this.material,
       );
+      if (defined(this.scene)) {
+        this.material.update(this.scene.context);
+      }
 
       const AppearanceType = this.appearanceType;
 
@@ -200,6 +205,9 @@ Batch.prototype.update = function (time) {
       this.materialProperty,
       this.material,
     );
+    if (defined(this.scene)) {
+      this.material.update(this.scene.context);
+    }
     this.primitive.appearance.material = this.material;
 
     const updatersWithAttributes = this.updatersWithAttributes.values;
@@ -331,10 +339,12 @@ Batch.prototype.destroy = function () {
  * @private
  */
 function StaticGroundGeometryPerMaterialBatch(
+  scene,
   primitives,
   classificationType,
   appearanceType,
 ) {
+  this._scene = scene;
   this._items = []; // array of Batch objects, each containing representing a primitive and a set of updaters that manage the visual representation of the primitive.
   this._primitives = primitives; // scene level primitive collection
   this._classificationType = classificationType;
@@ -377,6 +387,7 @@ StaticGroundGeometryPerMaterialBatch.prototype.add = function (time, updater) {
   }
   // If a compatible batch wasn't found, create a new batch.
   const batch = new Batch(
+    this._scene,
     this._primitives,
     this._classificationType,
     this._appearanceType,

package/Source/Renderer/Context.js

@@ -342,6 +342,7 @@ function Context(canvas, options) {
   // default emissive texture has a value of (0, 0, 0)
   // default normal texture is +z which is encoded as (0.5, 0.5, 1)
   this._defaultTexture = undefined;
+  this._defaultTransparentTexture = undefined;
   this._defaultEmissiveTexture = undefined;
   this._defaultNormalTexture = undefined;
   this._defaultCubeMap = undefined;
@@ -1032,6 +1033,30 @@ Object.defineProperties(Context.prototype, {
       return this._defaultTexture;
     },
   },
+  /**
+   * A 1x1 RGBA texture initialized to [0, 0, 0, 0]. Used as a placeholder for
+   * image uniforms while asynchronous textures are downloaded so geometry does not
+   * briefly appear filled with white.
+   * @memberof Context.prototype
+   * @type {Texture}
+   */
+  defaultTransparentTexture: {
+    get: function () {
+      if (this._defaultTransparentTexture === undefined) {
+        this._defaultTransparentTexture = new Texture({
+          context: this,
+          source: {
+            width: 1,
+            height: 1,
+            arrayBufferView: new Uint8Array([0, 0, 0, 0]),
+          },
+          flipY: false,
+        });
+      }
+
+      return this._defaultTransparentTexture;
+    },
+  },
   /**
    * A 1x1 RGB texture initialized to [0, 0, 0] representing a material that is
    * not emissive. This can be used as a placeholder texture for emissive
@@ -1714,6 +1739,9 @@ Context.prototype.destroy = function () {
   this._shaderCache = this._shaderCache.destroy();
   this._textureCache = this._textureCache.destroy();
   this._defaultTexture = this._defaultTexture && this._defaultTexture.destroy();
+  this._defaultTransparentTexture =
+    this._defaultTransparentTexture &&
+    this._defaultTransparentTexture.destroy();
   this._defaultEmissiveTexture =
     this._defaultEmissiveTexture && this._defaultEmissiveTexture.destroy();
   this._defaultNormalTexture =

package/Source/Scene/Material.js

@@ -326,6 +326,7 @@ function Material(options) {
   this._updateFunctions = [];
 
   this._defaultTexture = undefined;
+  this._transparentPlaceholderTexture = undefined;
 
   /**
    * Any and all promises that are created when initializing the material.
@@ -530,6 +531,7 @@ Material.prototype.isTranslucent = function () {
  */
 Material.prototype.update = function (context) {
   this._defaultTexture = context.defaultTexture;
+  this._transparentPlaceholderTexture = context.defaultTransparentTexture;
 
   let i;
   let uniformId;
@@ -582,7 +584,10 @@ Material.prototype.update = function (context) {
     // This will ensure a smooth swap of textures and prevent the default texture
     // from appearing for a few frames.
     const oldTexture = this._textures[uniformId];
-    if (defined(oldTexture) && oldTexture !== this._defaultTexture) {
+    if (
+      defined(oldTexture) &&
+      !isContextOwnedPlaceholderTexture(this, oldTexture)
+    ) {
       oldTexture.destroy();
     }
 
@@ -676,7 +681,7 @@ Material.prototype.destroy = function () {
   for (const texture in textures) {
     if (textures.hasOwnProperty(texture)) {
       const instance = textures[texture];
-      if (instance !== this._defaultTexture) {
+      if (!isContextOwnedPlaceholderTexture(this, instance)) {
         instance.destroy();
       }
     }
@@ -895,6 +900,13 @@ const matrixMap = {
 
 const ktx2Regex = /\.ktx2$/i;
 
+function isContextOwnedPlaceholderTexture(material, texture) {
+  return (
+    texture === material._defaultTexture ||
+    texture === material._transparentPlaceholderTexture
+  );
+}
+
 function createTexture2DUpdateFunction(uniformId) {
   let oldUniformValue;
   return function (material, context) {
@@ -946,7 +958,7 @@ function createTexture2DUpdateFunction(uniformId) {
     if (uniformValue instanceof Texture && uniformValue !== texture) {
       material._texturePaths[uniformId] = undefined;
       const tmp = material._textures[uniformId];
-      if (defined(tmp) && tmp !== material._defaultTexture) {
+      if (defined(tmp) && !isContextOwnedPlaceholderTexture(material, tmp)) {
         tmp.destroy();
       }
       material._textures[uniformId] = uniformValue;
@@ -965,7 +977,7 @@ function createTexture2DUpdateFunction(uniformId) {
       // If the newly-assigned texture is the default texture,
       // we don't need to wait for a new image to load before destroying
       // the old texture.
-      if (texture !== material._defaultTexture) {
+      if (!isContextOwnedPlaceholderTexture(material, texture)) {
         texture.destroy();
       }
       texture = undefined;
@@ -973,7 +985,28 @@ function createTexture2DUpdateFunction(uniformId) {
     }
 
     if (!defined(texture)) {
-      texture = material._textures[uniformId] = material._defaultTexture;
+      const useTransparentImagePlaceholder =
+        material.type === Material.ImageType &&
+        uniformId === "image" &&
+        !uniformValueIsDefaultImage;
+      texture = material._textures[uniformId] = useTransparentImagePlaceholder
+        ? context.defaultTransparentTexture
+        : material._defaultTexture;
+
+      uniformDimensionsName = `${uniformId}Dimensions`;
+      if (uniforms.hasOwnProperty(uniformDimensionsName)) {
+        uniformDimensions = uniforms[uniformDimensionsName];
+        uniformDimensions.x = texture._width;
+        uniformDimensions.y = texture._height;
+      }
+    } else if (
+      material.type === Material.ImageType &&
+      uniformId === "image" &&
+      !uniformValueIsDefaultImage &&
+      texture === material._defaultTexture
+    ) {
+      texture = material._textures[uniformId] =
+        context.defaultTransparentTexture;
 
       uniformDimensionsName = `${uniformId}Dimensions`;
       if (uniforms.hasOwnProperty(uniformDimensionsName)) {
@@ -1061,7 +1094,10 @@ function loadTexture2DImageForUniform(material, uniformId) {
     .catch(function (error) {
       material._initializationError = error;
       const texture = material._textures[uniformId];
-      if (defined(texture) && texture !== material._defaultTexture) {
+      if (
+        defined(texture) &&
+        !isContextOwnedPlaceholderTexture(material, texture)
+      ) {
         texture.destroy();
       }
       material._textures[uniformId] = material._defaultTexture;
@@ -1440,7 +1476,15 @@ Material._materialCache.addMaterial(Material.ImageType, {
     },
   },
   translucent: function (material) {
-    return material.uniforms.color.alpha < 1.0;
+    if (material.uniforms.color.alpha < 1.0) {
+      return true;
+    }
+    const tex = material._textures.image;
+    return (
+      defined(tex) &&
+      defined(material._transparentPlaceholderTexture) &&
+      tex === material._transparentPlaceholderTexture
+    );
   },
 });