itowns 2.44.3-next.22 → 2.44.3-next.24

package/lib/Layer/PotreeLayer.js

@@ -10,13 +10,13 @@ bboxMesh.geometry.boundingBox = box3;
  * @property {boolean} isPotreeLayer - Used to checkout whether this layer
  * is a PotreeLayer. Default is `true`. You should not change this, as it is
  * used internally for optimisation.
+ *
+ * @extends PointCloudLayer
  */
 class PotreeLayer extends PointCloudLayer {
   /**
    * Constructs a new instance of Potree layer.
    *
-   * @extends PointCloudLayer
-   *
    * @example
    * // Create a new point cloud layer
    * const points = new PotreeLayer('points',
@@ -37,12 +37,17 @@ class PotreeLayer extends PointCloudLayer {
    * contains three elements `name, protocol, extent`, these elements will be
    * available using `layer.name` or something else depending on the property
    * name. See the list of properties to know which one can be specified.
-   * @param {string} [config.crs=ESPG:4326] - The CRS of the {@link View} this
+   * @param {string} [config.crs='ESPG:4326'] - The CRS of the {@link View} this
    * layer will be attached to. This is used to determine the extent of this
    * layer.  Default to `EPSG:4326`.
    */
   constructor(id, config) {
     super(id, config);
+
+    /**
+     * @type {boolean}
+     * @readonly
+     */
     this.isPotreeLayer = true;
     const resolve = this.addInitializationStep();
     this.source.whenReady.then(cloud => {

package/lib/Layer/RasterLayer.js

@@ -4,8 +4,18 @@ import textureConverter from "../Converter/textureConverter.js";
 import { CACHE_POLICIES } from "../Core/Scheduler/Cache.js";
 class RasterLayer extends Layer {
   constructor(id, config) {
-    config.cacheLifeTime = config.cacheLifeTime ?? CACHE_POLICIES.TEXTURE;
-    super(id, config);
+    const {
+      cacheLifeTime = CACHE_POLICIES.TEXTURE,
+      minFilter,
+      magFilter,
+      ...layerConfig
+    } = config;
+    super(id, {
+      ...layerConfig,
+      cacheLifeTime
+    });
+    this.minFilter = minFilter;
+    this.magFilter = magFilter;
   }
   convert(data, extentDestination) {
     return textureConverter.convert(data, extentDestination, this);

package/lib/Layer/TiledGeometryLayer.js

@@ -16,6 +16,8 @@ const boundingSphereCenter = new THREE.Vector3();
  * as it is used internally for optimisation.
  * @property {boolean} hideSkirt (default false) - Used to hide the skirt (tile borders).
  * Useful when the layer opacity < 1
+ *
+ * @extends GeometryLayer
  */
 class TiledGeometryLayer extends GeometryLayer {
   /**
@@ -38,12 +40,10 @@ class TiledGeometryLayer extends GeometryLayer {
    * It corresponds at meters by pixel. If the projection tile exceeds a certain pixel size (on screen)
    * then it is subdivided into 4 tiles with a zoom greater than 1.
    *
-   * @extends GeometryLayer
-   *
    * @param {string} id - The id of the layer, that should be unique. It is
    * not mandatory, but an error will be emitted if this layer is added a
    * {@link View} that already has a layer going by that id.
-   * @param {THREE.Object3d} object3d - The object3d used to contain the
+   * @param {THREE.Object3D} object3d - The object3d used to contain the
    * geometry of the TiledGeometryLayer. It is usually a `THREE.Group`, but it
    * can be anything inheriting from a `THREE.Object3d`.
    * @param {Array} schemeTile - extents Array of root tiles
@@ -58,16 +58,63 @@ class TiledGeometryLayer extends GeometryLayer {
    * @throws {Error} `object3d` must be a valid `THREE.Object3d`.
    */
   constructor(id, object3d, schemeTile, builder, config) {
-    // cacheLifeTime = CACHE_POLICIES.INFINITE because the cache is handled by the builder
-    config.cacheLifeTime = CACHE_POLICIES.INFINITE;
-    config.source = false;
-    super(id, object3d, config);
+    const {
+      sseSubdivisionThreshold = 1.0,
+      minSubdivisionLevel,
+      maxSubdivisionLevel,
+      maxDeltaElevationLevel,
+      tileMatrixSets,
+      diffuse,
+      showOutline = false,
+      segments,
+      disableSkirt = false,
+      materialOptions,
+      ...configGeometryLayer
+    } = config;
+    super(id, object3d, {
+      ...configGeometryLayer,
+      // cacheLifeTime = CACHE_POLICIES.INFINITE because the cache is handled by the builder
+      cacheLifeTime: CACHE_POLICIES.INFINITE,
+      source: false
+    });
+
+    /**
+     * @type {boolean}
+     * @readonly
+     */
     this.isTiledGeometryLayer = true;
+    this.protocol = 'tile';
+
     // TODO : this should be add in a preprocess method specific to GeoidLayer.
     this.object3d.geoidHeight = 0;
-    this.protocol = 'tile';
+
+    /**
+     * @type {boolean}
+     */
+    this.disableSkirt = disableSkirt;
     this._hideSkirt = !!config.hideSkirt;
-    this.sseSubdivisionThreshold = this.sseSubdivisionThreshold || 1.0;
+
+    /**
+     * @type {number}
+     */
+    this.sseSubdivisionThreshold = sseSubdivisionThreshold;
+
+    /**
+     * @type {number}
+     */
+    this.minSubdivisionLevel = minSubdivisionLevel;
+
+    /**
+     * @type {number}
+     */
+    this.maxSubdivisionLevel = maxSubdivisionLevel;
+
+    /**
+     * @type {number}
+     * @deprecated
+     */
+    this.maxDeltaElevationLevel = maxDeltaElevationLevel;
+    this.segments = segments;
     this.schemeTile = schemeTile;
     this.builder = builder;
     this.info = new InfoTiledGeometryLayer(this);
@@ -77,9 +124,19 @@ class TiledGeometryLayer extends GeometryLayer {
     if (!this.builder) {
       throw new Error(`Cannot init tiled layer without builder for layer ${this.id}`);
     }
-    if (config.maxDeltaElevationLevel) {
-      console.warn('Config using maxDeltaElevationLevel is deprecated. The parameter maxDeltaElevationLevel is not longer used');
-    }
+    this.maxScreenSizeNode = this.sseSubdivisionThreshold * (this.sizeDiagonalTexture * 2);
+    this.tileMatrixSets = tileMatrixSets;
+    this.materialOptions = materialOptions;
+
+    /*
+     * @type {boolean}
+     */
+    this.showOutline = showOutline;
+
+    /**
+     * @type {THREE.Vector3 | undefined}
+     */
+    this.diffuse = diffuse;
     this.level0Nodes = [];
     const promises = [];
     for (const root of this.schemeTile) {
@@ -90,7 +147,6 @@ class TiledGeometryLayer extends GeometryLayer {
       this.object3d.add(...level0s);
       this.object3d.updateMatrixWorld();
     }));
-    this.maxScreenSizeNode = this.sseSubdivisionThreshold * (this.sizeDiagonalTexture * 2);
   }
   get hideSkirt() {
     return this._hideSkirt;

package/lib/Provider/Fetcher.js

@@ -102,7 +102,11 @@ export default {
       res = resolve;
       rej = reject;
     });
-    textureLoader.load(url, res, () => {}, rej);
+    textureLoader.load(url, res, () => {}, event => {
+      const error = new Error(`Failed to load texture from URL: \`${url}\``);
+      error.originalEvent = event;
+      rej(error);
+    });
     return promise;
   },
   /**

package/lib/Renderer/OBB.js

@@ -1,12 +1,11 @@
 import * as THREE from 'three';
 import * as CRS from "../Core/Geographic/Crs.js";
-import TileGeometry from "../Core/TileGeometry.js";
-import BuilderEllipsoidTile from "../Core/Prefab/Globe/BuilderEllipsoidTile.js";
+import { TileGeometry } from "../Core/TileGeometry.js";
+import { GlobeTileBuilder } from "../Core/Prefab/Globe/GlobeTileBuilder.js";
 import Coordinates from "../Core/Geographic/Coordinates.js";
 
 // get oriented bounding box of tile
-const builder = new BuilderEllipsoidTile({
-  crs: 'EPSG:4978',
+const builder = new GlobeTileBuilder({
   uvCount: 1
 });
 const size = new THREE.Vector3();
@@ -114,18 +113,17 @@ class OBB extends THREE.Object3D {
     let maxHeight = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : extent.max || 0;
     if (extent.crs == 'EPSG:4326') {
       const {
-        sharableExtent,
+        shareableExtent,
         quaternion,
         position
-      } = builder.computeSharableExtent(extent);
+      } = builder.computeShareableExtent(extent);
       // Compute the minimum count of segment to build tile
-      const segments = Math.max(Math.floor(sharableExtent.planarDimensions(dimension).x / 90 + 1), 2);
-      const geometry = new TileGeometry({
-        extent: sharableExtent,
+      const segments = Math.max(Math.floor(shareableExtent.planarDimensions(dimension).x / 90 + 1), 2);
+      const geometry = new TileGeometry(builder, {
+        extent: shareableExtent,
         level: 0,
         segments,
-        disableSkirt: true,
-        builder
+        disableSkirt: true
       });
       obb.box3D.copy(geometry.boundingBox);
       obb.natBox.copy(geometry.boundingBox);

package/package.json

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

package/lib/Core/Prefab/Globe/BuilderEllipsoidTile.js

@@ -1,110 +0,0 @@
-import * as THREE from 'three';
-import Coordinates from "../../Geographic/Coordinates.js";
-import Extent from "../../Geographic/Extent.js";
-const PI_OV_FOUR = Math.PI / 4;
-const INV_TWO_PI = 1.0 / (Math.PI * 2);
-const axisZ = new THREE.Vector3(0, 0, 1);
-const axisY = new THREE.Vector3(0, 1, 0);
-const quatToAlignLongitude = new THREE.Quaternion();
-const quatToAlignLatitude = new THREE.Quaternion();
-const quatNormalToZ = new THREE.Quaternion();
-function WGS84ToOneSubY(latitude) {
-  return 1.0 - (0.5 - Math.log(Math.tan(PI_OV_FOUR + THREE.MathUtils.degToRad(latitude) * 0.5)) * INV_TWO_PI);
-}
-class BuilderEllipsoidTile {
-  constructor() {
-    let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    this.tmp = {
-      coords: [new Coordinates('EPSG:4326', 0, 0), new Coordinates('EPSG:4326', 0, 0)],
-      position: new THREE.Vector3(),
-      dimension: new THREE.Vector2()
-    };
-    this.crs = options.crs;
-    // Order crs projection on tiles
-    this.uvCount = options.uvCount;
-    this.computeUvs = [
-    // Normalized coordinates (from degree) on the entire tile
-    // EPSG:4326
-    () => {},
-    // Float row coordinate from Pseudo mercator coordinates
-    // EPSG:3857
-    params => {
-      const t = WGS84ToOneSubY(params.projected.latitude) * params.nbRow;
-      return (!isFinite(t) ? 0 : t) - params.deltaUV1;
-    }];
-  }
-  // prepare params
-  // init projected object -> params.projected
-  prepare(params) {
-    params.nbRow = 2 ** (params.level + 1.0);
-    let st1 = WGS84ToOneSubY(params.extent.south);
-    if (!isFinite(st1)) {
-      st1 = 0;
-    }
-    const sizeTexture = 1.0 / params.nbRow;
-    const start = st1 % sizeTexture;
-    params.deltaUV1 = (st1 - start) * params.nbRow;
-
-    // transformation to align tile's normal to z axis
-    params.quatNormalToZ = quatNormalToZ.setFromAxisAngle(axisY, -(Math.PI * 0.5 - THREE.MathUtils.degToRad(params.extent.center().latitude)));
-
-    // let's avoid building too much temp objects
-    params.projected = {
-      longitude: 0,
-      latitude: 0
-    };
-    params.extent.planarDimensions(this.tmp.dimension);
-  }
-
-  // get center tile in cartesian 3D
-  center(extent) {
-    return extent.center(this.tmp.coords[0]).as(this.crs, this.tmp.coords[1]).toVector3();
-  }
-
-  // get position 3D cartesian
-  vertexPosition(params) {
-    this.tmp.coords[0].setFromValues(params.projected.longitude, params.projected.latitude);
-    this.tmp.coords[0].as(this.crs, this.tmp.coords[1]).toVector3(this.tmp.position);
-    return this.tmp.position;
-  }
-
-  // get normal for last vertex
-  vertexNormal() {
-    return this.tmp.coords[1].geodesicNormal;
-  }
-
-  // coord u tile to projected
-  uProjecte(u, params) {
-    params.projected.longitude = params.extent.west + u * this.tmp.dimension.x;
-  }
-
-  // coord v tile to projected
-  vProjecte(v, params) {
-    params.projected.latitude = params.extent.south + v * this.tmp.dimension.y;
-  }
-  computeSharableExtent(extent) {
-    // Compute sharable extent to pool the geometries
-    // the geometry in common extent is identical to the existing input
-    // with a transformation (translation, rotation)
-
-    // TODO: It should be possible to use equatorial plan symetrie,
-    // but we should be reverse UV on tile
-    // Common geometry is looking for only on longitude
-    const sizeLongitude = Math.abs(extent.west - extent.east) / 2;
-    const sharableExtent = new Extent(extent.crs, -sizeLongitude, sizeLongitude, extent.south, extent.north);
-
-    // compute rotation to transform tile to position it on ellipsoid
-    // this transformation take into account the transformation of the parents
-    const rotLon = THREE.MathUtils.degToRad(extent.west - sharableExtent.west);
-    const rotLat = THREE.MathUtils.degToRad(90 - extent.center(this.tmp.coords[0]).latitude);
-    quatToAlignLongitude.setFromAxisAngle(axisZ, rotLon);
-    quatToAlignLatitude.setFromAxisAngle(axisY, rotLat);
-    quatToAlignLongitude.multiply(quatToAlignLatitude);
-    return {
-      sharableExtent,
-      quaternion: quatToAlignLongitude.clone(),
-      position: this.center(extent)
-    };
-  }
-}
-export default BuilderEllipsoidTile;