deeptwins-cesium-engine 0.0.39 → 0.0.41

package/Source/Scene/BillboardTexture.js

@@ -1,3 +1,4 @@
+import BoundingRectangle from "../Core/BoundingRectangle.js";
 import Check from "../Core/Check.js";
 import defined from "../Core/defined.js";
 import BillboardLoadState from "./BillboardLoadState.js";
@@ -26,7 +27,11 @@ function BillboardTexture(billboardCollection) {
   this._width = undefined;
   this._height = undefined;
 
+  this._indexPromise = undefined;
+  this._image = undefined;
+  this._imageSubRegion = undefined;
   this._hasSubregion = false;
+  this._owner = undefined;
 
   /**
    * Used by billboardCollection to track whcih billboards to update.
@@ -58,7 +63,9 @@ function getAtlasImageDimensions(atlas, index) {
   const rectangles = atlas.rectangles;
   if (defined(rectangles)) {
     const rectangle = rectangles[index];
-    return defined(rectangle) ? rectangle : undefined;
+    if (defined(rectangle)) {
+      return rectangle;
+    }
   }
 
   const textureCoordinates = atlas.textureCoordinates;
@@ -90,6 +97,27 @@ function getAtlasIndexPromise(atlas, id) {
   return undefined;
 }
 
+function cloneSubRegion(subRegion) {
+  return defined(subRegion) ? BoundingRectangle.clone(subRegion) : undefined;
+}
+
+function syncLegacyBillboardFields(billboardTexture) {
+  const billboard = billboardTexture._owner;
+  if (!defined(billboard)) {
+    return;
+  }
+
+  const ready = billboardTexture.ready;
+  billboard._imageIndex = ready ? billboardTexture._index : -1;
+  billboard._imageIndexPromise = billboardTexture._indexPromise;
+  billboard._imageId = billboardTexture._id;
+  billboard._image = billboardTexture._image;
+  billboard._imageSubRegion = cloneSubRegion(billboardTexture._imageSubRegion);
+  billboard._imageWidth = billboardTexture._width;
+  billboard._imageHeight = billboardTexture._height;
+  billboard._ready = ready;
+}
+
 Object.defineProperties(BillboardTexture.prototype, {
   /**
    * If defined, this error was encountered during the loading process.
@@ -206,8 +234,13 @@ BillboardTexture.prototype.unload = async function () {
   this._index = -1;
   this._width = undefined;
   this._height = undefined;
+  this._indexPromise = undefined;
+  this._image = undefined;
+  this._imageSubRegion = undefined;
+  this._hasSubregion = false;
 
   this.dirty = true;
+  syncLegacyBillboardFields(this);
 };
 
 /**
@@ -224,6 +257,7 @@ BillboardTexture.prototype.loadImage = async function (id, image) {
     (this._loadState === BillboardLoadState.LOADING || this.ready)
   ) {
     // This image has already been loaded
+    syncLegacyBillboardFields(this);
     return;
   }
 
@@ -248,15 +282,26 @@ BillboardTexture.prototype.loadImage = async function (id, image) {
   billboardTexture._id = this._id = id;
   billboardTexture._loadState = this._loadState = BillboardLoadState.LOADING;
   billboardTexture._loadError = this._loadError = undefined;
+  billboardTexture._index = this._index = -1;
+  billboardTexture._width = this._width = undefined;
+  billboardTexture._height = this._height = undefined;
+  billboardTexture._image = this._image = image;
+  billboardTexture._imageSubRegion = this._imageSubRegion = undefined;
+  billboardTexture._hasSubregion = this._hasSubregion = false;
 
   let index;
   const atlas = this._billboardCollection.textureAtlas;
   try {
-    index = await atlas.addImage(id, image);
+    const indexPromise = atlas.addImage(id, image);
+    billboardTexture._indexPromise = this._indexPromise = indexPromise;
+    syncLegacyBillboardFields(this);
+
+    index = await indexPromise;
   } catch (error) {
     // There was an error loading the image
     billboardTexture._loadState = BillboardLoadState.ERROR;
     billboardTexture._loadError = error;
+    billboardTexture._indexPromise = undefined;
 
     if (this._id !== id) {
       // Another load was initiated and resolved resolved before this one. This operation is cancelled.
@@ -265,6 +310,8 @@ BillboardTexture.prototype.loadImage = async function (id, image) {
 
     this._loadState = BillboardLoadState.ERROR;
     this._loadError = error;
+    this._indexPromise = undefined;
+    syncLegacyBillboardFields(this);
     return;
   }
 
@@ -272,6 +319,7 @@ BillboardTexture.prototype.loadImage = async function (id, image) {
     // Resources destroyed or otherwise
     billboardTexture._loadState = BillboardLoadState.FAILED;
     billboardTexture._index = -1;
+    billboardTexture._indexPromise = undefined;
 
     if (this._id !== id) {
       // Another load was initiated and resolved resolved before this one. This operation is cancelled.
@@ -280,6 +328,8 @@ BillboardTexture.prototype.loadImage = async function (id, image) {
 
     this._loadState = BillboardLoadState.FAILED;
     this._index = -1;
+    this._indexPromise = undefined;
+    syncLegacyBillboardFields(this);
 
     return;
   }
@@ -293,6 +343,7 @@ BillboardTexture.prototype.loadImage = async function (id, image) {
     billboardTexture._index = -1;
     billboardTexture._width = undefined;
     billboardTexture._height = undefined;
+    billboardTexture._indexPromise = undefined;
 
     if (this._id !== id) {
       // Another load was initiated and resolved resolved before this one. This operation is cancelled.
@@ -303,11 +354,16 @@ BillboardTexture.prototype.loadImage = async function (id, image) {
     this._index = -1;
     this._width = undefined;
     this._height = undefined;
+    this._indexPromise = undefined;
+    syncLegacyBillboardFields(this);
     return;
   }
 
   billboardTexture._width = dimensions.width;
   billboardTexture._height = dimensions.height;
+  billboardTexture._image = undefined;
+  billboardTexture._imageSubRegion = undefined;
+  billboardTexture._indexPromise = undefined;
 
   if (this._id !== id) {
     // Another load was initiated and resolved resolved before this one. This operation is cancelled.
@@ -318,8 +374,12 @@ BillboardTexture.prototype.loadImage = async function (id, image) {
   this._loadState = BillboardLoadState.LOADED;
   this._width = dimensions.width;
   this._height = dimensions.height;
+  this._image = undefined;
+  this._imageSubRegion = undefined;
+  this._indexPromise = undefined;
 
   this.dirty = true;
+  syncLegacyBillboardFields(this);
 };
 
 /**
@@ -333,16 +393,27 @@ BillboardTexture.prototype.addImageSubRegion = async function (id, subRegion) {
   this._id = id;
   this._loadState = BillboardLoadState.LOADING;
   this._loadError = undefined;
+  this._index = -1;
+  this._width = undefined;
+  this._height = undefined;
+  this._image = undefined;
+  this._imageSubRegion = cloneSubRegion(subRegion);
   this._hasSubregion = true;
 
   let index;
   const atlas = this._billboardCollection.textureAtlas;
   try {
-    index = await atlas.addImageSubRegion(id, subRegion);
+    const indexPromise = atlas.addImageSubRegion(id, subRegion);
+    this._indexPromise = indexPromise;
+    syncLegacyBillboardFields(this);
+
+    index = await indexPromise;
   } catch (error) {
     // There was an error loading the referenced image
     this._loadState = BillboardLoadState.ERROR;
     this._loadError = error;
+    this._indexPromise = undefined;
+    syncLegacyBillboardFields(this);
     return;
   }
 
@@ -351,6 +422,8 @@ BillboardTexture.prototype.addImageSubRegion = async function (id, subRegion) {
     this._index = -1;
     this._width = undefined;
     this._height = undefined;
+    this._indexPromise = undefined;
+    syncLegacyBillboardFields(this);
     return;
   }
 
@@ -359,8 +432,10 @@ BillboardTexture.prototype.addImageSubRegion = async function (id, subRegion) {
 
   this._index = index;
   this._loadState = BillboardLoadState.LOADED;
+  this._indexPromise = undefined;
 
   this.dirty = true;
+  syncLegacyBillboardFields(this);
 };
 
 /**
@@ -387,13 +462,26 @@ BillboardTexture.clone = function (billboardTexture, target) {
   target._index = billboardTexture._index;
   target._width = billboardTexture._width;
   target._height = billboardTexture._height;
+  target._indexPromise =
+    billboardTexture._indexPromise ??
+    getAtlasIndexPromise(
+      billboardTexture._billboardCollection.textureAtlas,
+      billboardTexture._id,
+    );
+  target._image = billboardTexture._image;
+  target._imageSubRegion = cloneSubRegion(billboardTexture._imageSubRegion);
   target._hasSubregion = billboardTexture._hasSubregion;
 
   if (billboardTexture.ready) {
+    target._indexPromise = undefined;
+    target._image = undefined;
     target.dirty = true;
+    syncLegacyBillboardFields(target);
     return;
   }
 
+  syncLegacyBillboardFields(target);
+
   const completeLoad = async () => {
     const id = billboardTexture._id;
     const atlas = billboardTexture._billboardCollection.textureAtlas;
@@ -425,7 +513,11 @@ BillboardTexture.clone = function (billboardTexture, target) {
     target._index = billboardTexture._index;
     target._width = billboardTexture._width;
     target._height = billboardTexture._height;
+    target._indexPromise = undefined;
+    target._image = billboardTexture.ready ? undefined : billboardTexture._image;
+    target._imageSubRegion = cloneSubRegion(billboardTexture._imageSubRegion);
     target.dirty = true;
+    syncLegacyBillboardFields(target);
   };
 
   completeLoad();

package/index.js

@@ -1,4 +1,4 @@
-globalThis.CESIUM_VERSION = "0.0.38";
+globalThis.CESIUM_VERSION = "0.0.40";
 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';
@@ -151,6 +151,58 @@ 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 _shadersAdjustTranslucentFS } from './Source/Shaders/AdjustTranslucentFS.js';
+export { default as _shadersAtmosphereCommon } from './Source/Shaders/AtmosphereCommon.js';
+export { default as _shadersBillboardCollectionFS } from './Source/Shaders/BillboardCollectionFS.js';
+export { default as _shadersBillboardCollectionVS } from './Source/Shaders/BillboardCollectionVS.js';
+export { default as _shadersBrdfLutGeneratorFS } from './Source/Shaders/BrdfLutGeneratorFS.js';
+export { default as _shadersCloudCollectionFS } from './Source/Shaders/CloudCollectionFS.js';
+export { default as _shadersCloudCollectionVS } from './Source/Shaders/CloudCollectionVS.js';
+export { default as _shadersCloudNoiseFS } from './Source/Shaders/CloudNoiseFS.js';
+export { default as _shadersCloudNoiseVS } from './Source/Shaders/CloudNoiseVS.js';
+export { default as _shadersCompareAndPackTranslucentDepth } from './Source/Shaders/CompareAndPackTranslucentDepth.js';
+export { default as _shadersCompositeOITFS } from './Source/Shaders/CompositeOITFS.js';
+export { default as _shadersComputeIrradianceFS } from './Source/Shaders/ComputeIrradianceFS.js';
+export { default as _shadersComputeRadianceMapFS } from './Source/Shaders/ComputeRadianceMapFS.js';
+export { default as _shadersConvolveSpecularMapFS } from './Source/Shaders/ConvolveSpecularMapFS.js';
+export { default as _shadersConvolveSpecularMapVS } from './Source/Shaders/ConvolveSpecularMapVS.js';
+export { default as _shadersDepthPlaneFS } from './Source/Shaders/DepthPlaneFS.js';
+export { default as _shadersDepthPlaneVS } from './Source/Shaders/DepthPlaneVS.js';
+export { default as _shadersEllipsoidFS } from './Source/Shaders/EllipsoidFS.js';
+export { default as _shadersEllipsoidVS } from './Source/Shaders/EllipsoidVS.js';
+export { default as _shadersFXAA3_11 } from './Source/Shaders/FXAA3_11.js';
+export { default as _shadersGlobeFS } from './Source/Shaders/GlobeFS.js';
+export { default as _shadersGlobeVS } from './Source/Shaders/GlobeVS.js';
+export { default as _shadersGroundAtmosphere } from './Source/Shaders/GroundAtmosphere.js';
+export { default as _shadersPointPrimitiveCollectionFS } from './Source/Shaders/PointPrimitiveCollectionFS.js';
+export { default as _shadersPointPrimitiveCollectionVS } from './Source/Shaders/PointPrimitiveCollectionVS.js';
+export { default as _shadersPolygonSignedDistanceFS } from './Source/Shaders/PolygonSignedDistanceFS.js';
+export { default as _shadersPolylineCommon } from './Source/Shaders/PolylineCommon.js';
+export { default as _shadersPolylineFS } from './Source/Shaders/PolylineFS.js';
+export { default as _shadersPolylineShadowVolumeFS } from './Source/Shaders/PolylineShadowVolumeFS.js';
+export { default as _shadersPolylineShadowVolumeMorphFS } from './Source/Shaders/PolylineShadowVolumeMorphFS.js';
+export { default as _shadersPolylineShadowVolumeMorphVS } from './Source/Shaders/PolylineShadowVolumeMorphVS.js';
+export { default as _shadersPolylineShadowVolumeVS } from './Source/Shaders/PolylineShadowVolumeVS.js';
+export { default as _shadersPolylineVS } from './Source/Shaders/PolylineVS.js';
+export { default as _shadersReprojectWebMercatorFS } from './Source/Shaders/ReprojectWebMercatorFS.js';
+export { default as _shadersReprojectWebMercatorVS } from './Source/Shaders/ReprojectWebMercatorVS.js';
+export { default as _shadersShadowVolumeAppearanceFS } from './Source/Shaders/ShadowVolumeAppearanceFS.js';
+export { default as _shadersShadowVolumeAppearanceVS } from './Source/Shaders/ShadowVolumeAppearanceVS.js';
+export { default as _shadersShadowVolumeFS } from './Source/Shaders/ShadowVolumeFS.js';
+export { default as _shadersSkyAtmosphereCommon } from './Source/Shaders/SkyAtmosphereCommon.js';
+export { default as _shadersSkyAtmosphereFS } from './Source/Shaders/SkyAtmosphereFS.js';
+export { default as _shadersSkyAtmosphereVS } from './Source/Shaders/SkyAtmosphereVS.js';
+export { default as _shadersSkyBoxFS } from './Source/Shaders/SkyBoxFS.js';
+export { default as _shadersSkyBoxVS } from './Source/Shaders/SkyBoxVS.js';
+export { default as _shadersSunFS } from './Source/Shaders/SunFS.js';
+export { default as _shadersSunTextureFS } from './Source/Shaders/SunTextureFS.js';
+export { default as _shadersSunVS } from './Source/Shaders/SunVS.js';
+export { default as _shadersVector3DTileClampedPolylinesFS } from './Source/Shaders/Vector3DTileClampedPolylinesFS.js';
+export { default as _shadersVector3DTileClampedPolylinesVS } from './Source/Shaders/Vector3DTileClampedPolylinesVS.js';
+export { default as _shadersVector3DTilePolylinesVS } from './Source/Shaders/Vector3DTilePolylinesVS.js';
+export { default as _shadersVectorTileVS } from './Source/Shaders/VectorTileVS.js';
+export { default as _shadersViewportQuadFS } from './Source/Shaders/ViewportQuadFS.js';
+export { default as _shadersViewportQuadVS } from './Source/Shaders/ViewportQuadVS.js';
 export { default as ApproximateTerrainHeights } from './Source/Core/ApproximateTerrainHeights.js';
 export { default as ArcGISTiledElevationTerrainProvider } from './Source/Core/ArcGISTiledElevationTerrainProvider.js';
 export { default as ArcType } from './Source/Core/ArcType.js';
@@ -434,58 +486,6 @@ export { default as subdivideArray } from './Source/Core/subdivideArray.js';
 export { default as webGLConstantToGlslType } from './Source/Core/webGLConstantToGlslType.js';
 export { default as wrapFunction } from './Source/Core/wrapFunction.js';
 export { default as writeTextToCanvas } from './Source/Core/writeTextToCanvas.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';
-export { default as _shadersBillboardCollectionVS } from './Source/Shaders/BillboardCollectionVS.js';
-export { default as _shadersBrdfLutGeneratorFS } from './Source/Shaders/BrdfLutGeneratorFS.js';
-export { default as _shadersCloudCollectionFS } from './Source/Shaders/CloudCollectionFS.js';
-export { default as _shadersCloudCollectionVS } from './Source/Shaders/CloudCollectionVS.js';
-export { default as _shadersCloudNoiseFS } from './Source/Shaders/CloudNoiseFS.js';
-export { default as _shadersCloudNoiseVS } from './Source/Shaders/CloudNoiseVS.js';
-export { default as _shadersCompareAndPackTranslucentDepth } from './Source/Shaders/CompareAndPackTranslucentDepth.js';
-export { default as _shadersCompositeOITFS } from './Source/Shaders/CompositeOITFS.js';
-export { default as _shadersComputeIrradianceFS } from './Source/Shaders/ComputeIrradianceFS.js';
-export { default as _shadersComputeRadianceMapFS } from './Source/Shaders/ComputeRadianceMapFS.js';
-export { default as _shadersConvolveSpecularMapFS } from './Source/Shaders/ConvolveSpecularMapFS.js';
-export { default as _shadersConvolveSpecularMapVS } from './Source/Shaders/ConvolveSpecularMapVS.js';
-export { default as _shadersDepthPlaneFS } from './Source/Shaders/DepthPlaneFS.js';
-export { default as _shadersDepthPlaneVS } from './Source/Shaders/DepthPlaneVS.js';
-export { default as _shadersEllipsoidFS } from './Source/Shaders/EllipsoidFS.js';
-export { default as _shadersEllipsoidVS } from './Source/Shaders/EllipsoidVS.js';
-export { default as _shadersFXAA3_11 } from './Source/Shaders/FXAA3_11.js';
-export { default as _shadersGlobeFS } from './Source/Shaders/GlobeFS.js';
-export { default as _shadersGlobeVS } from './Source/Shaders/GlobeVS.js';
-export { default as _shadersGroundAtmosphere } from './Source/Shaders/GroundAtmosphere.js';
-export { default as _shadersPointPrimitiveCollectionFS } from './Source/Shaders/PointPrimitiveCollectionFS.js';
-export { default as _shadersPointPrimitiveCollectionVS } from './Source/Shaders/PointPrimitiveCollectionVS.js';
-export { default as _shadersPolygonSignedDistanceFS } from './Source/Shaders/PolygonSignedDistanceFS.js';
-export { default as _shadersPolylineCommon } from './Source/Shaders/PolylineCommon.js';
-export { default as _shadersPolylineFS } from './Source/Shaders/PolylineFS.js';
-export { default as _shadersPolylineShadowVolumeFS } from './Source/Shaders/PolylineShadowVolumeFS.js';
-export { default as _shadersPolylineShadowVolumeMorphFS } from './Source/Shaders/PolylineShadowVolumeMorphFS.js';
-export { default as _shadersPolylineShadowVolumeMorphVS } from './Source/Shaders/PolylineShadowVolumeMorphVS.js';
-export { default as _shadersPolylineShadowVolumeVS } from './Source/Shaders/PolylineShadowVolumeVS.js';
-export { default as _shadersPolylineVS } from './Source/Shaders/PolylineVS.js';
-export { default as _shadersReprojectWebMercatorFS } from './Source/Shaders/ReprojectWebMercatorFS.js';
-export { default as _shadersReprojectWebMercatorVS } from './Source/Shaders/ReprojectWebMercatorVS.js';
-export { default as _shadersShadowVolumeAppearanceFS } from './Source/Shaders/ShadowVolumeAppearanceFS.js';
-export { default as _shadersShadowVolumeAppearanceVS } from './Source/Shaders/ShadowVolumeAppearanceVS.js';
-export { default as _shadersShadowVolumeFS } from './Source/Shaders/ShadowVolumeFS.js';
-export { default as _shadersSkyAtmosphereCommon } from './Source/Shaders/SkyAtmosphereCommon.js';
-export { default as _shadersSkyAtmosphereFS } from './Source/Shaders/SkyAtmosphereFS.js';
-export { default as _shadersSkyAtmosphereVS } from './Source/Shaders/SkyAtmosphereVS.js';
-export { default as _shadersSkyBoxFS } from './Source/Shaders/SkyBoxFS.js';
-export { default as _shadersSkyBoxVS } from './Source/Shaders/SkyBoxVS.js';
-export { default as _shadersSunFS } from './Source/Shaders/SunFS.js';
-export { default as _shadersSunTextureFS } from './Source/Shaders/SunTextureFS.js';
-export { default as _shadersSunVS } from './Source/Shaders/SunVS.js';
-export { default as _shadersVector3DTileClampedPolylinesFS } from './Source/Shaders/Vector3DTileClampedPolylinesFS.js';
-export { default as _shadersVector3DTileClampedPolylinesVS } from './Source/Shaders/Vector3DTileClampedPolylinesVS.js';
-export { default as _shadersVector3DTilePolylinesVS } from './Source/Shaders/Vector3DTilePolylinesVS.js';
-export { default as _shadersVectorTileVS } from './Source/Shaders/VectorTileVS.js';
-export { default as _shadersViewportQuadFS } from './Source/Shaders/ViewportQuadFS.js';
-export { default as _shadersViewportQuadVS } from './Source/Shaders/ViewportQuadVS.js';
 export { default as CesiumWidget } from './Source/Widget/CesiumWidget.js';
 export { default as AlphaMode } from './Source/Scene/AlphaMode.js';
 export { default as Appearance } from './Source/Scene/Appearance.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deeptwins-cesium-engine",
-  "version": "0.0.39",
+  "version": "0.0.41",
   "description": "",
   "keywords": [
     "3D",