itowns 2.44.3-next.9 → 2.45.1-next.0

package/lib/Core/Prefab/computeBufferTileGeometry.js

@@ -1,183 +0,0 @@
-import * as THREE from 'three';
-export function getBufferIndexSize(segments, noSkirt) {
-  const triangles = segments * segments * 2 + (noSkirt ? 0 : 4 * segments * 2);
-  return triangles * 3;
-}
-export default function computeBuffers(params) {
-  // Create output buffers.
-  const outBuffers = {
-    index: null,
-    position: null,
-    normal: null,
-    // 2 UV set per tile: wgs84 (uv[0]) and pm (uv[1])
-    //    - wgs84: 1 texture per tile because tiles are using wgs84 projection
-    //    - pm: use multiple textures per tile.
-    //      +-------------------------+
-    //      |                         |
-    //      |     Texture 0           |
-    //      +-------------------------+
-    //      |                         |
-    //      |     Texture 1           |
-    //      +-------------------------+
-    //      |                         |
-    //      |     Texture 2           |
-    //      +-------------------------+
-    //        * u = wgs84.u
-    //        * v = textureid + v in builder texture
-    uvs: []
-  };
-  const computeUvs = [];
-  const builder = params.builder;
-  const nSeg = params.segments;
-  // segments count :
-  // Tile : (nSeg + 1) * (nSeg + 1)
-  // Skirt : 8 * (nSeg - 1)
-  const nVertex = (nSeg + 1) * (nSeg + 1) + (params.disableSkirt ? 0 : 4 * nSeg);
-  if (nVertex > 2 ** 32) {
-    throw new Error('Tile segments count is too big');
-  }
-  outBuffers.position = new Float32Array(nVertex * 3);
-  outBuffers.normal = new Float32Array(nVertex * 3);
-  const uvCount = params.builder.uvCount;
-  if (uvCount > 1) {
-    outBuffers.uvs[1] = new Float32Array(nVertex);
-  }
-  computeUvs[0] = () => {};
-  const bufferIndexSize = getBufferIndexSize(nSeg, params.disableSkirt);
-  if (params.buildIndexAndUv_0) {
-    if (nVertex < 2 ** 8) {
-      outBuffers.index = new Uint8Array(bufferIndexSize);
-    } else if (nVertex < 2 ** 16) {
-      outBuffers.index = new Uint16Array(bufferIndexSize);
-    } else if (nVertex < 2 ** 32) {
-      outBuffers.index = new Uint32Array(bufferIndexSize);
-    }
-    outBuffers.uvs[0] = new Float32Array(nVertex * 2);
-    computeUvs[0] = (id, u, v) => {
-      outBuffers.uvs[0][id * 2 + 0] = u;
-      outBuffers.uvs[0][id * 2 + 1] = v;
-    };
-  }
-  const widthSegments = Math.max(2, Math.floor(nSeg) || 2);
-  const heightSegments = Math.max(2, Math.floor(nSeg) || 2);
-  let idVertex = 0;
-  const vertices = [];
-  let skirt = [];
-  const skirtEnd = [];
-  builder.prepare(params);
-  for (let y = 0; y <= heightSegments; y++) {
-    const verticesRow = [];
-    const v = y / heightSegments;
-    builder.vProjecte(v, params);
-    if (uvCount > 1) {
-      const u = builder.computeUvs[1](params);
-      computeUvs[1] = id => {
-        outBuffers.uvs[1][id] = u;
-      };
-    }
-    for (let x = 0; x <= widthSegments; x++) {
-      const u = x / widthSegments;
-      const id_m3 = idVertex * 3;
-      builder.uProjecte(u, params);
-      const vertex = builder.vertexPosition(params, params.projected);
-      const normal = builder.vertexNormal(params);
-
-      // move geometry to center world
-      vertex.sub(params.center);
-
-      // align normal to z axis
-      if (params.quatNormalToZ) {
-        vertex.applyQuaternion(params.quatNormalToZ);
-        normal.applyQuaternion(params.quatNormalToZ);
-      }
-      vertex.toArray(outBuffers.position, id_m3);
-      normal.toArray(outBuffers.normal, id_m3);
-      for (const computeUv of computeUvs) {
-        computeUv(idVertex, u, v);
-      }
-      if (!params.disableSkirt) {
-        if (y !== 0 && y !== heightSegments) {
-          if (x === widthSegments) {
-            skirt.push(idVertex);
-          } else if (x === 0) {
-            skirtEnd.push(idVertex);
-          }
-        }
-      }
-      verticesRow.push(idVertex);
-      idVertex++;
-    }
-    vertices.push(verticesRow);
-    if (y === 0) {
-      skirt = skirt.concat(verticesRow);
-    } else if (y === heightSegments) {
-      skirt = skirt.concat(verticesRow.slice().reverse());
-    }
-  }
-  if (!params.disableSkirt) {
-    skirt = skirt.concat(skirtEnd.reverse());
-  }
-  function bufferize(va, vb, vc, idVertex) {
-    outBuffers.index[idVertex + 0] = va;
-    outBuffers.index[idVertex + 1] = vb;
-    outBuffers.index[idVertex + 2] = vc;
-    return idVertex + 3;
-  }
-  let idVertex2 = 0;
-  if (params.buildIndexAndUv_0) {
-    for (let y = 0; y < heightSegments; y++) {
-      for (let x = 0; x < widthSegments; x++) {
-        const v1 = vertices[y][x + 1];
-        const v2 = vertices[y][x];
-        const v3 = vertices[y + 1][x];
-        const v4 = vertices[y + 1][x + 1];
-        idVertex2 = bufferize(v4, v2, v1, idVertex2);
-        idVertex2 = bufferize(v4, v3, v2, idVertex2);
-      }
-    }
-  }
-  const iStart = idVertex;
-
-  // TODO: WARNING beware skirt's size influences performance
-  // 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.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));
-    let buildIndexSkirt = function () {};
-    let buildUVSkirt = function () {};
-    if (params.buildIndexAndUv_0) {
-      buildIndexSkirt = function (id, v1, v2, v3, v4) {
-        id = bufferize(v1, v2, v3, id);
-        id = bufferize(v1, v3, v4, id);
-        return id;
-      };
-      buildUVSkirt = function (id) {
-        outBuffers.uvs[0][idVertex * 2 + 0] = outBuffers.uvs[0][id * 2 + 0];
-        outBuffers.uvs[0][idVertex * 2 + 1] = outBuffers.uvs[0][id * 2 + 1];
-      };
-    }
-    for (let i = 0; i < skirt.length; i++) {
-      const id = skirt[i];
-      const id_m3 = idVertex * 3;
-      const id2_m3 = id * 3;
-      outBuffers.position[id_m3 + 0] = outBuffers.position[id2_m3 + 0] - outBuffers.normal[id2_m3 + 0] * segmentSize;
-      outBuffers.position[id_m3 + 1] = outBuffers.position[id2_m3 + 1] - outBuffers.normal[id2_m3 + 1] * segmentSize;
-      outBuffers.position[id_m3 + 2] = outBuffers.position[id2_m3 + 2] - outBuffers.normal[id2_m3 + 2] * segmentSize;
-      outBuffers.normal[id_m3 + 0] = outBuffers.normal[id2_m3 + 0];
-      outBuffers.normal[id_m3 + 1] = outBuffers.normal[id2_m3 + 1];
-      outBuffers.normal[id_m3 + 2] = outBuffers.normal[id2_m3 + 2];
-      buildUVSkirt(id);
-      if (uvCount > 1) {
-        outBuffers.uvs[1][idVertex] = outBuffers.uvs[1][id];
-      }
-      const idf = (i + 1) % skirt.length;
-      const v2 = idVertex;
-      const v3 = idf === 0 ? iStart : idVertex + 1;
-      const v4 = skirt[idf];
-      idVertex2 = buildIndexSkirt(idVertex2, id, v2, v3, v4);
-      idVertex++;
-    }
-  }
-  return outBuffers;
-}

