itowns 2.43.2-next.10 → 2.43.2-next.12

package/lib/Loader/Potree2BrotliLoader.js

@@ -0,0 +1,261 @@
+/*
+============
+== POTREE ==
+============
+
+http://potree.org
+
+Copyright (c) 2011-2020, Markus Schütz
+All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+    The views and conclusions contained in the software and documentation are those
+of the authors and should not be interpreted as representing official policies,
+    either expressed or implied, of the FreeBSD Project.
+ */
+
+import { PointAttribute, PointAttributeTypes } from "../Core/Potree2PointAttributes.js";
+import { decompress } from 'brotli-compress/js.mjs';
+const typedArrayMapping = {
+  int8: Int8Array,
+  int16: Int16Array,
+  int32: Int32Array,
+  int64: Float64Array,
+  uint8: Uint8Array,
+  uint16: Uint16Array,
+  uint32: Uint32Array,
+  uint64: Float64Array,
+  float: Float32Array,
+  double: Float64Array
+};
+function dealign24b(mortoncode) {
+  // see https://stackoverflow.com/questions/45694690/how-i-can-remove-all-odds-bits-in-c
+
+  // input alignment of desired bits
+  // ..a..b..c..d..e..f..g..h..i..j..k..l..m..n..o..p
+  let x = mortoncode;
+
+  //          ..a..b..c..d..e..f..g..h..i..j..k..l..m..n..o..p                     ..a..b..c..d..e..f..g..h..i..j..k..l..m..n..o..p
+  //          ..a.....c.....e.....g.....i.....k.....m.....o...                     .....b.....d.....f.....h.....j.....l.....n.....p
+  //          ....a.....c.....e.....g.....i.....k.....m.....o.                     .....b.....d.....f.....h.....j.....l.....n.....p
+  x = (x & 0b001000001000001000001000) >> 2 | (x & 0b000001000001000001000001) >> 0;
+  //          ....ab....cd....ef....gh....ij....kl....mn....op                     ....ab....cd....ef....gh....ij....kl....mn....op
+  //          ....ab..........ef..........ij..........mn......                     ..........cd..........gh..........kl..........op
+  //          ........ab..........ef..........ij..........mn..                     ..........cd..........gh..........kl..........op
+  x = (x & 0b000011000000000011000000) >> 4 | (x & 0b000000000011000000000011) >> 0;
+  //          ........abcd........efgh........ijkl........mnop                     ........abcd........efgh........ijkl........mnop
+  //          ........abcd....................ijkl............                     ....................efgh....................mnop
+  //          ................abcd....................ijkl....                     ....................efgh....................mnop
+  x = (x & 0b000000001111000000000000) >> 8 | (x & 0b000000000000000000001111) >> 0;
+  //          ................abcdefgh................ijklmnop                     ................abcdefgh................ijklmnop
+  //          ................abcdefgh........................                     ........................................ijklmnop
+  //          ................................abcdefgh........                     ........................................ijklmnop
+  x = (x & 0b000000000000000000000000) >> 16 | (x & 0b000000000000000011111111) >> 0;
+
+  // sucessfully realigned!
+  // ................................abcdefghijklmnop
+
+  return x;
+}
+export default async function load(buffer, options) {
+  const {
+    pointAttributes,
+    scale,
+    min,
+    size,
+    offset,
+    numPoints
+  } = options;
+  let bytes;
+  if (numPoints === 0) {
+    bytes = {
+      buffer: new ArrayBuffer(0)
+    };
+  } else {
+    try {
+      bytes = await decompress(new Int8Array(buffer));
+    } catch (e) {
+      bytes = {
+        buffer: new ArrayBuffer(numPoints * (pointAttributes.byteSize + 12))
+      };
+      console.error(`problem with node ${name}: `, e);
+    }
+  }
+  const view = new DataView(bytes.buffer);
+  const attributeBuffers = {};
+  const gridSize = 32;
+  const grid = new Uint32Array(gridSize ** 3);
+  const toIndex = (x, y, z) => {
+    // min is already subtracted
+    const dx = gridSize * x / size.x;
+    const dy = gridSize * y / size.y;
+    const dz = gridSize * z / size.z;
+    const ix = Math.min(parseInt(dx, 10), gridSize - 1);
+    const iy = Math.min(parseInt(dy, 10), gridSize - 1);
+    const iz = Math.min(parseInt(dz, 10), gridSize - 1);
+    return ix + iy * gridSize + iz * gridSize * gridSize;
+  };
+  let numOccupiedCells = 0;
+  let byteOffset = 0;
+  for (const pointAttribute of pointAttributes.attributes) {
+    if (['POSITION_CARTESIAN', 'position'].includes(pointAttribute.name)) {
+      const buff = new ArrayBuffer(numPoints * 4 * 3);
+      const positions = new Float32Array(buff);
+      for (let j = 0; j < numPoints; j++) {
+        const mc_0 = view.getUint32(byteOffset + 4, true);
+        const mc_1 = view.getUint32(byteOffset + 0, true);
+        const mc_2 = view.getUint32(byteOffset + 12, true);
+        const mc_3 = view.getUint32(byteOffset + 8, true);
+        byteOffset += 16;
+        let X = dealign24b((mc_3 & 0x00FFFFFF) >>> 0) | dealign24b((mc_3 >>> 24 | mc_2 << 8) >>> 0) << 8;
+        let Y = dealign24b((mc_3 & 0x00FFFFFF) >>> 1) | dealign24b((mc_3 >>> 24 | mc_2 << 8) >>> 1) << 8;
+        let Z = dealign24b((mc_3 & 0x00FFFFFF) >>> 2) | dealign24b((mc_3 >>> 24 | mc_2 << 8) >>> 2) << 8;
+        if (mc_1 != 0 || mc_2 != 0) {
+          X = X | dealign24b((mc_1 & 0x00FFFFFF) >>> 0) << 16 | dealign24b((mc_1 >>> 24 | mc_0 << 8) >>> 0) << 24;
+          Y = Y | dealign24b((mc_1 & 0x00FFFFFF) >>> 1) << 16 | dealign24b((mc_1 >>> 24 | mc_0 << 8) >>> 1) << 24;
+          Z = Z | dealign24b((mc_1 & 0x00FFFFFF) >>> 2) << 16 | dealign24b((mc_1 >>> 24 | mc_0 << 8) >>> 2) << 24;
+        }
+        const x = parseInt(X, 10) * scale[0] + offset[0] - min.x;
+        const y = parseInt(Y, 10) * scale[1] + offset[1] - min.y;
+        const z = parseInt(Z, 10) * scale[2] + offset[2] - min.z;
+        const index = toIndex(x, y, z);
+        const count = grid[index]++;
+        if (count === 0) {
+          numOccupiedCells++;
+        }
+        positions[3 * j + 0] = x;
+        positions[3 * j + 1] = y;
+        positions[3 * j + 2] = z;
+      }
+      attributeBuffers[pointAttribute.name] = {
+        buffer: buff,
+        attribute: pointAttribute
+      };
+    } else if (['RGBA', 'rgba'].includes(pointAttribute.name)) {
+      const buff = new ArrayBuffer(numPoints * 4);
+      const colors = new Uint8Array(buff);
+      for (let j = 0; j < numPoints; j++) {
+        const mc_0 = view.getUint32(byteOffset + 4, true);
+        const mc_1 = view.getUint32(byteOffset + 0, true);
+        byteOffset += 8;
+        const r = dealign24b((mc_1 & 0x00FFFFFF) >>> 0) | dealign24b((mc_1 >>> 24 | mc_0 << 8) >>> 0) << 8;
+        const g = dealign24b((mc_1 & 0x00FFFFFF) >>> 1) | dealign24b((mc_1 >>> 24 | mc_0 << 8) >>> 1) << 8;
+        const b = dealign24b((mc_1 & 0x00FFFFFF) >>> 2) | dealign24b((mc_1 >>> 24 | mc_0 << 8) >>> 2) << 8;
+        colors[4 * j + 0] = r > 255 ? r / 256 : r;
+        colors[4 * j + 1] = g > 255 ? g / 256 : g;
+        colors[4 * j + 2] = b > 255 ? b / 256 : b;
+      }
+      attributeBuffers[pointAttribute.name] = {
+        buffer: buff,
+        attribute: pointAttribute
+      };
+    } else {
+      const buff = new ArrayBuffer(numPoints * 4);
+      const f32 = new Float32Array(buff);
+      const TypedArray = typedArrayMapping[pointAttribute.type.name];
+      const preciseBuffer = new TypedArray(numPoints);
+      let [offset, scale] = [0, 1];
+      const getterMap = {
+        int8: view.getInt8,
+        int16: view.getInt16,
+        int32: view.getInt32,
+        uint8: view.getUint8,
+        uint16: view.getUint16,
+        uint32: view.getUint32,
+        float: view.getFloat32,
+        double: view.getFloat64
+      };
+      const getter = getterMap[pointAttribute.type.name].bind(view);
+
+      // compute offset and scale to pack larger types into 32 bit floats
+      if (pointAttribute.type.size > 4) {
+        const [amin, amax] = pointAttribute.range;
+        offset = amin;
+        scale = 1 / (amax - amin);
+      }
+      for (let j = 0; j < numPoints; j++) {
+        const value = getter(byteOffset, true);
+        byteOffset += pointAttribute.byteSize;
+        f32[j] = (value - offset) * scale;
+        preciseBuffer[j] = value;
+      }
+      attributeBuffers[pointAttribute.name] = {
+        buffer: buff,
+        preciseBuffer,
+        attribute: pointAttribute,
+        offset,
+        scale
+      };
+    }
+  }
+  const occupancy = parseInt(numPoints / numOccupiedCells, 10);
+  {
+    // add indices
+    const buff = new ArrayBuffer(numPoints * 4);
+    const indices = new Uint32Array(buff);
+    for (let i = 0; i < numPoints; i++) {
+      indices[i] = i;
+    }
+    attributeBuffers.INDICES = {
+      buffer: buff,
+      attribute: PointAttribute.INDICES
+    };
+  }
+  {
+    // handle attribute vectors
+    const vectors = pointAttributes.vectors;
+    for (const vector of vectors) {
+      const {
+        name,
+        attributes
+      } = vector;
+      const numVectorElements = attributes.length;
+      const buffer = new ArrayBuffer(numVectorElements * numPoints * 4);
+      const f32 = new Float32Array(buffer);
+      let iElement = 0;
+      for (const sourceName of attributes) {
+        const sourceBuffer = attributeBuffers[sourceName];
+        const {
+          offset,
+          scale
+        } = sourceBuffer;
+        const view = new DataView(sourceBuffer.buffer);
+        const getter = view.getFloat32.bind(view);
+        for (let j = 0; j < numPoints; j++) {
+          const value = getter(j * 4, true);
+          f32[j * numVectorElements + iElement] = value / scale + offset;
+        }
+        iElement++;
+      }
+      const vecAttribute = new PointAttribute(name, PointAttributeTypes.DATA_TYPE_FLOAT, 3);
+      attributeBuffers[name] = {
+        buffer,
+        attribute: vecAttribute
+      };
+    }
+  }
+  return {
+    buffer,
+    attributeBuffers,
+    density: occupancy
+  };
+}

