@hztxi/cesium-engine 25.0.1 → 25.0.2

package/Source/Scene/GroundPolylinePrimitive.js

@@ -182,6 +182,9 @@ function GroundPolylinePrimitive(options) {
 
   this._retainedGeometryInstances = undefined;
 
+  /** @private Root {@link GroundPolylineGeometry} ref from the last inner {@link Primitive} build. */
+  this._lastGroundPolylineRootGeometry = undefined;
+
   this._ready = false;
   this._primitive = undefined;
 
@@ -316,19 +319,30 @@ GroundPolylinePrimitive.initializeTerrainHeights = function () {
   return ApproximateTerrainHeights.initialize();
 };
 
+function normalizeGeometryInstances(instances) {
+  if (!defined(instances)) {
+    return instances;
+  }
+  return Array.isArray(instances) ? instances : [instances];
+}
+
 function verticalExaggerationMatchesFrameState(geometryInstances, frameState) {
-  if (!defined(geometryInstances)) {
+  const instances = normalizeGeometryInstances(geometryInstances);
+  if (!defined(instances)) {
     return true;
   }
   const ex = frameState.verticalExaggeration;
   const exRel = frameState.verticalExaggerationRelativeHeight;
-  const length = geometryInstances.length;
+  const length = instances.length;
   for (let i = 0; i < length; ++i) {
-    const geom = geometryInstances[i].geometry;
-    if (
-      geom._verticalExaggeration !== ex ||
-      geom._verticalExaggerationRelativeHeight !== exRel
-    ) {
+    const instance = instances[i];
+    if (!defined(instance) || !defined(instance.geometry)) {
+      return false;
+    }
+    const geom = instance.geometry;
+    const geomEx = geom._verticalExaggeration ?? 1.0;
+    const geomExRel = geom._verticalExaggerationRelativeHeight ?? 0.0;
+    if (geomEx !== ex || geomExRel !== exRel) {
       return false;
     }
   }
@@ -689,6 +703,20 @@ GroundPolylinePrimitive.prototype.update = function (frameState) {
     return;
   }
 
+  let i;
+
+  const that = this;
+  const primitiveOptions = this._primitiveOptions;
+
+  if (
+    defined(this.geometryInstances) &&
+    !defined(this._retainedGeometryInstances)
+  ) {
+    this._retainedGeometryInstances = Array.isArray(this.geometryInstances)
+      ? this.geometryInstances.slice()
+      : [this.geometryInstances];
+  }
+
   if (!ApproximateTerrainHeights.initialized) {
     //>>includeStart('debug', pragmas.debug);
     if (!this.asynchronous) {
@@ -702,23 +730,37 @@ GroundPolylinePrimitive.prototype.update = function (frameState) {
     return;
   }
 
-  let i;
+  const sourceGeometryInstances = normalizeGeometryInstances(
+    this.geometryInstances ?? this._retainedGeometryInstances,
+  );
 
-  const that = this;
-  const primitiveOptions = this._primitiveOptions;
+  let rootGeometryFromSource;
+  if (defined(sourceGeometryInstances)) {
+    const src0 = sourceGeometryInstances[0];
+    if (defined(src0) && defined(src0.geometry)) {
+      rootGeometryFromSource = src0.geometry;
+    }
+  }
 
+  // New GeometryInstances (e.g. dynamic Entity polylines) assign a fresh GroundPolylineGeometry
+  // each frame. Destroy the inner Primitive when the source geometry object changes; otherwise
+  // we would keep rendering the previous combineGeometry result.
   if (
-    defined(this.geometryInstances) &&
-    !defined(this._retainedGeometryInstances)
+    defined(this._primitive) &&
+    defined(rootGeometryFromSource) &&
+    rootGeometryFromSource !== this._lastGroundPolylineRootGeometry
   ) {
-    this._retainedGeometryInstances = Array.isArray(this.geometryInstances)
-      ? this.geometryInstances.slice()
-      : [this.geometryInstances];
+    this._primitive = this._primitive.destroy();
+    this._primitive = undefined;
+    this._ready = false;
+    if (defined(this._sp)) {
+      this._sp = this._sp.destroy();
+    }
+    this._sp2D = undefined;
+    this._spMorph = undefined;
+    this._lastGroundPolylineRootGeometry = undefined;
   }
 
-  const sourceGeometryInstances =
-    this.geometryInstances ?? this._retainedGeometryInstances;
-
   if (
     defined(this._primitive) &&
     !verticalExaggerationMatchesFrameState(sourceGeometryInstances, frameState)
@@ -740,6 +782,7 @@ GroundPolylinePrimitive.prototype.update = function (frameState) {
 
     let attributes;
 
+    this._hasPerInstanceColors = true;
     // Check if each instance has a color attribute.
     for (i = 0; i < geometryInstancesLength; ++i) {
       attributes = geometryInstances[i].attributes;
@@ -752,7 +795,7 @@ GroundPolylinePrimitive.prototype.update = function (frameState) {
     for (i = 0; i < geometryInstancesLength; ++i) {
       const geometryInstance = geometryInstances[i];
       attributes = {};
-      const instanceAttributes = geometryInstance.attributes;
+      const instanceAttributes = geometryInstance.attributes ?? {};
       for (const attributeKey in instanceAttributes) {
         if (instanceAttributes.hasOwnProperty(attributeKey)) {
           attributes[attributeKey] = instanceAttributes[attributeKey];
@@ -837,6 +880,7 @@ GroundPolylinePrimitive.prototype.update = function (frameState) {
     };
 
     this._primitive = new Primitive(primitiveOptions);
+    this._lastGroundPolylineRootGeometry = rootGeometryFromSource;
   }
 
   if (
@@ -932,6 +976,7 @@ GroundPolylinePrimitive.prototype.isDestroyed = function () {
  * @see GroundPolylinePrimitive#isDestroyed
  */
 GroundPolylinePrimitive.prototype.destroy = function () {
+  this._lastGroundPolylineRootGeometry = undefined;
   this._primitive = this._primitive && this._primitive.destroy();
   this._sp = this._sp && this._sp.destroy();
 

package/Source/Scene/Primitive.js

@@ -485,7 +485,14 @@ function getCommonPerInstanceAttributeNames(instances) {
   const length = instances.length;
 
   const attributesInAllInstances = [];
+  if (length === 0 || !defined(instances[0])) {
+    return attributesInAllInstances;
+  }
+
   const attributes0 = instances[0].attributes;
+  if (!defined(attributes0)) {
+    return attributesInAllInstances;
+  }
   let name;
 
   for (name in attributes0) {
@@ -495,7 +502,13 @@ function getCommonPerInstanceAttributeNames(instances) {
 
       // Does this same attribute exist in all instances?
       for (let i = 1; i < length; ++i) {
-        const otherAttribute = instances[i].attributes[name];
+        const otherInstance = instances[i];
+        const otherAttributes = defined(otherInstance)
+          ? otherInstance.attributes
+          : undefined;
+        const otherAttribute = defined(otherAttributes)
+          ? otherAttributes[name]
+          : undefined;
 
         if (
           !defined(otherAttribute) ||
@@ -537,11 +550,14 @@ function getAttributeValue(value) {
 
 function createBatchTable(primitive, context) {
   const geometryInstances = primitive.geometryInstances;
+  if (!defined(geometryInstances)) {
+    return;
+  }
   const instances = Array.isArray(geometryInstances)
     ? geometryInstances
     : [geometryInstances];
   const numberOfInstances = instances.length;
-  if (numberOfInstances === 0) {
+  if (numberOfInstances === 0 || !defined(instances[0])) {
     return;
   }
 
@@ -2109,6 +2125,9 @@ Primitive.prototype.update = function (frameState) {
   if (!defined(this._batchTable)) {
     createBatchTable(this, context);
   }
+  if (!defined(this._batchTable)) {
+    return;
+  }
   if (this._batchTable.attributes.length > 0) {
     if (ContextLimits.maximumVertexTextureImageUnits === 0) {
       throw new RuntimeError(

package/index.js

@@ -1,4 +1,4 @@
-globalThis.CESIUM_VERSION = "1.141.1";
+globalThis.CESIUM_VERSION = "1.141.2";
 export { default as AutomaticUniforms } from './Source/Renderer/AutomaticUniforms.js';
 export { default as Buffer } from './Source/Renderer/Buffer.js';
 export { default as BufferUsage } from './Source/Renderer/BufferUsage.js';
@@ -154,7 +154,6 @@ export { default as createRawPropertyDescriptor } from './Source/DataSources/cre
 export { default as exportKml } from './Source/DataSources/exportKml.js';
 export { default as getElement } from './Source/DataSources/getElement.js';
 export { default as heightReferenceOnEntityPropertyChanged } from './Source/DataSources/heightReferenceOnEntityPropertyChanged.js';
-export { default as CesiumWidget } from './Source/Widget/CesiumWidget.js';
 export { default as _shadersAdjustTranslucentFS } from './Source/Shaders/AdjustTranslucentFS.js';
 export { default as _shadersAtmosphereCommon } from './Source/Shaders/AtmosphereCommon.js';
 export { default as _shadersBillboardCollectionFS } from './Source/Shaders/BillboardCollectionFS.js';
@@ -881,7 +880,7 @@ export { default as processVoxelProperties } from './Source/Scene/processVoxelPr
 export { default as renderBufferPointCollection } from './Source/Scene/renderBufferPointCollection.js';
 export { default as renderBufferPolygonCollection } from './Source/Scene/renderBufferPolygonCollection.js';
 export { default as renderBufferPolylineCollection } from './Source/Scene/renderBufferPolylineCollection.js';
-export { default as _shadersCzmBuiltins } from './Source/Shaders/Builtin/CzmBuiltins.js';
+export { default as CesiumWidget } from './Source/Widget/CesiumWidget.js';
 export { default as _shadersAllMaterialAppearanceFS } from './Source/Shaders/Appearances/AllMaterialAppearanceFS.js';
 export { default as _shadersAllMaterialAppearanceVS } from './Source/Shaders/Appearances/AllMaterialAppearanceVS.js';
 export { default as _shadersBasicMaterialAppearanceFS } from './Source/Shaders/Appearances/BasicMaterialAppearanceFS.js';
@@ -896,6 +895,7 @@ export { default as _shadersPolylineColorAppearanceVS } from './Source/Shaders/A
 export { default as _shadersPolylineMaterialAppearanceVS } from './Source/Shaders/Appearances/PolylineMaterialAppearanceVS.js';
 export { default as _shadersTexturedMaterialAppearanceFS } from './Source/Shaders/Appearances/TexturedMaterialAppearanceFS.js';
 export { default as _shadersTexturedMaterialAppearanceVS } from './Source/Shaders/Appearances/TexturedMaterialAppearanceVS.js';
+export { default as _shadersCzmBuiltins } from './Source/Shaders/Builtin/CzmBuiltins.js';
 export { default as _shadersAspectRampMaterial } from './Source/Shaders/Materials/AspectRampMaterial.js';
 export { default as _shadersBumpMapMaterial } from './Source/Shaders/Materials/BumpMapMaterial.js';
 export { default as _shadersCheckerboardMaterial } from './Source/Shaders/Materials/CheckerboardMaterial.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hztxi/cesium-engine",
-  "version": "25.0.1",
+  "version": "25.0.2",
   "description": "CesiumJS is a JavaScript library for creating 3D globes and 2D maps in a web browser without a plugin.",
   "keywords": [
     "3D",
@@ -59,6 +59,14 @@
     "urijs": "^1.19.7"
   },
   "type": "module",
+  "scripts": {
+    "build": "gulp build --workspace @hztxi/cesium-engine",
+    "build-ts": "gulp buildTs --workspace @hztxi/cesium-engine",
+    "coverage": "gulp coverage --workspace @hztxi/cesium-engine",
+    "tsc": "gulp tsc --workspace @hztxi/cesium-engine",
+    "test": "gulp test --workspace @hztxi/cesium-engine",
+    "postversion": "gulp postversion --workspace @hztxi/cesium-engine"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/CesiumGS/cesium.git"
@@ -71,13 +79,5 @@
   },
   "bugs": {
     "url": "https://github.com/CesiumGS/cesium/issues"
-  },
-  "scripts": {
-    "build": "gulp build --workspace @hztxi/cesium-engine",
-    "build-ts": "gulp buildTs --workspace @hztxi/cesium-engine",
-    "coverage": "gulp coverage --workspace @hztxi/cesium-engine",
-    "tsc": "gulp tsc --workspace @hztxi/cesium-engine",
-    "test": "gulp test --workspace @hztxi/cesium-engine",
-    "postversion": "gulp postversion --workspace @hztxi/cesium-engine"
   }
-}
+}