itowns 2.42.1-next.1 → 2.42.1-next.3

package/examples/entwine_simple_loader.html

@@ -51,10 +51,14 @@
 
                 view.camera3D.far = 2.0 * size.length();
 
-                var position = eptLayer.root.bbox.min.clone().add(size.multiply({ x: 0, y: 0, z: size.x / size.z }));
+                controls.groundLevel = eptLayer.root.bbox.min.z;
+                var position = eptLayer.root.bbox.min.clone().add(
+                    size.multiply({ x: 0, y: 0, z: size.x / size.z })
+                );
 
                 view.camera3D.position.copy(position);
                 view.camera3D.lookAt(lookAt);
+                view.camera3D.updateProjectionMatrix();
 
                 view.notifyChange(view.camera3D);
             }
@@ -77,8 +81,10 @@
                 eptSource = new itowns.EntwinePointTileSource({ url });
 
                 if (eptLayer) {
-                    view.removeLayer('ept');
+                    debugGUI.removeFolder(eptLayer.debugUI);
+                    view.removeLayer('Entwine Point Tile');
                     view.notifyChange();
+                    eptLayer.delete();
                 }
 
                 eptLayer = new itowns.EntwinePointTileLayer('Entwine Point Tile', {

package/lib/Core/3DTiles/C3DTFeature.js

@@ -7,6 +7,24 @@ exports.default = void 0;
 var _three = require("three");
 // eslint-disable-next-line no-unused-vars
 
+/**
+ * Finds the batch table of an object in a 3D Tiles layer. This is
+ * for instance needed when picking because we pick the geometric
+ * object which is not at the same level in the layer structure as
+ * the batch table.
+ * @param {THREE.Object3D} object - a 3D geometric object
+ * @returns {C3DTBatchTable|null} - the batch table of the object
+ */
+function findBatchTable(object) {
+  if (object.batchTable) {
+    return object.batchTable;
+  }
+  if (object.parent) {
+    return findBatchTable(object.parent);
+  }
+  return null;
+}
+
 /**
  * C3DTFeature is a feature of a 3DTiles
  *
@@ -14,23 +32,17 @@ var _three = require("three");
  * @param {number} tileId - tileId
  * @param {number} batchId - batch id
  * @param {Array<{start:number,count:number}>} groups - groups in geometry.attributes matching batchId
- * @param {object} info - info in the batchTable
  * @param {object} [userData] - some userData
  * @param {Object3D} object3d - object3d in which feature is present
  * @property {number} tileId - tile id
  * @property {Object3D} object3d - object3d in which feature is present
  * @property {number} batchId - batch id
  * @property {Array<{start:number,count:number}>} groups - groups in geometry.attributes matching batchId
- * @property {object} info - info in the batchTable
  * @property {object} [userData] - some userData
  */
 class C3DTFeature {
   #info;
-  constructor(tileId, batchId, groups, info, userData, object3d) {
-    if (!object3d) {
-      console.error('BREAKING CHANGE: C3DTFeature constructor changed from (tileId, batchId, groups, info, userData) to (tileId, batchId, groups, info, userData, object3d)');
-    }
-
+  constructor(tileId, batchId, groups, userData, object3d) {
     /** @type {Object3D} */
     this.object3d = object3d;
 
@@ -43,11 +55,11 @@ class C3DTFeature {
     /** @type {object} */
     this.userData = userData;
 
-    /** @type {object} */
-    this.#info = info;
-
     /** @type {number} */
     this.tileId = tileId;
+
+    // Lazy-loaded batch table information for this.batchId.
+    this.#info = null;
   }
 
   /**
@@ -85,10 +97,20 @@ class C3DTFeature {
   }
 
   /**
-   *
+   * Gets the information from the tile batch table for this C3DTFeature batch id.
    * @returns {object} - batchTable info
    */
   getInfo() {
+    if (this.#info) {
+      return this.#info;
+    }
+    const batchTable = findBatchTable(this.object3d);
+    if (!batchTable) {
+      console.warn(`[C3DTFeature]: No batch table found for tile ${this.tileId}.`);
+      return null; // or return undefined;
+    }
+
+    this.#info = batchTable.getInfoById(this.batchId);
     return this.#info;
   }
 }

package/lib/Layer/C3DTilesLayer.js

@@ -223,25 +223,6 @@ class C3DTilesLayer extends _GeometryLayer.default {
     }
   }
 
-  /**
-   * Finds the batch table of an object in a 3D Tiles layer. This is
-   * for instance needed when picking because we pick the geometric
-   * object which is not at the same level in the layer structure as
-   * the batch table. More details here on itowns internal
-   * organization of 3DTiles:
-   *  https://github.com/MEPP-team/RICT/blob/master/Doc/iTowns/Doc.md#itowns-internal-organisation-of-3d-tiles-data
-   * @param {THREE.Object3D} object - a 3D geometric object
-   * @returns {C3DTBatchTable} - the batch table of the object
-   */
-  findBatchTable(object) {
-    if (object.batchTable) {
-      return object.batchTable;
-    }
-    if (object.parent) {
-      return this.findBatchTable(object.parent);
-    }
-  }
-
   /**
    * Get the closest c3DTileFeature of an intersects array.
    * @param {Array} intersects - @return An array containing all
@@ -300,12 +281,8 @@ class C3DTilesLayer extends _GeometryLayer.default {
     this.tilesC3DTileFeatures.set(tileContent.tileId, new Map()); // initialize
     tileContent.traverse(child => {
       if (object3DHasFeature(child)) {
-        const batchTable = this.findBatchTable(child);
-        if (!batchTable) {
-          throw new Error('no batchTable');
-        }
-        const geometryAttributes = child.geometry.attributes;
-        let currentBatchId = geometryAttributes._BATCHID.array[0];
+        const batchIdAttribute = child.geometry.getAttribute('_BATCHID');
+        let currentBatchId = batchIdAttribute.getX(0);
         let start = 0;
         let count = 0;
         const registerBatchIdGroup = () => {
@@ -324,13 +301,18 @@ class C3DTilesLayer extends _GeometryLayer.default {
               count
             }],
             // initialize with current group
-            batchTable.getInfoById(currentBatchId), {}, child);
+            {}, child);
             this.tilesC3DTileFeatures.get(tileContent.tileId).set(currentBatchId, c3DTileFeature);
           }
         };
-        for (let index = 0; index < geometryAttributes.position.array.length; index += geometryAttributes.position.itemSize) {
-          const batchIndex = index / geometryAttributes.position.itemSize;
-          const batchId = geometryAttributes._BATCHID.array[batchIndex];
+
+        // TODO: Could be simplified by incrementing of 1 and stopping the iteration at positionAttributeSize.count
+        // See https://github.com/iTowns/itowns/pull/2266#discussion_r1483285122
+        const positionAttribute = child.geometry.getAttribute('position');
+        const positionAttributeSize = positionAttribute.count * positionAttribute.itemSize;
+        for (let index = 0; index < positionAttributeSize; index += positionAttribute.itemSize) {
+          const batchIndex = index / positionAttribute.itemSize;
+          const batchId = batchIdAttribute.getX(batchIndex);
 
           // check if batchId is currentBatchId
           if (currentBatchId !== batchId) {
@@ -346,7 +328,7 @@ class C3DTilesLayer extends _GeometryLayer.default {
           count++;
 
           // check if end of the array
-          if (index + geometryAttributes.position.itemSize >= geometryAttributes.position.array.length) {
+          if (index + positionAttribute.itemSize >= positionAttributeSize) {
             registerBatchIdGroup();
           }
         }

package/package.json

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