package/lib/Loader/Potree2Loader.js

@@ -0,0 +1,207 @@
+/*
+============
+== POTREE ==
+============
+
+http://potree.org
+
+Copyright (c) 2011-2020, Markus Schütz
+All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+    The views and conclusions contained in the software and documentation are those
+of the authors and should not be interpreted as representing official policies,
+    either expressed or implied, of the FreeBSD Project.
+ */
+
+import { PointAttribute, PointAttributeTypes } from "../Core/Potree2PointAttributes.js";
+const typedArrayMapping = {
+  int8: Int8Array,
+  int16: Int16Array,
+  int32: Int32Array,
+  int64: Float64Array,
+  uint8: Uint8Array,
+  uint16: Uint16Array,
+  uint32: Uint32Array,
+  uint64: Float64Array,
+  float: Float32Array,
+  double: Float64Array
+};
+export default function load(buffer, options) {
+  const {
+    pointAttributes,
+    scale,
+    min,
+    size,
+    offset,
+    numPoints
+  } = options;
+  const view = new DataView(buffer);
+  const attributeBuffers = {};
+  let attributeOffset = 0;
+  let bytesPerPoint = 0;
+  for (const pointAttribute of pointAttributes.attributes) {
+    bytesPerPoint += pointAttribute.byteSize;
+  }
+  const gridSize = 32;
+  const grid = new Uint32Array(gridSize ** 3);
+  const toIndex = (x, y, z) => {
+    // min is already subtracted
+    const dx = gridSize * x / size.x;
+    const dy = gridSize * y / size.y;
+    const dz = gridSize * z / size.z;
+    const ix = Math.min(parseInt(dx, 10), gridSize - 1);
+    const iy = Math.min(parseInt(dy, 10), gridSize - 1);
+    const iz = Math.min(parseInt(dz, 10), gridSize - 1);
+    return ix + iy * gridSize + iz * gridSize * gridSize;
+  };
+  let numOccupiedCells = 0;
+  for (const pointAttribute of pointAttributes.attributes) {
+    if (['POSITION_CARTESIAN', 'position'].includes(pointAttribute.name)) {
+      const buff = new ArrayBuffer(numPoints * 4 * 3);
+      const positions = new Float32Array(buff);
+      for (let j = 0; j < numPoints; j++) {
+        const pointOffset = j * bytesPerPoint;
+        const x = view.getInt32(pointOffset + attributeOffset + 0, true) * scale[0] + offset[0] - min.x;
+        const y = view.getInt32(pointOffset + attributeOffset + 4, true) * scale[1] + offset[1] - min.y;
+        const z = view.getInt32(pointOffset + attributeOffset + 8, true) * scale[2] + offset[2] - min.z;
+        const index = toIndex(x, y, z);
+        const count = grid[index]++;
+        if (count === 0) {
+          numOccupiedCells++;
+        }
+        positions[3 * j + 0] = x;
+        positions[3 * j + 1] = y;
+        positions[3 * j + 2] = z;
+      }
+      attributeBuffers[pointAttribute.name] = {
+        buffer: buff,
+        attribute: pointAttribute
+      };
+    } else if (['RGBA', 'rgba'].includes(pointAttribute.name)) {
+      const buff = new ArrayBuffer(numPoints * 4);
+      const colors = new Uint8Array(buff);
+      for (let j = 0; j < numPoints; j++) {
+        const pointOffset = j * bytesPerPoint;
+        const r = view.getUint16(pointOffset + attributeOffset + 0, true);
+        const g = view.getUint16(pointOffset + attributeOffset + 2, true);
+        const b = view.getUint16(pointOffset + attributeOffset + 4, true);
+        colors[4 * j + 0] = r > 255 ? r / 256 : r;
+        colors[4 * j + 1] = g > 255 ? g / 256 : g;
+        colors[4 * j + 2] = b > 255 ? b / 256 : b;
+      }
+      attributeBuffers[pointAttribute.name] = {
+        buffer: buff,
+        attribute: pointAttribute
+      };
+    } else {
+      const buff = new ArrayBuffer(numPoints * 4);
+      const f32 = new Float32Array(buff);
+      const TypedArray = typedArrayMapping[pointAttribute.type.name];
+      const preciseBuffer = new TypedArray(numPoints);
+      let [offset, scale] = [0, 1];
+      const getterMap = {
+        int8: view.getInt8,
+        int16: view.getInt16,
+        int32: view.getInt32,
+        uint8: view.getUint8,
+        uint16: view.getUint16,
+        uint32: view.getUint32,
+        float: view.getFloat32,
+        double: view.getFloat64
+      };
+      const getter = getterMap[pointAttribute.type.name].bind(view);
+
+      // compute offset and scale to pack larger types into 32 bit floats
+      if (pointAttribute.type.size > 4) {
+        const [amin, amax] = pointAttribute.range;
+        offset = amin;
+        scale = 1 / (amax - amin);
+      }
+      for (let j = 0; j < numPoints; j++) {
+        const pointOffset = j * bytesPerPoint;
+        const value = getter(pointOffset + attributeOffset, true);
+        f32[j] = (value - offset) * scale;
+        preciseBuffer[j] = value;
+      }
+      attributeBuffers[pointAttribute.name] = {
+        buffer: buff,
+        preciseBuffer,
+        attribute: pointAttribute,
+        offset,
+        scale
+      };
+    }
+    attributeOffset += pointAttribute.byteSize;
+  }
+  const occupancy = parseInt(numPoints / numOccupiedCells, 10);
+  {
+    // add indices
+    const buff = new ArrayBuffer(numPoints * 4);
+    const indices = new Uint32Array(buff);
+    for (let i = 0; i < numPoints; i++) {
+      indices[i] = i;
+    }
+    attributeBuffers.INDICES = {
+      buffer: buff,
+      attribute: PointAttribute.INDICES
+    };
+  }
+  {
+    // handle attribute vectors
+    const vectors = pointAttributes.vectors;
+    for (const vector of vectors) {
+      const {
+        name,
+        attributes
+      } = vector;
+      const numVectorElements = attributes.length;
+      const buffer = new ArrayBuffer(numVectorElements * numPoints * 4);
+      const f32 = new Float32Array(buffer);
+      let iElement = 0;
+      for (const sourceName of attributes) {
+        const sourceBuffer = attributeBuffers[sourceName];
+        const {
+          offset,
+          scale
+        } = sourceBuffer;
+        const view = new DataView(sourceBuffer.buffer);
+        const getter = view.getFloat32.bind(view);
+        for (let j = 0; j < numPoints; j++) {
+          const value = getter(j * 4, true);
+          f32[j * numVectorElements + iElement] = value / scale + offset;
+        }
+        iElement++;
+      }
+      const vecAttribute = new PointAttribute(name, PointAttributeTypes.DATA_TYPE_FLOAT, 3);
+      attributeBuffers[name] = {
+        buffer,
+        attribute: vecAttribute
+      };
+    }
+  }
+  return {
+    buffer,
+    attributeBuffers,
+    density: occupancy
+  };
+}

