deeptwins-cesium-engine 0.0.38 → 0.0.39

package/Source/Scene/BillboardTexture.js

@@ -36,6 +36,60 @@ function BillboardTexture(billboardCollection) {
   this.dirty = false;
 }
 
+function getBillboardTextureCache(collection) {
+  let cache = collection.billboardTextureCache;
+  if (!defined(cache)) {
+    cache = collection._billboardTextureCache;
+  }
+
+  if (!defined(cache)) {
+    cache = new Map();
+    collection._billboardTextureCache = cache;
+  }
+
+  return cache;
+}
+
+function isValidImageIndex(index) {
+  return typeof index === "number" && index >= 0;
+}
+
+function getAtlasImageDimensions(atlas, index) {
+  const rectangles = atlas.rectangles;
+  if (defined(rectangles)) {
+    const rectangle = rectangles[index];
+    return defined(rectangle) ? rectangle : undefined;
+  }
+
+  const textureCoordinates = atlas.textureCoordinates;
+  const textureCoordinate = defined(textureCoordinates)
+    ? textureCoordinates[index]
+    : undefined;
+  const texture = atlas.texture;
+  if (!defined(textureCoordinate) || !defined(texture)) {
+    return undefined;
+  }
+
+  return {
+    width: texture.width * textureCoordinate.width,
+    height: texture.height * textureCoordinate.height,
+  };
+}
+
+function getAtlasIndexPromise(atlas, id) {
+  const indexPromiseById = atlas._indexPromiseById;
+  if (defined(indexPromiseById)) {
+    return indexPromiseById.get(id);
+  }
+
+  const idHash = atlas._idHash;
+  if (defined(idHash)) {
+    return idHash[id];
+  }
+
+  return undefined;
+}
+
 Object.defineProperties(BillboardTexture.prototype, {
   /**
    * If defined, this error was encountered during the loading process.
@@ -76,7 +130,10 @@ Object.defineProperties(BillboardTexture.prototype, {
    */
   ready: {
     get: function () {
-      return this._loadState === BillboardLoadState.LOADED;
+      return (
+        this._loadState === BillboardLoadState.LOADED &&
+        isValidImageIndex(this._index)
+      );
     },
   },
 
@@ -162,18 +219,21 @@ BillboardTexture.prototype.unload = async function () {
  *        or a URL to an Image, or a Promise for an image, or a function that creates an image.
  */
 BillboardTexture.prototype.loadImage = async function (id, image) {
-  if (this._id === id) {
+  if (
+    this._id === id &&
+    (this._loadState === BillboardLoadState.LOADING || this.ready)
+  ) {
     // This image has already been loaded
     return;
   }
 
   const collection = this._billboardCollection;
-  const cache = collection.billboardTextureCache;
+  const cache = getBillboardTextureCache(collection);
   let billboardTexture = cache.get(id);
   if (
-    (defined(billboardTexture) &&
-      image.loadState === BillboardLoadState.LOADING) ||
-    image.loadState === BillboardLoadState.LOADED
+    defined(billboardTexture) &&
+    (billboardTexture.loadState === BillboardLoadState.LOADING ||
+      billboardTexture.ready)
   ) {
     // Use the cached texture if it is in progress or successful.
     BillboardTexture.clone(billboardTexture, this);
@@ -227,9 +287,27 @@ BillboardTexture.prototype.loadImage = async function (id, image) {
   billboardTexture._index = index;
   billboardTexture._loadState = BillboardLoadState.LOADED;
 
-  const rectangle = atlas.rectangles[index];
-  billboardTexture._width = rectangle.width;
-  billboardTexture._height = rectangle.height;
+  const dimensions = getAtlasImageDimensions(atlas, index);
+  if (!defined(dimensions)) {
+    billboardTexture._loadState = BillboardLoadState.FAILED;
+    billboardTexture._index = -1;
+    billboardTexture._width = undefined;
+    billboardTexture._height = undefined;
+
+    if (this._id !== id) {
+      // Another load was initiated and resolved resolved before this one. This operation is cancelled.
+      return;
+    }
+
+    this._loadState = BillboardLoadState.FAILED;
+    this._index = -1;
+    this._width = undefined;
+    this._height = undefined;
+    return;
+  }
+
+  billboardTexture._width = dimensions.width;
+  billboardTexture._height = dimensions.height;
 
   if (this._id !== id) {
     // Another load was initiated and resolved resolved before this one. This operation is cancelled.
@@ -238,8 +316,8 @@ BillboardTexture.prototype.loadImage = async function (id, image) {
 
   this._index = index;
   this._loadState = BillboardLoadState.LOADED;
-  this._width = rectangle.width;
-  this._height = rectangle.height;
+  this._width = dimensions.width;
+  this._height = dimensions.height;
 
   this.dirty = true;
 };
@@ -319,7 +397,16 @@ BillboardTexture.clone = function (billboardTexture, target) {
   const completeLoad = async () => {
     const id = billboardTexture._id;
     const atlas = billboardTexture._billboardCollection.textureAtlas;
-    await atlas._indexPromiseById.get(id);
+    const indexPromise = getAtlasIndexPromise(atlas, id);
+    if (defined(indexPromise)) {
+      try {
+        await indexPromise;
+      } catch {
+        await Promise.resolve();
+      }
+    } else {
+      await Promise.resolve();
+    }
 
     // Any errors should have already been handled
     if (target._id !== id) {

package/index.js

@@ -151,59 +151,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';
-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';
@@ -487,6 +434,59 @@ 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';
 export { default as ArcGisBaseMapType } from './Source/Scene/ArcGisBaseMapType.js';
@@ -899,22 +899,6 @@ export { default as _shadersPrimitiveOutlineStageVS } from './Source/Shaders/Mod
 export { default as _shadersSelectedFeatureIdStageCommon } from './Source/Shaders/Model/SelectedFeatureIdStageCommon.js';
 export { default as _shadersSkinningStageVS } from './Source/Shaders/Model/SkinningStageVS.js';
 export { default as _shadersVerticalExaggerationStageVS } from './Source/Shaders/Model/VerticalExaggerationStageVS.js';
-export { default as _shadersIntersectBox } from './Source/Shaders/Voxels/IntersectBox.js';
-export { default as _shadersIntersectClippingPlanes } from './Source/Shaders/Voxels/IntersectClippingPlanes.js';
-export { default as _shadersIntersectCylinder } from './Source/Shaders/Voxels/IntersectCylinder.js';
-export { default as _shadersIntersectDepth } from './Source/Shaders/Voxels/IntersectDepth.js';
-export { default as _shadersIntersectEllipsoid } from './Source/Shaders/Voxels/IntersectEllipsoid.js';
-export { default as _shadersIntersectLongitude } from './Source/Shaders/Voxels/IntersectLongitude.js';
-export { default as _shadersIntersection } from './Source/Shaders/Voxels/Intersection.js';
-export { default as _shadersIntersectionUtils } from './Source/Shaders/Voxels/IntersectionUtils.js';
-export { default as _shadersMegatexture } from './Source/Shaders/Voxels/Megatexture.js';
-export { default as _shadersOctree } from './Source/Shaders/Voxels/Octree.js';
-export { default as _shadersVoxelFS } from './Source/Shaders/Voxels/VoxelFS.js';
-export { default as _shadersVoxelUtils } from './Source/Shaders/Voxels/VoxelUtils.js';
-export { default as _shadersVoxelVS } from './Source/Shaders/Voxels/VoxelVS.js';
-export { default as _shadersconvertUvToBox } from './Source/Shaders/Voxels/convertUvToBox.js';
-export { default as _shadersconvertUvToCylinder } from './Source/Shaders/Voxels/convertUvToCylinder.js';
-export { default as _shadersconvertUvToEllipsoid } from './Source/Shaders/Voxels/convertUvToEllipsoid.js';
 export { default as _shadersAcesTonemappingStage } from './Source/Shaders/PostProcessStages/AcesTonemappingStage.js';
 export { default as _shadersAdditiveBlend } from './Source/Shaders/PostProcessStages/AdditiveBlend.js';
 export { default as _shadersAmbientOcclusionGenerate } from './Source/Shaders/PostProcessStages/AmbientOcclusionGenerate.js';
@@ -941,6 +925,22 @@ export { default as _shadersPbrNeutralTonemapping } from './Source/Shaders/PostP
 export { default as _shadersPointCloudEyeDomeLighting } from './Source/Shaders/PostProcessStages/PointCloudEyeDomeLighting.js';
 export { default as _shadersReinhardTonemapping } from './Source/Shaders/PostProcessStages/ReinhardTonemapping.js';
 export { default as _shadersSilhouette } from './Source/Shaders/PostProcessStages/Silhouette.js';
+export { default as _shadersIntersectBox } from './Source/Shaders/Voxels/IntersectBox.js';
+export { default as _shadersIntersectClippingPlanes } from './Source/Shaders/Voxels/IntersectClippingPlanes.js';
+export { default as _shadersIntersectCylinder } from './Source/Shaders/Voxels/IntersectCylinder.js';
+export { default as _shadersIntersectDepth } from './Source/Shaders/Voxels/IntersectDepth.js';
+export { default as _shadersIntersectEllipsoid } from './Source/Shaders/Voxels/IntersectEllipsoid.js';
+export { default as _shadersIntersectLongitude } from './Source/Shaders/Voxels/IntersectLongitude.js';
+export { default as _shadersIntersection } from './Source/Shaders/Voxels/Intersection.js';
+export { default as _shadersIntersectionUtils } from './Source/Shaders/Voxels/IntersectionUtils.js';
+export { default as _shadersMegatexture } from './Source/Shaders/Voxels/Megatexture.js';
+export { default as _shadersOctree } from './Source/Shaders/Voxels/Octree.js';
+export { default as _shadersVoxelFS } from './Source/Shaders/Voxels/VoxelFS.js';
+export { default as _shadersVoxelUtils } from './Source/Shaders/Voxels/VoxelUtils.js';
+export { default as _shadersVoxelVS } from './Source/Shaders/Voxels/VoxelVS.js';
+export { default as _shadersconvertUvToBox } from './Source/Shaders/Voxels/convertUvToBox.js';
+export { default as _shadersconvertUvToCylinder } from './Source/Shaders/Voxels/convertUvToCylinder.js';
+export { default as _shadersconvertUvToEllipsoid } from './Source/Shaders/Voxels/convertUvToEllipsoid.js';
 export { default as ForEach } from './Source/Scene/GltfPipeline/ForEach.js';
 export { default as addBuffer } from './Source/Scene/GltfPipeline/addBuffer.js';
 export { default as addDefaults } from './Source/Scene/GltfPipeline/addDefaults.js';

package/package.json

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