package/lib/Core/Scheduler/Cache.js

@@ -1,256 +0,0 @@
-let entry;
-
-/**
- * Cache policies for flushing. Those policies can be used when something is
- * [set]{@link Cache.set} into the Cache, as the lifetime property.
- *
- * @typedef {Object} CACHE_POLICIES
- *
- * @property {number} INFINITE - The entry is never flushed, except when the
- * `all` flag is set to `true` when calling {@link Cache.flush}.
- * @property {number} TEXTURE - Shortcut for texture resources. Time is 15 minutes.
- * @property {number} GEOMETRY - Shortcut for geometry resources. Time is 15 minutes.
- * minutes.
- */
-export const CACHE_POLICIES = {
-  INFINITE: Infinity,
-  TEXTURE: 900000,
-  GEOMETRY: 900000
-};
-
-/**
- * This is a copy of the Map object, except that it also store a value for last
- * time used. This value is used for cache expiration mechanism.
- *
- * @example
- * import Cache, { CACHE_POLICIES } from 'Core/Scheduler/Cache';
- *
- * const cache = new Cache(CACHE_POLICIES.TEXTURE)
- * cache.set({ bar: 1 }, 'foo');
- * cache.set({ bar: 32 }, 'foo', 'toto');
- *
- * cache.get('foo');
- *
- * cache.delete('foo');
- *
- * cache.clear();
- *
- * cache.flush();
- */
-class Cache {
-  /**
-   * @param      {number}  [lifetime=CACHE_POLICIES.INFINITE]  The cache expiration time for all values.
-   */
-  constructor() {
-    let lifetime = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : CACHE_POLICIES.INFINITE;
-    this.lifeTime = lifetime;
-    this.lastTimeFlush = Date.now();
-    this.data = new Map();
-  }
-
-  /**
-   * Returns the entry related to the specified key, content in array, from the cache.
-   * The array contents one to three key.
-   * The last time used property of the entry is updated to extend the longevity of the
-   * entry.
-   *
-   * @param {string[]|number[]} keyArray key array ([key0, key1, key3])
-   *
-   * @return {Object}
-   */
-
-  getByArray(keyArray) {
-    return this.get(keyArray[0], keyArray[1], keyArray[2]);
-  }
-
-  /**
-  * Adds or updates an entry with specified keys array ([key0, key1, key3]).
-  * Caution: it overrides any existing entry already set at this/those key/s.
-  *
-  * @param {Object} value to add in cache
-  * @param {string[]|number[]} keyArray key array ([key0, key1, key3])
-  *
-  * @return {Object} the added value
-  */
-  setByArray(value, keyArray) {
-    return this.set(value, keyArray[0], keyArray[1], keyArray[2]);
-  }
-
-  /**
-   * Returns the entry related to the specified key from the cache. The last
-   * time used property of the entry is updated to extend the longevity of the
-   * entry.
-   *
-   * @param {string|number} key1
-   * @param {string|number} [key2]
-   * @param {string|number} [key3]
-   *
-   * @return {Object}
-   */
-  get(key1, key2, key3) {
-    const entry_1 = this.data.get(key1);
-    if (entry_1 == undefined) {
-      return;
-    }
-    if (entry_1.lastTimeUsed != undefined) {
-      entry = entry_1;
-    } else {
-      const entry_2 = entry_1.get(key2);
-      if (entry_2 == undefined) {
-        return;
-      }
-      if (entry_2.lastTimeUsed != undefined) {
-        entry = entry_2;
-      } else {
-        const entry_3 = entry_2.get(key3);
-        if (entry_3 == undefined) {
-          return;
-        }
-        entry = entry_3;
-      }
-    }
-    if (entry.value) {
-      entry.lastTimeUsed = Date.now();
-      return entry.value;
-    }
-  }
-
-  /**
-   * Adds or updates an entry with specified keys (up to 3).
-   * Caution: it overrides any existing entry already set at this/those key/s.
-   *
-   *
-   * @param {Object} value to add in cache
-   * @param {string|number} key1
-   * @param {string|number} [key2]
-   * @param {string|number} [key3]
-   *
-   * @return {Object} the added value
-   */
-  set(value, key1, key2, key3) {
-    entry = {
-      value,
-      lastTimeUsed: Date.now()
-    };
-    if (key2 == undefined) {
-      this.data.set(key1, entry);
-      return value;
-    }
-    if (!this.data.get(key1)) {
-      this.data.set(key1, new Map());
-    }
-    const entry_map = this.data.get(key1);
-    if (key3 == undefined) {
-      entry_map.set(key2, entry);
-      return value;
-    }
-    if (!entry_map.get(key2)) {
-      entry_map.set(key2, new Map());
-    }
-    entry_map.get(key2).set(key3, entry);
-    return value;
-  }
-
-  /**
-   * Deletes the specified entry from the cache.
-   *
-   * @param {string|number} key1
-   * @param {string|number} [key2]
-   * @param {string|number} [key3]
-   */
-  delete(key1, key2, key3) {
-    const entry_1 = this.data.get(key1);
-    if (entry_1 === undefined) {
-      return;
-    }
-    if (entry_1.lastTimeUsed != undefined) {
-      delete this.data.get(key1);
-      this.data.delete(key1);
-    } else {
-      const entry_2 = entry_1.get(key2);
-      if (entry_2 === undefined) {
-        return;
-      }
-      if (entry_2.lastTimeUsed != undefined) {
-        delete entry_1.get(key2);
-        entry_1.delete(key2);
-        if (entry_1.size == 0) {
-          this.data.delete(key1);
-        }
-      } else {
-        const entry_3 = entry_2.get(key3);
-        if (entry_3 === undefined) {
-          return;
-        }
-        delete entry_2.get(key3);
-        entry_2.delete(key3);
-        if (entry_2.size == 0) {
-          entry_1.delete(key2);
-          if (entry_1.size == 0) {
-            this.data.delete(key1);
-          }
-        }
-      }
-    }
-  }
-
-  /**
-   * Removes all entries of the cache.
-   *
-   */
-  clear() {
-    this.data.clear();
-  }
-
-  /**
-   * Flush the cache: entries that have been present for too long since the
-   * last time they were used, are removed from the cache. By default, the
-   * time is the current time, but the interval can be reduced by doing
-   * something like `Cache.flush(Date.now() - reductionTime)`. If you want to
-   * clear the whole cache, use {@link Cache.clear} instead.
-   *
-   * @param {number} [time=Date.now()]
-   */
-  flush() {
-    let time = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : Date.now();
-    if (this.lifeTime == CACHE_POLICIES.INFINITE || this.lifeTime > time - this.lastTimeFlush || !this.data.size) {
-      return;
-    }
-    this.lastTimeFlush = Infinity;
-    this.data.forEach((v1, i) => {
-      if (this.lifeTime < time - v1.lastTimeUsed) {
-        delete this.data.get(i);
-        this.data.delete(i);
-      } else {
-        v1.forEach((v2, j) => {
-          if (this.lifeTime < time - v2.lastTimeUsed) {
-            delete v1.get(j);
-            v1.delete(j);
-          } else {
-            v2.forEach((v3, k) => {
-              if (this.lifeTime < time - v3.lastTimeUsed) {
-                delete v2.get(k);
-                v2.delete(k);
-              } else {
-                // Work for the moment because all flushed caches have 3 key!
-                this.lastTimeFlush = Math.min(this.lastTimeFlush, v3.lastTimeUsed);
-              }
-            });
-            if (!v2.size) {
-              delete v1.get(j);
-              v1.delete(j);
-            }
-          }
-        });
-        if (!v1.size) {
-          delete this.data.get(i);
-          this.data.delete(i);
-        }
-      }
-    });
-    if (this.data.size == 0) {
-      this.lastTimeFlush = Date.now();
-    }
-  }
-}
-export default Cache;

package/lib/Core/Scheduler/CancelledCommandException.js

@@ -1,15 +0,0 @@
-/**
- * Custom error thrown when cancelling commands. Allows the caller to act differently if needed.
- * @class
- * @param {Command} command
- */
-class CancelledCommandException {
-  constructor(command) {
-    this.command = command;
-    this.isCancelledCommandException = true;
-  }
-  toString() {
-    return `Cancelled command ${this.command.requester.id}/${this.command.layer.id}`;
-  }
-}
-export default CancelledCommandException;