package/lib/Main.js

@@ -51,6 +51,7 @@ export { default as GeometryLayer } from "./Layer/GeometryLayer.js";
 export { default as FeatureGeometryLayer } from "./Layer/FeatureGeometryLayer.js";
 export { default as PointCloudLayer } from "./Layer/PointCloudLayer.js";
 export { default as PotreeLayer } from "./Layer/PotreeLayer.js";
+export { default as Potree2Layer } from "./Layer/Potree2Layer.js";
 export { default as C3DTilesLayer, C3DTILES_LAYER_EVENTS } from "./Layer/C3DTilesLayer.js";
 export { default as TiledGeometryLayer } from "./Layer/TiledGeometryLayer.js";
 export { default as OrientedImageLayer } from "./Layer/OrientedImageLayer.js";
@@ -75,6 +76,7 @@ export { default as WMTSSource } from "./Source/WMTSSource.js";
 export { default as VectorTilesSource } from "./Source/VectorTilesSource.js";
 export { default as OrientedImageSource } from "./Source/OrientedImageSource.js";
 export { default as PotreeSource } from "./Source/PotreeSource.js";
+export { default as Potree2Source } from "./Source/Potree2Source.js";
 export { default as C3DTilesSource } from "./Source/C3DTilesSource.js";
 export { default as C3DTilesIonSource } from "./Source/C3DTilesIonSource.js";
 export { default as C3DTilesGoogleSource } from "./Source/C3DTilesGoogleSource.js";

