itowns 2.44.3-next.32 → 2.44.3-next.33

package/lib/Core/Prefab/TileBuilder.js

@@ -33,20 +33,24 @@ export function newTileGeometry(builder, params) {
     // Read previously cached values (index and uv.wgs84 only
     // depend on the # of triangles)
     let cachedBuffers = cacheBuffer.get(bufferKey);
-    params.buildIndexAndUv_0 = !cachedBuffers;
     let buffers;
     try {
-      buffers = computeBuffers(builder, params);
+      buffers = computeBuffers(builder, params, cachedBuffers !== undefined ? {
+        index: cachedBuffers.index.array,
+        uv: cachedBuffers.uv.array
+      } : undefined);
     } catch (e) {
       return Promise.reject(e);
     }
     if (!cachedBuffers) {
-      cachedBuffers = {};
       // We know the fields will exist due to the condition
       // matching with the one for buildIndexAndUv_0.
       // TODO: Make this brain-based check compiler-based.
-      cachedBuffers.index = new THREE.BufferAttribute(buffers.index, 1);
-      cachedBuffers.uv = new THREE.BufferAttribute(buffers.uvs[0], 2);
+
+      cachedBuffers = {
+        index: new THREE.BufferAttribute(buffers.index, 1),
+        uv: new THREE.BufferAttribute(buffers.uvs[0], 2)
+      };
 
       // Update cacheBuffer
       cacheBuffer.set(bufferKey, cachedBuffers);

package/lib/Core/Prefab/computeBufferTileGeometry.js

@@ -16,14 +16,17 @@ function getUintArrayConstructor(highestValue) {
   }
   return picked;
 }
-function allocateIndexBuffer(nVertex, nSeg, params) {
-  if (!params.buildIndexAndUv_0) {
-    return undefined;
-  }
+function allocateIndexBuffer(nVertex, nSeg, params, cache) {
   const indexBufferSize = getBufferIndexSize(nSeg, params.disableSkirt);
   const indexConstructor = getUintArrayConstructor(nVertex);
   const tileLen = indexBufferSize;
   const skirtLen = 4 * nSeg;
+  if (cache !== undefined) {
+    return {
+      index: cache,
+      skirt: cache.subarray(tileLen, tileLen + skirtLen)
+    };
+  }
   const indexBuffer = new ArrayBuffer((
   // Tile
   tileLen
@@ -36,11 +39,11 @@ function allocateIndexBuffer(nVertex, nSeg, params) {
     skirt
   };
 }
-function allocateBuffers(nVertex, nSeg, builder, params) {
+function allocateBuffers(nVertex, nSeg, builder, params, cache) {
   const {
     index,
     skirt
-  } = allocateIndexBuffer(nVertex, nSeg, params) ?? {};
+  } = allocateIndexBuffer(nVertex, nSeg, params, cache?.index);
   return {
     index,
     skirt,
@@ -62,7 +65,7 @@ function allocateBuffers(nVertex, nSeg, builder, params) {
     //      +-------------------------+
     //        * u = wgs84.u
     //        * v = textureid + v in builder texture
-    uvs: [params.buildIndexAndUv_0 ? new Float32Array(nVertex * 2) : undefined, builder.computeExtraOffset !== undefined ? new Float32Array(nVertex) : undefined]
+    uvs: [cache?.uv ?? new Float32Array(nVertex * 2), builder.computeExtraOffset !== undefined ? new Float32Array(nVertex) : undefined]
   };
 }
 function computeUv0(uv, id, u, v) {
@@ -76,7 +79,7 @@ function initComputeUv1(value) {
 }
 /** Compute buffers describing a tile according to a builder and its params. */
 // TODO: Split this even further into subfunctions
-export function computeBuffers(builder, params) {
+export function computeBuffers(builder, params, cache) {
   //     n seg, n+1 vert    + <- skirt, n verts per side
   //    <---------------> / |
   //    +---+---+---+---+   |
@@ -98,8 +101,8 @@ export function computeBuffers(builder, params) {
   if (nTotalVertex > 2 ** 32) {
     throw new Error('Tile segments count is too big');
   }
-  const outBuffers = allocateBuffers(nTotalVertex, nSeg, builder, params);
-  const computeUvs = [params.buildIndexAndUv_0 ? computeUv0 : () => {}];
+  const outBuffers = allocateBuffers(nTotalVertex, nSeg, builder, params, cache);
+  const computeUvs = [cache === undefined ? computeUv0 : () => {}];
   params = builder.prepare(params);
   for (let y = 0; y <= nSeg; y++) {
     const v = y / nSeg;
@@ -135,7 +138,7 @@ export function computeBuffers(builder, params) {
   }
 
   // Fill skirt index buffer
-  if (params.buildIndexAndUv_0 && !params.disableSkirt) {
+  if (cache === undefined && !params.disableSkirt) {
     for (let x = 0; x < nVertex; x++) {
       //   -------->
       //   0---1---2
@@ -174,7 +177,7 @@ export function computeBuffers(builder, params) {
     outBuffers.index[id + 1] = vb;
     outBuffers.index[id + 2] = vc;
   }
-  if (params.buildIndexAndUv_0) {
+  if (cache === undefined) {
     for (let y = 0; y < nSeg; y++) {
       for (let x = 0; x < nSeg; x++) {
         const v1 = y * nVertex + (x + 1);
@@ -192,11 +195,11 @@ export function computeBuffers(builder, params) {
   // INFO: The size of the skirt is now a ratio of the size of the tile.
   // To be perfect it should depend on the real elevation delta but too heavy
   // to compute
-  if (params.buildIndexAndUv_0 && !params.disableSkirt) {
+  if (!params.disableSkirt) {
     // We compute the actual size of tile segment to use later for
     // the skirt.
     const segmentSize = new THREE.Vector3().fromArray(outBuffers.position).distanceTo(new THREE.Vector3().fromArray(outBuffers.position, 3));
-    const buildSkirt = {
+    const buildSkirt = cache === undefined ? {
       index: (id, v1, v2, v3, v4) => {
         bufferizeTri(id, v1, v2, v3);
         bufferizeTri(id + 3, v1, v3, v4);
@@ -206,6 +209,9 @@ export function computeBuffers(builder, params) {
         buf[idTo * 2 + 0] = buf[idFrom * 2 + 0];
         buf[idTo * 2 + 1] = buf[idFrom * 2 + 1];
       }
+    } : {
+      index: () => {},
+      uv: () => {}
     };
 
     // Alias for readability

package/lib/Layer/OGC3DTilesLayer.js

@@ -141,24 +141,39 @@ class OGC3DTilesLayer extends GeometryLayer {
    * @param {String} id - unique layer id.
    * @param {Object} config - layer specific configuration
    * @param {OGC3DTilesSource} config.source - data source configuration
-   * @param {String} [config.pntsMode= PNTS_MODE.COLOR] Point cloud coloring mode (passed to {@link PointsMaterial}).
+   * @param {String} [config.pntsMode = PNTS_MODE.COLOR] Point cloud coloring mode (passed to {@link PointsMaterial}).
    *      Only 'COLOR' or 'CLASSIFICATION' are possible. COLOR uses RGB colors of the points,
    *      CLASSIFICATION uses a classification property of the batch table to color points.
-   * @param {ClassificationScheme}  [config.classificationScheme]  {@link PointsMaterial} classification scheme
-   * @param {String} [config.pntsShape= PNTS_SHAPE.CIRCLE] Point cloud point shape. Only 'CIRCLE' or 'SQUARE' are possible.
+   * @param {ClassificationScheme}  [config.classificationScheme = ClassificationScheme.DEFAULT]  {@link PointsMaterial} classification scheme
+   * @param {String} [config.pntsShape = PNTS_SHAPE.CIRCLE] Point cloud point shape. Only 'CIRCLE' or 'SQUARE' are possible.
    * (passed to {@link PointsMaterial}).
-   * @param {String} [config.pntsSizeMode= PNTS_SIZE_MODE.VALUE] {@link PointsMaterial} Point cloud size mode (passed to {@link PointsMaterial}).
+   * @param {String} [config.pntsSizeMode = PNTS_SIZE_MODE.VALUE] {@link PointsMaterial} Point cloud size mode (passed to {@link PointsMaterial}).
    * Only 'VALUE' or 'ATTENUATED' are possible. VALUE use constant size, ATTENUATED compute size depending on distance
    * from point to camera.
-   * @param {Number} [config.pntsMinAttenuatedSize=3] Minimum scale used by 'ATTENUATED' size mode.
-   * @param {Number} [config.pntsMaxAttenuatedSize=10] Maximum scale used by 'ATTENUATED' size mode.
+   * @param {Number} [config.pntsMinAttenuatedSize = 3] Minimum scale used by 'ATTENUATED' size mode.
+   * @param {Number} [config.pntsMaxAttenuatedSize = 10] Maximum scale used by 'ATTENUATED' size mode.
    */
   constructor(id, config) {
-    super(id, new THREE.Group(), {
-      source: config.source
-    });
+    const {
+      pntsMode = PNTS_MODE.COLOR,
+      pntsShape = PNTS_SHAPE.CIRCLE,
+      classification = ClassificationScheme.DEFAULT,
+      pntsSizeMode = PNTS_SIZE_MODE.VALUE,
+      pntsMinAttenuatedSize = 3,
+      pntsMaxAttenuatedSize = 10,
+      ...geometryLayerConfig
+    } = config;
+    super(id, new THREE.Group(), geometryLayerConfig);
     this.isOGC3DTilesLayer = true;
-    this._handlePointsMaterialConfig(config);
+    // Store points material config so they can be used later to substitute points tiles material
+    // by our own PointsMaterial. These properties should eventually be managed through the Style API
+    // (see https://github.com/iTowns/itowns/issues/2336)
+    this.pntsMode = pntsMode;
+    this.pntsShape = pntsShape;
+    this.classification = classification;
+    this.pntsSizeMode = pntsSizeMode;
+    this.pntsMinAttenuatedSize = pntsMinAttenuatedSize;
+    this.pntsMaxAttenuatedSize = pntsMaxAttenuatedSize;
     this.tilesRenderer = new TilesRenderer(this.source.url);
     if (config.source.isOGC3DTilesIonSource) {
       this.tilesRenderer.registerPlugin(new CesiumIonAuthPlugin({
@@ -197,21 +212,6 @@ class OGC3DTilesLayer extends GeometryLayer {
     }
   }
 
-  /**
-   * Store points material config so they can be used later to substitute points tiles material by our own PointsMaterial
-   * These properties should eventually be managed through the Style API (see https://github.com/iTowns/itowns/issues/2336)
-   * @param {Object} config - points material configuration as passed to the layer constructor.
-   * @private
-   */
-  _handlePointsMaterialConfig(config) {
-    this.pntsMode = config.pntsMode ?? PNTS_MODE.COLOR;
-    this.pntsShape = config.pntsShape ?? PNTS_SHAPE.CIRCLE;
-    this.classification = config.classification ?? ClassificationScheme.DEFAULT;
-    this.pntsSizeMode = config.pntsSizeMode ?? PNTS_SIZE_MODE.VALUE;
-    this.pntsMinAttenuatedSize = config.pntsMinAttenuatedSize || 3;
-    this.pntsMaxAttenuatedSize = config.pntsMaxAttenuatedSize || 10;
-  }
-
   /**
    * Sets the lruCache and download and parse queues so they are shared amongst
    * all tilesets from a same {@link View} view.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itowns",
-  "version": "2.44.3-next.32",
+  "version": "2.44.3-next.33",
   "description": "A JS/WebGL framework for 3D geospatial data visualization",
   "type": "module",
   "main": "lib/Main.js",