itowns 2.45.2-next.2 → 2.45.2-next.4

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.2'
+  version: '2.45.2-next.4'
 };
 export const REVISION = conf.version;
 

package/lib/Renderer/LayeredMaterial.d.ts

@@ -44,8 +44,10 @@ interface LayeredMaterialRawUniforms {
     opacity: number;
     lightingEnabled: boolean;
     lightPosition: THREE.Vector3;
-    fogDistance: number;
+    fogNear: number;
+    fogFar: number;
     fogColor: THREE.Color;
+    fogDensity: number;
     overlayAlpha: number;
     overlayColor: THREE.Color;
     objectId: number;
@@ -75,7 +77,6 @@ type RenderModeDefines = DefineMapping<'MODE', typeof RenderMode.MODES>;
 type LayeredMaterialDefines = {
     NUM_VS_TEXTURES: number;
     NUM_FS_TEXTURES: number;
-    USE_FOG: number;
     NUM_CRS: number;
     DEBUG: number;
     MODE: number;

package/lib/Renderer/LayeredMaterial.js

@@ -2,7 +2,7 @@ import * as THREE from 'three';
 /* babel-plugin-inline-import './Shader/TileVS.glsl' */
 const TileVS = "#include <itowns/precision_qualifier>\n#include <common>\n#include <itowns/elevation_pars_vertex>\n#include <logdepthbuf_pars_vertex>\n#if NUM_CRS > 1\nattribute float     uv_1;\n#endif\n\nuniform bool lightingEnabled;\nvarying vec2 vHighPrecisionZW;\n\n#if MODE == MODE_FINAL\n#include <fog_pars_vertex>\nvarying vec3        vUv;\nvarying vec3        vNormal;\n#endif\nvoid main() {\n        #include <begin_vertex>\n        #include <itowns/elevation_vertex>\n        #include <itowns/geoid_vertex>\n        #include <project_vertex>\n        #include <logdepthbuf_vertex>\n        vHighPrecisionZW = gl_Position.zw;\n#if MODE == MODE_FINAL\n        #include <fog_vertex>\n        #if NUM_CRS > 1\n        vUv = vec3(uv, (uv_1 > 0.) ? uv_1 : uv.y); // set uv_1 = uv if uv_1 is undefined\n        #else\n        vUv = vec3(uv, 0.0);\n        #endif\n        vNormal = normalize ( mat3( modelMatrix[0].xyz, modelMatrix[1].xyz, modelMatrix[2].xyz ) * normal );\n#endif\n}\n";
 /* babel-plugin-inline-import './Shader/TileFS.glsl' */
-const TileFS = "#include <itowns/precision_qualifier>\n#include <logdepthbuf_pars_fragment>\n#include <itowns/pitUV>\n#include <itowns/color_layers_pars_fragment>\n#if MODE == MODE_FINAL\n#include <itowns/fog_pars_fragment>\n#include <itowns/overlay_pars_fragment>\n#include <itowns/lighting_pars_fragment>\n#endif\n#include <itowns/mode_pars_fragment>\n\nuniform vec3        diffuse;\nuniform float       opacity;\nvarying vec3        vUv; // uv.x/uv_1.x, uv.y, uv_1.y\nvarying vec2        vHighPrecisionZW;\n\nvoid main() {\n    #include <logdepthbuf_fragment>\n\n#if MODE == MODE_ID\n\n    #include <itowns/mode_id_fragment>\n\n#elif MODE == MODE_DEPTH\n\n    #include <itowns/mode_depth_fragment>\n\n#else\n\n    gl_FragColor = vec4(diffuse, opacity);\n\n    uvs[0] = vec3(vUv.xy, 0.);\n\n#if NUM_CRS > 1\n    uvs[1] = vec3(vUv.x, fract(vUv.z), floor(vUv.z));\n#endif\n\n    vec4 color;\n    #pragma unroll_loop\n    for ( int i = 0; i < NUM_FS_TEXTURES; i ++ ) {\n        color = getLayerColor( i , colorTextures[ i ], colorOffsetScales[ i ], colorLayers[ i ]);\n        gl_FragColor.rgb = mix(gl_FragColor.rgb, color.rgb, color.a);\n    }\n\n  #if DEBUG == 1\n    if (showOutline) {\n        #pragma unroll_loop\n        for ( int i = 0; i < NUM_CRS; i ++) {\n            color = getOutlineColor( outlineColors[ i ], uvs[ i ].xy);\n            gl_FragColor.rgb = mix(gl_FragColor.rgb, color.rgb, color.a);\n        }\n    }\n  #endif\n\n    #include <itowns/fog_fragment>\n    #include <itowns/lighting_fragment>\n    #include <itowns/overlay_fragment>\n\n#endif\n}\n";
+const TileFS = "#include <itowns/precision_qualifier>\n#include <logdepthbuf_pars_fragment>\n#include <itowns/pitUV>\n#include <itowns/color_layers_pars_fragment>\n#if MODE == MODE_FINAL\n#include <fog_pars_fragment>\n#include <itowns/overlay_pars_fragment>\n#include <itowns/lighting_pars_fragment>\n#endif\n#include <itowns/mode_pars_fragment>\n\nuniform vec3        diffuse;\nuniform float       opacity;\nvarying vec3        vUv; // uv.x/uv_1.x, uv.y, uv_1.y\nvarying vec2        vHighPrecisionZW;\n\nvoid main() {\n    #include <logdepthbuf_fragment>\n\n#if MODE == MODE_ID\n\n    #include <itowns/mode_id_fragment>\n\n#elif MODE == MODE_DEPTH\n\n    #include <itowns/mode_depth_fragment>\n\n#else\n\n    gl_FragColor = vec4(diffuse, opacity);\n\n    uvs[0] = vec3(vUv.xy, 0.);\n\n#if NUM_CRS > 1\n    uvs[1] = vec3(vUv.x, fract(vUv.z), floor(vUv.z));\n#endif\n\n    vec4 color;\n    #pragma unroll_loop\n    for ( int i = 0; i < NUM_FS_TEXTURES; i ++ ) {\n        color = getLayerColor( i , colorTextures[ i ], colorOffsetScales[ i ], colorLayers[ i ]);\n        gl_FragColor.rgb = mix(gl_FragColor.rgb, color.rgb, color.a);\n    }\n\n  #if DEBUG == 1\n    if (showOutline) {\n        #pragma unroll_loop\n        for ( int i = 0; i < NUM_CRS; i ++) {\n            color = getOutlineColor( outlineColors[ i ], uvs[ i ].xy);\n            gl_FragColor.rgb = mix(gl_FragColor.rgb, color.rgb, color.a);\n        }\n    }\n  #endif\n\n    #include <fog_fragment>\n    #include <itowns/lighting_fragment>\n    #include <itowns/overlay_fragment>\n\n#endif\n}\n";
 import ShaderUtils from "./Shader/ShaderUtils.js";
 import Capabilities from "../Core/System/Capabilities.js";
 import RenderMode from "./RenderMode.js";
@@ -123,14 +123,13 @@ export class LayeredMaterial extends THREE.ShaderMaterial {
     const defines = {};
     fillInProp(defines, 'NUM_VS_TEXTURES', nbSamplers[0]);
     fillInProp(defines, 'NUM_FS_TEXTURES', nbSamplers[1]);
-    // TODO: We do not use the fog from the scene, is this a desired
-    // behavior?
-    fillInProp(defines, 'USE_FOG', 1);
     fillInProp(defines, 'NUM_CRS', crsCount);
     initModeDefines(defines);
     fillInProp(defines, 'MODE', RenderMode.MODES.FINAL);
     fillInProp(defines, 'DEBUG', +false);
     this.defines = defines;
+    this.fog = true; // receive the fog defined on the scene, if any
+
     this.vertexShader = TileVS;
     // three loop unrolling of ShaderMaterial only supports integer bounds,
     // see https://github.com/mrdoob/three.js/issues/28020
@@ -144,8 +143,10 @@ export class LayeredMaterial extends THREE.ShaderMaterial {
       lightingEnabled: false,
       lightPosition: new THREE.Vector3(-0.5, 0.0, 1.0),
       // Misc properties
-      fogDistance: 1000000000.0,
+      fogNear: 1,
+      fogFar: 1000,
       fogColor: new THREE.Color(0.76, 0.85, 1.0),
+      fogDensity: 0.00025,
       overlayAlpha: 0,
       overlayColor: new THREE.Color(1.0, 0.3, 0.0),
       objectId: 0,

package/lib/Renderer/Shader/ShaderChunk.js

@@ -7,10 +7,6 @@ const elevation_pars_vertex = "#if NUM_VS_TEXTURES > 0\n    struct Layer {\n
 const elevation_vertex = "#if NUM_VS_TEXTURES > 0\n    if(elevationTextureCount > 0) {\n        float elevation = getElevation(uv, elevationTextures[0], elevationOffsetScales[0], elevationLayers[0]);\n        transformed += elevation * normal;\n    }\n#endif\n";
 /* babel-plugin-inline-import './Chunk/geoid_vertex.glsl' */
 const geoid_vertex = "transformed += geoidHeight * normal;\n";
-/* babel-plugin-inline-import './Chunk/fog_fragment.glsl' */
-const fog_fragment = "#if defined(USE_FOG)\n    float fogFactor = 1. - min( exp(-vFogDepth / fogDistance), 1.);\n    gl_FragColor.rgb = mix(gl_FragColor.rgb, fogColor, fogFactor);\n#endif\n";
-/* babel-plugin-inline-import './Chunk/fog_pars_fragment.glsl' */
-const fog_pars_fragment = "#if defined(USE_FOG)\nuniform vec3  fogColor;\nuniform float fogDistance;\nvarying float vFogDepth;\n#endif\n";
 /* babel-plugin-inline-import './Chunk/lighting_fragment.glsl' */
 const lighting_fragment = "if (lightingEnabled) {\n    float light = min(2. * dot(vNormal, lightPosition), 1.);\n    gl_FragColor.rgb *= light;\n}\n";
 /* babel-plugin-inline-import './Chunk/lighting_pars_fragment.glsl' */
@@ -44,8 +40,6 @@ const itownsShaderChunk = {
   elevation_pars_vertex,
   elevation_vertex,
   geoid_vertex,
-  fog_fragment,
-  fog_pars_fragment,
   lighting_fragment,
   lighting_pars_fragment,
   mode_depth_fragment,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itowns",
-  "version": "2.45.2-next.2",
+  "version": "2.45.2-next.4",
   "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.2",
+    "@itowns/geographic": "^2.45.2-next.4",
     "@mapbox/vector-tile": "^2.0.3",
     "@maplibre/maplibre-gl-style-spec": "^23.1.0",
     "@tmcw/togeojson": "^7.0.0",