package/lib/Parser/LASParser.js

@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import LASLoader from "./LASLoader.js";
+import LASLoader from "../Loader/LASLoader.js";
 const lasLoader = new LASLoader();
 function buildBufferGeometry(attributes) {
   const geometry = new THREE.BufferGeometry();

package/lib/Parser/Potree2BinParser.js

@@ -0,0 +1,92 @@
+import * as THREE from 'three';
+import { spawn, Thread, Transfer } from 'threads';
+let _thread;
+function workerInstance() {
+  return new Worker( /* webpackChunkName: "itowns_potree2worker" */
+  new URL('../Worker/Potree2Worker.js', import.meta.url), {
+    type: 'module'
+  });
+}
+async function loader() {
+  if (_thread) {
+    return _thread;
+  }
+  _thread = await spawn(workerInstance());
+  return _thread;
+}
+function decoder(w, metadata) {
+  return metadata.encoding === 'BROTLI' ? w.parseBrotli : w.parse;
+}
+export default {
+  /**
+   * @return {Promise<void>}
+   */
+  terminate() {
+    const currentThread = _thread;
+    _thread = undefined;
+    return Thread.terminate(currentThread);
+  },
+  /** @module Potree2BinParser */
+  /** Parse .bin PotreeConverter 2.0 format and convert to a THREE.BufferGeometry
+   * @function parse
+   * @param {ArrayBuffer} buffer - the bin buffer.
+   * @param {Object} options
+   * @param {string[]} options.in.pointAttributes - the point attributes information contained in metadata.js
+   * @return {Promise} - a promise that resolves with a THREE.BufferGeometry.
+   *
+   */
+  parse: async function (buffer, options) {
+    const metadata = options.in.source.metadata;
+    const layer = options.out;
+    const pointAttributes = layer.pointAttributes;
+    const scale = metadata.scale;
+    const box = options.in.bbox;
+    const min = box.min;
+    const size = box.max.clone().sub(box.min);
+    const max = box.max;
+    const offset = metadata.offset;
+    const numPoints = options.in.numPoints;
+    const potreeLoader = await loader();
+    const decode = decoder(potreeLoader, metadata);
+    const data = await decode(Transfer(buffer), {
+      pointAttributes,
+      scale,
+      min,
+      max,
+      size,
+      offset,
+      numPoints
+    });
+    const buffers = data.attributeBuffers;
+    const geometry = new THREE.BufferGeometry();
+    Object.keys(buffers).forEach(property => {
+      const buffer = buffers[property].buffer;
+      if (property === 'position') {
+        geometry.setAttribute('position', new THREE.BufferAttribute(new Float32Array(buffer), 3));
+      } else if (property === 'rgba') {
+        geometry.setAttribute('color', new THREE.BufferAttribute(new Uint8Array(buffer), 4, true));
+      } else if (property === 'NORMAL') {
+        geometry.setAttribute('normal', new THREE.BufferAttribute(new Float32Array(buffer), 3));
+      } else if (property === 'INDICES') {
+        const bufferAttribute = new THREE.BufferAttribute(new Uint8Array(buffer), 4);
+        bufferAttribute.normalized = true;
+        geometry.setAttribute('indices', bufferAttribute);
+      } else {
+        const bufferAttribute = new THREE.BufferAttribute(new Float32Array(buffer), 1);
+        const batchAttribute = buffers[property].attribute;
+        bufferAttribute.potree = {
+          offset: buffers[property].offset,
+          scale: buffers[property].scale,
+          preciseBuffer: buffers[property].preciseBuffer,
+          range: batchAttribute.range
+        };
+        geometry.setAttribute(property, bufferAttribute);
+      }
+    });
+    geometry.computeBoundingBox();
+    return {
+      geometry,
+      density: data.density
+    };
+  }
+};

package/lib/Renderer/PointsMaterial.js

@@ -1,6 +1,6 @@
 import * as THREE from 'three';
 /* babel-plugin-inline-import './Shader/PointsVS.glsl' */
-const PointsVS = "#include <itowns/precision_qualifier>\n#if defined(USE_TEXTURES_PROJECTIVE)\n#include <itowns/projective_texturing_pars_vertex>\n#endif\n#include <common>\n#include <logdepthbuf_pars_vertex>\n\n#define NB_CLASS 8.\n\nuniform float size;\nuniform float scale;\n\nuniform bool picking;\nuniform int mode;\nuniform float opacity;\nuniform vec4 overlayColor;\n\nuniform vec2 elevationRange;\nuniform vec2 intensityRange;\nuniform vec2 angleRange;\n\nuniform sampler2D classificationTexture;\nuniform sampler2D discreteTexture;\nuniform sampler2D gradientTexture;\nuniform int sizeMode;\nuniform float minAttenuatedSize;\nuniform float maxAttenuatedSize;\n\nattribute vec3 color;\nattribute vec2 range;\nattribute vec4 unique_id;\nattribute float intensity;\nattribute float classification;\nattribute float pointSourceID;\n\nattribute float returnNumber;\nattribute float numberOfReturns;\nattribute float scanAngle;\n\n#if defined(NORMAL_OCT16)\nattribute vec2 oct16Normal;\n#elif defined(NORMAL_SPHEREMAPPED)\nattribute vec2 sphereMappedNormal;\n#endif\n\nvarying vec4 vColor;\n\n// see https://web.archive.org/web/20150303053317/http://lgdv.cs.fau.de/get/1602\n// and implementation in PotreeConverter (BINPointReader.cpp) and potree (BinaryDecoderWorker.js)\n#if defined(NORMAL_OCT16)\nvec3 decodeOct16Normal(vec2 encodedNormal) {\n    vec2 nNorm = 2. * (encodedNormal / 255.) - 1.;\n    vec3 n;\n    n.z = 1. - abs(nNorm.x) - abs(nNorm.y);\n    if (n.z >= 0.) {\n        n.x = nNorm.x;\n        n.y = nNorm.y;\n    } else {\n        n.x = sign(nNorm.x) - sign(nNorm.x) * sign(nNorm.y) * nNorm.y;\n        n.y = sign(nNorm.y) - sign(nNorm.y) * sign(nNorm.x) * nNorm.x;\n    }\n    return normalize(n);\n}\n#elif defined(NORMAL_SPHEREMAPPED)\n// see http://aras-p.info/texts/CompactNormalStorage.html method #4\n// or see potree's implementation in BINPointReader.cpp\nvec3 decodeSphereMappedNormal(vec2 encodedNormal) {\n    vec2 fenc = 2. * encodedNormal / 255. - 1.;\n    float f = dot(fenc,fenc);\n    float g = 2. * sqrt(1. - f);\n    vec3 n;\n    n.xy = fenc * g;\n    n.z = 1. - 2. * f;\n    return n;\n}\n#endif\n\nvoid main() {\n\n#if defined(NORMAL_OCT16)\n    vec3  normal = decodeOct16Normal(oct16Normal);\n#elif defined(NORMAL_SPHEREMAPPED)\n    vec3 normal = decodeSphereMappedNormal(sphereMappedNormal);\n#elif defined(NORMAL)\n    // nothing to do\n#else\n    // default to color\n    vec3 normal = color;\n#endif\n\n    if (picking) {\n        vColor = unique_id;\n    } else {\n        vColor.a = 1.0;\n        if (mode == PNTS_MODE_CLASSIFICATION) {\n            vec2 uv = vec2(classification/255., 0.5);\n            vColor = texture2D(classificationTexture, uv);\n        } else if (mode == PNTS_MODE_NORMAL) {\n            vColor.rgb = abs(normal);\n        } else if (mode == PNTS_MODE_COLOR) {\n            // default to color mode\n            vColor.rgb = mix(color, overlayColor.rgb, overlayColor.a);\n        } else if (mode == PNTS_MODE_RETURN_NUMBER) {\n            vec2 uv = vec2(returnNumber/255., 0.5);\n            vColor = texture2D(discreteTexture, uv);\n        } else if (mode == PNTS_MODE_RETURN_TYPE) {\n            float returnType;\n            if (returnNumber > numberOfReturns) {\n                returnType = 4.;\n            } else if (returnNumber == 1.) {\n                if (numberOfReturns == 1.) {\n                    // single\n                    returnType = 0.;\n                } else {\n                    // first\n                    returnType = 1.;\n                }\n            } else {\n                if (returnNumber == numberOfReturns) {\n                    // last\n                    returnType = 3.;\n                } else {\n                    // intermediate\n                    returnType = 2.;\n                }\n            }\n            vec2 uv = vec2(returnType/255., 0.5);\n            vColor = texture2D(discreteTexture, uv);\n        } else if (mode == PNTS_MODE_RETURN_COUNT) {\n            vec2 uv = vec2(numberOfReturns/255., 0.5);\n            vColor = texture2D(discreteTexture, uv);\n        } else if (mode == PNTS_MODE_POINT_SOURCE_ID) {\n            vec2 uv = vec2(mod(pointSourceID, NB_CLASS)/255., 0.5);\n            vColor = texture2D(discreteTexture, uv);\n        } else if (mode == PNTS_MODE_SCAN_ANGLE) {\n            float i = (scanAngle - angleRange.x) / (angleRange.y - angleRange.x);\n            vec2 uv = vec2(i, (1. - i));\n            vColor = texture2D(gradientTexture, uv);\n        } else if (mode == PNTS_MODE_INTENSITY) {\n            float i = (intensity - intensityRange.x) / (intensityRange.y - intensityRange.x);\n            vec2 uv = vec2(i, (1. - i));\n            vColor = texture2D(gradientTexture, uv);\n        } else if (mode == PNTS_MODE_ELEVATION) {\n            float i = (position.z - elevationRange.x) / (elevationRange.y - elevationRange.x);\n            vec2 uv = vec2(i, (1. - i));\n            vColor = texture2D(gradientTexture, uv);\n        }\n\n        vColor.a *= opacity;\n    }\n\n    #include <begin_vertex>\n    #include <project_vertex>\n\n    gl_PointSize = size;\n\n    if (sizeMode == PNTS_SIZE_MODE_ATTENUATED) {\n        bool isPerspective = isPerspectiveMatrix(projectionMatrix);\n\n        if (isPerspective) {\n            gl_PointSize *= scale / -mvPosition.z;\n            gl_PointSize = clamp(gl_PointSize, minAttenuatedSize, maxAttenuatedSize);\n        }\n    }\n\n#if defined(USE_TEXTURES_PROJECTIVE)\n    #include <itowns/projective_texturing_vertex>\n#endif\n    #include <logdepthbuf_vertex>\n}\n";
+const PointsVS = "#include <itowns/precision_qualifier>\n#if defined(USE_TEXTURES_PROJECTIVE)\n#include <itowns/projective_texturing_pars_vertex>\n#endif\n#include <common>\n#include <logdepthbuf_pars_vertex>\n\n#define NB_CLASS 8.\n\nuniform float size;\nuniform float scale;\n\nuniform bool picking;\nuniform int mode;\nuniform float opacity;\nuniform vec4 overlayColor;\n\nuniform vec2 elevationRange;\nuniform vec2 intensityRange;\nuniform vec2 angleRange;\n\nuniform sampler2D classificationTexture;\nuniform sampler2D discreteTexture;\nuniform sampler2D gradientTexture;\nuniform int sizeMode;\nuniform float minAttenuatedSize;\nuniform float maxAttenuatedSize;\n\nattribute vec3 color;\nattribute vec2 range;\nattribute vec4 unique_id;\nattribute float intensity;\nattribute float classification;\nattribute float pointSourceID;\n\nattribute float returnNumber;\nattribute float numberOfReturns;\nattribute float scanAngle;\n\n#if defined(NORMAL_OCT16)\nattribute vec2 oct16Normal;\n#elif defined(NORMAL_SPHEREMAPPED)\nattribute vec2 sphereMappedNormal;\n#endif\n\nvarying vec4 vColor;\n\n// see https://web.archive.org/web/20150303053317/http://lgdv.cs.fau.de/get/1602\n// and implementation in PotreeConverter (BINPointReader.cpp) and potree (BinaryDecoderWorker.js)\n#if defined(NORMAL_OCT16)\nvec3 decodeOct16Normal(vec2 encodedNormal) {\n    vec2 nNorm = 2. * (encodedNormal / 255.) - 1.;\n    vec3 n;\n    n.z = 1. - abs(nNorm.x) - abs(nNorm.y);\n    if (n.z >= 0.) {\n        n.x = nNorm.x;\n        n.y = nNorm.y;\n    } else {\n        n.x = sign(nNorm.x) - sign(nNorm.x) * sign(nNorm.y) * nNorm.y;\n        n.y = sign(nNorm.y) - sign(nNorm.y) * sign(nNorm.x) * nNorm.x;\n    }\n    return normalize(n);\n}\n#elif defined(NORMAL_SPHEREMAPPED)\n// see http://aras-p.info/texts/CompactNormalStorage.html method #4\n// or see potree's implementation in BINPointReader.cpp\nvec3 decodeSphereMappedNormal(vec2 encodedNormal) {\n    vec2 fenc = 2. * encodedNormal / 255. - 1.;\n    float f = dot(fenc,fenc);\n    float g = 2. * sqrt(1. - f);\n    vec3 n;\n    n.xy = fenc * g;\n    n.z = 1. - 2. * f;\n    return n;\n}\n#endif\n\nvoid main() {\n\n#if defined(NORMAL_OCT16)\n    vec3  normal = decodeOct16Normal(oct16Normal);\n#elif defined(NORMAL_SPHEREMAPPED)\n    vec3 normal = decodeSphereMappedNormal(sphereMappedNormal);\n#elif defined(NORMAL)\n    // nothing to do\n#else\n    // default to color\n    vec3 normal = color;\n#endif\n\n    if (picking) {\n        vColor = unique_id;\n    } else {\n        vColor.a = 1.0;\n        if (mode == PNTS_MODE_CLASSIFICATION) {\n            vec2 uv = vec2(classification/255., 0.5);\n            vColor = texture2D(classificationTexture, uv);\n        } else if (mode == PNTS_MODE_NORMAL) {\n            vColor.rgb = abs(normal);\n        } else if (mode == PNTS_MODE_COLOR) {\n            // default to color mode\n            vColor.rgb = mix(color, overlayColor.rgb, overlayColor.a);\n        } else if (mode == PNTS_MODE_RETURN_NUMBER) {\n            vec2 uv = vec2(returnNumber/255., 0.5);\n            vColor = texture2D(discreteTexture, uv);\n        } else if (mode == PNTS_MODE_RETURN_TYPE) {\n            float returnType;\n            if (returnNumber > numberOfReturns) {\n                returnType = 4.;\n            } else if (returnNumber == 1.) {\n                if (numberOfReturns == 1.) {\n                    // single\n                    returnType = 0.;\n                } else {\n                    // first\n                    returnType = 1.;\n                }\n            } else {\n                if (returnNumber == numberOfReturns) {\n                    // last\n                    returnType = 3.;\n                } else {\n                    // intermediate\n                    returnType = 2.;\n                }\n            }\n            vec2 uv = vec2(returnType/255., 0.5);\n            vColor = texture2D(discreteTexture, uv);\n        } else if (mode == PNTS_MODE_RETURN_COUNT) {\n            vec2 uv = vec2(numberOfReturns/255., 0.5);\n            vColor = texture2D(discreteTexture, uv);\n        } else if (mode == PNTS_MODE_POINT_SOURCE_ID) {\n            vec2 uv = vec2(mod(pointSourceID, NB_CLASS)/255., 0.5);\n            vColor = texture2D(discreteTexture, uv);\n        } else if (mode == PNTS_MODE_SCAN_ANGLE) {\n            float i = (scanAngle - angleRange.x) / (angleRange.y - angleRange.x);\n            vec2 uv = vec2(i, (1. - i));\n            vColor = texture2D(gradientTexture, uv);\n        } else if (mode == PNTS_MODE_INTENSITY) {\n            float i = (intensity - intensityRange.x) / (intensityRange.y - intensityRange.x);\n            vec2 uv = vec2(i, (1. - i));\n            vColor = texture2D(gradientTexture, uv);\n        } else if (mode == PNTS_MODE_ELEVATION) {\n            float z = (modelMatrix * vec4(position, 1.0)).z;\n            float i = (z - elevationRange.x) / (elevationRange.y - elevationRange.x);\n            vec2 uv = vec2(i, (1. - i));\n            vColor = texture2D(gradientTexture, uv);\n        }\n\n        vColor.a *= opacity;\n    }\n\n    #include <begin_vertex>\n    #include <project_vertex>\n\n    gl_PointSize = size;\n\n    if (sizeMode == PNTS_SIZE_MODE_ATTENUATED) {\n        bool isPerspective = isPerspectiveMatrix(projectionMatrix);\n\n        if (isPerspective) {\n            gl_PointSize *= scale / -mvPosition.z;\n            gl_PointSize = clamp(gl_PointSize, minAttenuatedSize, maxAttenuatedSize);\n        }\n    }\n\n#if defined(USE_TEXTURES_PROJECTIVE)\n    #include <itowns/projective_texturing_vertex>\n#endif\n    #include <logdepthbuf_vertex>\n}\n";
 /* babel-plugin-inline-import './Shader/PointsFS.glsl' */
 const PointsFS = "#include <itowns/precision_qualifier>\n#include <logdepthbuf_pars_fragment>\n#if defined(USE_TEXTURES_PROJECTIVE)\n#include <itowns/projective_texturing_pars_fragment>\n#endif\n\nvarying vec4 vColor;\nuniform bool picking;\nuniform int shape;\n\nvoid main() {\n    #include <logdepthbuf_fragment>\n    //square shape does not require any change.\n    if (shape == PNTS_SHAPE_CIRCLE) {\n        //circular rendering in glsl\n        if ((length(gl_PointCoord - 0.5) > 0.5) || (vColor.a == 0.0)) {\n            discard;\n        }\n    }\n\n#if defined(USE_TEXTURES_PROJECTIVE)\n    vec4 color = vColor;\n    if (!picking) {\n        #pragma unroll_loop\n        for (int i = 0; i < ORIENTED_IMAGES_COUNT; i++) {\n            color = projectiveTextureColor(projectiveTextureCoords[ ORIENTED_IMAGES_COUNT - 1 - i ], projectiveTextureDistortion[ ORIENTED_IMAGES_COUNT - 1 - i ], projectiveTexture[ ORIENTED_IMAGES_COUNT - 1 - i ], mask[ORIENTED_IMAGES_COUNT - 1 - i], color);\n        }\n        gl_FragColor = vec4(color.rgb, color.a * opacity);\n    } else {\n        gl_FragColor = color;\n    }\n#else\n    gl_FragColor = vColor;\n#endif\n}\n";
 import ShaderUtils from "./Shader/ShaderUtils.js";

package/lib/Source/FileSource.js

@@ -130,7 +130,7 @@ class FileSource extends Source {
     }
 
     // the fake url is for when we use the fetchedData or features mode
-    source.url = source.url || 'fake-file-url';
+    source.url = source.url || 'none';
     super(source);
     this.isFileSource = true;
     this.fetchedData = source.fetchedData;