itowns 2.45.2-next.3 → 2.45.2-next.5

package/lib/Layer/OGC3DTilesLayer.d.ts

@@ -189,6 +189,7 @@ declare class OGC3DTilesLayer extends GeometryLayer {
      * @private
      */
     private _setupCacheAndQueues;
+    _viewId: any;
     /**
      * Binds 3d-tiles-renderer events to this layer.
      * @private
@@ -271,7 +272,7 @@ declare class OGC3DTilesLayer extends GeometryLayer {
      *  1. tile (Object) - the JSON tile
      *  2. scene (THREE.Object3D | null) - The tile content. Contains a `batchTable` property. Can be null if the tile
      *  has not yet been loaded.
-    */
+     */
     forEachTile(callback: Function): void;
 }
 import GeometryLayer from '../Layer/GeometryLayer';

package/lib/Layer/OGC3DTilesLayer.js

@@ -291,16 +291,12 @@ class OGC3DTilesLayer extends GeometryLayer {
     if (config.sseThreshold) {
       this.sseThreshold = config.sseThreshold;
     }
+
     // Used for custom schedule callbacks (VR)
     this.tasks = [];
     this.tilesSchedulingCB = func => {
       this.tasks.push(func);
     };
-    // We set our scheduling callback for tiles downloading and parsing -> MANDATORY for VR
-    // (WebXR session has its own requestAnimationFrame method separate from that of the window
-    //  https://github.com/NASA-AMMOS/3DTilesRendererJS/issues/213#issuecomment-947943386)
-    this.tilesRenderer.downloadQueue.schedulingCallback = this.tilesSchedulingCB;
-    this.tilesRenderer.parseQueue.schedulingCallback = this.tilesSchedulingCB;
   }
 
   /**
@@ -311,20 +307,46 @@ class OGC3DTilesLayer extends GeometryLayer {
    */
   _setupCacheAndQueues(view) {
     const id = view.id;
+    // Share the caches and queues to cut down on memory and correctly prioritize downloads.
+    // https://github.com/NASA-AMMOS/3DTilesRendererJS?tab=readme-ov-file#multiple-tilesrenderers-with-shared-caches-and-queues
     if (viewers[id]) {
       this.tilesRenderer.lruCache = viewers[id].lruCache;
       this.tilesRenderer.downloadQueue = viewers[id].downloadQueue;
       this.tilesRenderer.parseQueue = viewers[id].parseQueue;
+
+      // Add this layer's callback to the map
+      viewers[id].layerCallbacks[this.id] = this.tilesSchedulingCB;
     } else {
+      // Create a combined callback that calls all layer callbacks
+      const combinedCallback = func => {
+        Object.values(viewers[id].layerCallbacks).forEach(callback => {
+          callback(func);
+        });
+      };
+
+      // Set the combined callback
+      // We set our scheduling callback for tiles downloading and parsing -> MANDATORY for VR
+      // (WebXR session has its own requestAnimationFrame method separate from that of the window
+      //  https://github.com/NASA-AMMOS/3DTilesRendererJS/issues/213#issuecomment-947943386)
+      // Necessary to update rendering of the tiles in VR
+      // Example: https://github.com/NASA-AMMOS/3DTilesRendererJS/blob/de25d27dc0e75278962b5f401faee30f8dce2fe0/example/vr.js
+      this.tilesRenderer.downloadQueue.schedulingCallback = combinedCallback;
+      this.tilesRenderer.parseQueue.schedulingCallback = combinedCallback;
       viewers[id] = {
         lruCache: this.tilesRenderer.lruCache,
         downloadQueue: this.tilesRenderer.downloadQueue,
-        parseQueue: this.tilesRenderer.parseQueue
+        parseQueue: this.tilesRenderer.parseQueue,
+        layerCallbacks: {
+          [this.id]: this.tilesSchedulingCB
+        }
       };
       view.addEventListener(VIEW_EVENTS.DISPOSED, evt => {
         delete viewers[evt.target.id];
       });
     }
+
+    // Store the view reference for cleanup
+    this._viewId = id;
   }
 
   /**
@@ -439,7 +461,20 @@ class OGC3DTilesLayer extends GeometryLayer {
    * Deletes the layer and frees associated memory
    */
   delete() {
+    // Clean up the callback reference from the shared callbacks
+    if (this._viewId != null && viewers[this._viewId]?.layerCallbacks) {
+      delete viewers[this._viewId].layerCallbacks[this.id];
+
+      // If no more layers are using this view's queues, clean up completely
+      if (Object.keys(viewers[this._viewId].layerCallbacks).length === 0) {
+        delete viewers[this._viewId];
+      }
+    }
     this.tilesRenderer.dispose();
+
+    // Clean up references
+    this.tilesSchedulingCB = null;
+    this._viewId = null;
   }
 
   /**
@@ -488,7 +523,7 @@ class OGC3DTilesLayer extends GeometryLayer {
 
     /** @type{number|null} */
     let batchId;
-    if (object.isPoints && index) {
+    if (object.isPoints && index != null) {
       batchId = object.geometry.getAttribute('_BATCHID')?.getX(index) ?? index;
     } else if (object.isMesh && face) {
       batchId = object.geometry.getAttribute('_BATCHID')?.getX(face.a) ?? instanceId;
@@ -554,7 +589,7 @@ class OGC3DTilesLayer extends GeometryLayer {
    *  1. tile (Object) - the JSON tile
    *  2. scene (THREE.Object3D | null) - The tile content. Contains a `batchTable` property. Can be null if the tile
    *  has not yet been loaded.
-  */
+   */
   forEachTile(callback) {
     this.tilesRenderer.traverse(tile => {
       callback(tile, tile.cached.scene);

package/lib/Main.js

@@ -1,5 +1,5 @@
 const conf = {
-  version: '2.45.2-next.3'
+  version: '2.45.2-next.5'
 };
 export const REVISION = conf.version;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itowns",
-  "version": "2.45.2-next.3",
+  "version": "2.45.2-next.5",
   "description": "A JS/WebGL framework for 3D geospatial data visualization",
   "type": "module",
   "main": "lib/Main.js",
@@ -51,7 +51,7 @@
     "url": "https://github.com/iTowns/itowns/issues"
   },
   "dependencies": {
-    "@itowns/geographic": "^2.45.2-next.3",
+    "@itowns/geographic": "^2.45.2-next.5",
     "@mapbox/vector-tile": "^2.0.3",
     "@maplibre/maplibre-gl-style-spec": "^23.1.0",
     "@tmcw/togeojson": "^7.0.0",