itowns 2.42.1-next.9 → 2.43.1-next.0

package/lib/MainBundle.js

@@ -1,34 +1,4 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-var _exportNames = {
-  THREE: true,
-  proj4: true
-};
-exports.THREE = void 0;
-Object.defineProperty(exports, "proj4", {
-  enumerable: true,
-  get: function () {
-    return _proj.default;
-  }
-});
-var THREE = _interopRequireWildcard(require("three"));
-exports.THREE = THREE;
-var _proj = _interopRequireDefault(require("proj4"));
-var _Main = require("./Main.js");
-Object.keys(_Main).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _Main[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _Main[key];
-    }
-  });
-});
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+import * as THREE from 'three';
+export { THREE };
+export { default as proj4 } from 'proj4';
+export * from "./Main.js";

package/lib/Parser/B3dmParser.js

@@ -1,33 +1,20 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-exports.enableDracoLoader = enableDracoLoader;
-exports.enableKtx2Loader = enableKtx2Loader;
-exports.legacyGLTFLoader = exports.glTFLoader = void 0;
-var THREE = _interopRequireWildcard(require("three"));
-var _Capabilities = _interopRequireDefault(require("../Core/System/Capabilities"));
-var _GLTFLoader = require("../ThreeExtended/loaders/GLTFLoader");
-var _DRACOLoader = require("../ThreeExtended/loaders/DRACOLoader");
-var _KTX2Loader = require("../ThreeExtended/loaders/KTX2Loader");
-var _LegacyGLTFLoader = _interopRequireDefault(require("./deprecated/LegacyGLTFLoader"));
-var _ShaderUtils = _interopRequireDefault(require("../Renderer/Shader/ShaderUtils"));
-var _C3DTBatchTable = _interopRequireDefault(require("../Core/3DTiles/C3DTBatchTable"));
-var _ReferencingLayerProperties = _interopRequireDefault(require("../Layer/ReferencingLayerProperties"));
-var _ThreeUtils = _interopRequireDefault(require("../Utils/ThreeUtils"));
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-const matrixChangeUpVectorZtoY = new THREE.Matrix4().makeRotationX(Math.PI / 2);
-// For gltf rotation
-const matrixChangeUpVectorZtoX = new THREE.Matrix4().makeRotationZ(-Math.PI / 2);
+import * as THREE from 'three';
+import C3DTBatchTable from "../Core/3DTiles/C3DTBatchTable.js";
+import Capabilities from "../Core/System/Capabilities.js";
+import { MeshBasicMaterial } from 'three';
+import disposeThreeMaterial from "../Utils/ThreeUtils.js";
+import shaderUtils from "../Renderer/Shader/ShaderUtils.js";
+import ReferLayerProperties from "../Layer/ReferencingLayerProperties.js";
+import GLTFParser from "./GLTFParser.js";
+const matrixChangeUpVectorYtoZInv = new THREE.Matrix4().makeRotationX(-Math.PI / 2);
+const matrixChangeUpVectorXtoZ = new THREE.Matrix4().makeRotationZ(-Math.PI / 2);
 const utf8Decoder = new TextDecoder();
-const glTFLoader = new _GLTFLoader.GLTFLoader();
-exports.glTFLoader = glTFLoader;
-const legacyGLTFLoader = new _LegacyGLTFLoader.default();
-exports.legacyGLTFLoader = legacyGLTFLoader;
+
+/**
+ * 3D Tiles pre-1.0 contain not standardized and specific uniforms that we filter out to avoid shader compilation errors
+ * This method is passed to scene.traverse and applied to all 3D objects of the loaded gltf.
+ * @param {THREE.Object3D} obj - 3D object of the gltf hierarchy
+ */
 function filterUnsupportedSemantics(obj) {
   // see GLTFLoader GLTFShader.prototype.update function
   const supported = ['MODELVIEW', 'MODELVIEWINVERSETRANSPOSE', 'PROJECTION', 'JOINTMATRIX'];
@@ -47,67 +34,36 @@ function filterUnsupportedSemantics(obj) {
 }
 
 /**
- * @module B3dmParser
+ * 3D Tiles pre-1.0 had a gltfUpAxis parameter that defined the up vector of the gltf file that might be different from
+ * the standard y-up for gltf. Manage the case when this gltfUpAxis is defined (i.e. apply the correct rotation to the
+ * gltf file to have it z-up in the end).
+ * @param {THREE.Object3D} gltfScene - the parsed glTF scene
+ * @param {String} gltfUpAxis - the gltfUpAxis parameter
  */
-/**
- * Enable Draco decoding for gltf.
- *
- * The Draco library files are in folder itowns/examples/libs/draco/.
- * You must indicate this path when you want to enable Draco Decoding.
- * For more information on Draco, read /itowns/examples/libs/draco/README.md.
- *
- * @example <caption>Enable draco decoder</caption>
- * // if you copied /itowns/examples/libs/draco/ to the root folder of your project,you can set the path to './'.
- * itowns.enableDracoLoader('./');
- *
- *  @param {string} path path to draco library folder.
- * This library is mandatory to load b3dm and gltf with Draco compression.
- * @param {object} config optional configuration for Draco compression.
- */
-function enableDracoLoader(path, config) {
-  if (!path) {
-    throw new Error('Path to draco folder is mandatory');
-  }
-  const dracoLoader = new _DRACOLoader.DRACOLoader();
-  dracoLoader.setDecoderPath(path);
-  if (config) {
-    dracoLoader.setDecoderConfig(config);
+function applyDeprecatedGltfUpAxis(gltfScene, gltfUpAxis) {
+  if (gltfUpAxis === 'Z') {
+    // If gltf up was already z-up, apply the inverse transform matrix that was applied in the glTFParser
+    gltfScene.applyMatrix4(matrixChangeUpVectorYtoZInv);
+  } else if (gltfUpAxis === 'X') {
+    gltfScene.applyMatrix4(matrixChangeUpVectorYtoZInv);
+    gltfScene.applyMatrix4(matrixChangeUpVectorXtoZ);
   }
-  glTFLoader.setDRACOLoader(dracoLoader);
 }
 
 /**
- * Enable KTX2 decoding for gltf. This library is mandatory to load b3dm and gltf with KTX2 compression.
- *
- * The KTX2 library files are in folder itowns/examples/libs/basis/.
- * You must indicate this path when you want to enable KTX2 decoding.
- * For more information about KTX2, read /itowns/examples/libs/basis/README.md.
- *
- * @example <caption>Enable ktx2 decoder</caption>
- * // if you copied /itowns/examples/libs/draco/ to the root folder of your project,you can set the path to './'.
- * itowns.enableKtx2Loader('./', view.mainLoop.gfxEngine.renderer);
- *
- * @param {string} path path to KTX2 library folder.
- * @param {THREE.WebGLRenderer} renderer the threejs renderer
+ * @module B3dmParser
  */
-function enableKtx2Loader(path, renderer) {
-  if (!path || !renderer) {
-    throw new Error('Path to ktx2 folder and renderer are mandatory');
-  }
-  const ktx2Loader = new _KTX2Loader.KTX2Loader();
-  ktx2Loader.setTranscoderPath(path);
-  ktx2Loader.detectSupport(renderer);
-  glTFLoader.setKTX2Loader(ktx2Loader);
-}
-var _default = {
+
+export default {
   /** Parse b3dm buffer and extract THREE.Scene and batch table
    * @param {ArrayBuffer} buffer - the b3dm buffer.
    * @param {Object} options - additional properties.
    * @param {string=} [options.gltfUpAxis='Y'] - embedded glTF model up axis.
    * @param {string} options.urlBase - the base url of the b3dm file (used to fetch textures for the embedded glTF model).
-   * @param {boolean=} [options.doNotPatchMaterial='false'] - disable patching material with logarithmic depth buffer support.
+   * @param {boolean=} [options.doNotPatchMaterial=false] - disable patching material with logarithmic depth buffer support.
    * @param {float} [options.opacity=1.0] - the b3dm opacity.
-   * @param {boolean|Material=} [options.overrideMaterials='false'] - override b3dm's embedded glTF materials. If
+   * @param {boolean=} [options.frustumCulled=false] - enable frustum culling.
+   * @param {boolean|Material=} [options.overrideMaterials=false] - override b3dm's embedded glTF materials. If
    * true, a threejs [MeshBasicMaterial](https://threejs.org/docs/index.html?q=meshbasic#api/en/materials/MeshBasicMaterial)
    * is set up. config.overrideMaterials can also be a threejs [Material](https://threejs.org/docs/index.html?q=material#api/en/materials/Material)
    * in which case it will be the material used to override.
@@ -115,8 +71,7 @@ var _default = {
    *
    */
   parse(buffer, options) {
-    const gltfUpAxis = options.gltfUpAxis;
-    const urlBase = options.urlBase;
+    const frustumCulled = options.frustumCulled === true;
     if (!buffer) {
       throw new Error('No array buffer provided.');
     }
@@ -166,71 +121,65 @@ var _default = {
         // sizeBegin is an index to the beginning of the batch table
         const sizeBegin = headerByteLength + b3dmHeader.FTJSONLength + b3dmHeader.FTBinaryLength;
         const BTBuffer = buffer.slice(sizeBegin, sizeBegin + b3dmHeader.BTJSONLength + b3dmHeader.BTBinaryLength);
-        promises.push(Promise.resolve(new _C3DTBatchTable.default(BTBuffer, b3dmHeader.BTJSONLength, b3dmHeader.BTBinaryLength, FTJSON.BATCH_LENGTH, options.registeredExtensions)));
+        promises.push(Promise.resolve(new C3DTBatchTable(BTBuffer, b3dmHeader.BTJSONLength, b3dmHeader.BTBinaryLength, FTJSON.BATCH_LENGTH, options.registeredExtensions)));
       } else {
-        promises.push(Promise.resolve(new _C3DTBatchTable.default()));
+        promises.push(Promise.resolve(new C3DTBatchTable()));
       }
       const posGltf = headerByteLength + b3dmHeader.FTJSONLength + b3dmHeader.FTBinaryLength + b3dmHeader.BTJSONLength + b3dmHeader.BTBinaryLength;
       const gltfBuffer = buffer.slice(posGltf);
       const headerView = new DataView(gltfBuffer, 0, 20);
-      promises.push(new Promise((resolve /* , reject */) => {
-        const onload = gltf => {
-          for (const scene of gltf.scenes) {
-            scene.traverse(filterUnsupportedSemantics);
-          }
-          // Rotation managed
-          if (gltfUpAxis === undefined || gltfUpAxis === 'Y') {
-            gltf.scene.applyMatrix4(matrixChangeUpVectorZtoY);
-          } else if (gltfUpAxis === 'X') {
-            gltf.scene.applyMatrix4(matrixChangeUpVectorZtoX);
+      const init_mesh = function (mesh) {
+        mesh.frustumCulled = frustumCulled;
+        if (mesh.material) {
+          if (options.overrideMaterials) {
+            const oldMat = mesh.material;
+            // Set up new material
+            if (typeof options.overrideMaterials === 'object' && options.overrideMaterials.isMaterial) {
+              mesh.material = options.overrideMaterials;
+            } else {
+              mesh.material = new MeshBasicMaterial();
+            }
+            disposeThreeMaterial(oldMat);
+          } else if (Capabilities.isLogDepthBufferSupported() && mesh.material.isRawShaderMaterial && !options.doNotPatchMaterial) {
+            shaderUtils.patchMaterialForLogDepthSupport(mesh.material);
+            console.warn('glTF shader has been patched to add log depth buffer support');
           }
+          ReferLayerProperties(mesh.material, options.layer);
+        }
+      };
+      promises.push(GLTFParser.parse(gltfBuffer, options).then(gltf => {
+        for (const scene of gltf.scenes) {
+          scene.traverse(filterUnsupportedSemantics);
+        }
+        applyDeprecatedGltfUpAxis(gltf.scene, options.gltfUpAxis);
+        const shouldBePatchedForLogDepthSupport = Capabilities.isLogDepthBufferSupported() && !options.doNotPatchMaterial;
+        if (options.frustumCulling === false || options.overrideMaterials || shouldBePatchedForLogDepthSupport || options.layer) {
+          gltf.scene.traverse(init_mesh);
+        }
 
-          // Apply relative center from Feature table.
-          gltf.scene.position.copy(FT_RTC);
+        // Apply relative center from Feature table.
+        gltf.scene.position.copy(FT_RTC);
 
-          // Apply relative center from gltf json.
-          const contentArray = new Uint8Array(gltfBuffer, 20, headerView.getUint32(12, true));
-          const content = utf8Decoder.decode(new Uint8Array(contentArray));
-          const json = JSON.parse(content);
-          if (json.extensions && json.extensions.CESIUM_RTC) {
-            gltf.scene.position.fromArray(json.extensions.CESIUM_RTC.center);
-            gltf.scene.updateMatrixWorld(true);
-          }
-          gltf.scene.traverse(function (mesh) {
-            mesh.frustumCulled = false;
-            if (mesh.material) {
-              if (options.overrideMaterials) {
-                const oldMat = mesh.material;
-                // Set up new material
-                if (typeof options.overrideMaterials === 'object' && options.overrideMaterials.isMaterial) {
-                  mesh.material = options.overrideMaterials;
-                } else {
-                  mesh.material = new THREE.MeshBasicMaterial();
-                }
-                (0, _ThreeUtils.default)(oldMat);
-              } else if (_Capabilities.default.isLogDepthBufferSupported() && mesh.material.isRawShaderMaterial && !options.doNotPatchMaterial) {
-                _ShaderUtils.default.patchMaterialForLogDepthSupport(mesh.material);
-                console.warn('b3dm shader has been patched to add log depth buffer support');
-              }
-              (0, _ReferencingLayerProperties.default)(mesh.material, options.layer);
-            }
-          });
-          resolve(gltf);
-        };
-        const version = headerView.getUint32(4, true);
-        if (version === 1) {
-          legacyGLTFLoader.parse(gltfBuffer, urlBase, onload);
-        } else {
-          glTFLoader.parse(gltfBuffer, urlBase, onload);
+        // Apply relative center from gltf json.
+        const contentArray = new Uint8Array(gltfBuffer, 20, headerView.getUint32(12, true));
+        const content = utf8Decoder.decode(new Uint8Array(contentArray));
+        const json = JSON.parse(content);
+        if (json.extensions && json.extensions.CESIUM_RTC) {
+          gltf.scene.position.fromArray(json.extensions.CESIUM_RTC.center);
+          gltf.scene.updateMatrixWorld(true);
         }
+        return gltf;
+      }).catch(e => {
+        throw new Error(e);
       }));
       return Promise.all(promises).then(values => ({
         gltf: values[1],
         batchTable: values[0]
-      }));
+      })).catch(e => {
+        throw new Error(e);
+      });
     } else {
       throw new Error('Invalid b3dm file.');
     }
   }
-};
-exports.default = _default;
+};

package/lib/Parser/CameraCalibrationParser.js

@@ -1,14 +1,6 @@
-"use strict";
+import * as THREE from 'three';
+import OrientedImageCamera from "../Renderer/OrientedImageCamera.js";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var THREE = _interopRequireWildcard(require("three"));
-var _OrientedImageCamera = _interopRequireDefault(require("../Renderer/OrientedImageCamera"));
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /**
  * The CameraCalibrationParser module provide a [parse]{@link module:CameraCalibrationParser.parse}
  * method that takes a JSON array of camera calibrations in and yields an array of {@link OrientedImageCamera}
@@ -35,7 +27,7 @@ function parseCalibration(calibration) {
   // To transform image space to webGl texture. It could inverse Y axis.
   const center = new THREE.Vector2(proj[2], imageYDown ? size.y - proj[5] : proj[5]);
   const skew = proj[1];
-  const camera = new _OrientedImageCamera.default(size, focal, center, options.near, options.far, skew);
+  const camera = new OrientedImageCamera(size, focal, center, options.near, options.far, skew);
 
   // parse extrinsics: Object3d.matrix is from local to world
   // p_world = position + transpose(rotation) * p_local
@@ -66,7 +58,7 @@ function parseCalibration(calibration) {
   }
   return deferred;
 }
-var _default = {
+export default {
   /**
    * Description of a camera calibration in a JSON file.
    *
@@ -99,5 +91,4 @@ var _default = {
     }
     return Promise.all(json.map(calibration => parseCalibration(calibration, options)));
   }
-};
-exports.default = _default;
+};

package/lib/Parser/GDFParser.js

@@ -1,18 +1,8 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-exports.getHeaderAttribute = getHeaderAttribute;
-var THREE = _interopRequireWildcard(require("three"));
-var _GeoidGrid = _interopRequireDefault(require("../Core/Geographic/GeoidGrid"));
-var _Extent = _interopRequireDefault(require("../Core/Geographic/Extent"));
-var _GTXParser = require("./GTXParser");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-function getHeaderAttribute(header, attributeName) {
+import * as THREE from 'three';
+import GeoidGrid from "../Core/Geographic/GeoidGrid.js";
+import Extent from "../Core/Geographic/Extent.js";
+import { BYTES_PER_DOUBLE } from "./GTXParser.js";
+export function getHeaderAttribute(header, attributeName) {
   const attributeRow = header[header.indexOf(header.find(element => element.includes(attributeName)))].split(' ').filter(value => value !== '');
   return parseFloat(attributeRow[attributeRow.length - 1]);
 }
@@ -24,7 +14,7 @@ function getHeaderAttribute(header, attributeName) {
  *
  * @module GDFParser
  */
-var _default = {
+export default {
   /**
    * Parses a GDF file content and returns a corresponding `{@link GeoidGrid}`.
    *
@@ -62,22 +52,21 @@ var _default = {
 
     // ---------- BUILD A DATA VIEWER FROM THE TEXT DATA : ----------
 
-    const data = new DataView(new ArrayBuffer(_GTXParser.BYTES_PER_DOUBLE * metadata.nRows * metadata.nColumns));
+    const data = new DataView(new ArrayBuffer(BYTES_PER_DOUBLE * metadata.nRows * metadata.nColumns));
     let index = 0;
     for (let row of rows.slice(firstMeasureLine, rows.length)) {
       row = row.split(' ').filter(value => value !== '');
       if (!row.length) {
         continue;
       }
-      data.setFloat64(index * _GTXParser.BYTES_PER_DOUBLE, parseFloat(row[2]));
+      data.setFloat64(index * BYTES_PER_DOUBLE, parseFloat(row[2]));
       index++;
     }
 
     // ---------- CREATE A GeoidGrid FOR THE GIVEN FILE DATA : ----------
 
-    const dataExtent = new _Extent.default(options.in.crs || 'EPSG:4326', metadata.minX, metadata.maxX, metadata.minY, metadata.maxY);
+    const dataExtent = new Extent(options.in.crs || 'EPSG:4326', metadata.minX, metadata.maxX, metadata.minY, metadata.maxY);
     const dataStep = new THREE.Vector2(metadata.stepX, metadata.stepY);
-    return Promise.resolve(new _GeoidGrid.default(dataExtent, dataStep, (verticalIndex, horizontalIndex) => data.getFloat64((metadata.nColumns * (metadata.nRows - verticalIndex - 1) + horizontalIndex) * _GTXParser.BYTES_PER_DOUBLE)));
+    return Promise.resolve(new GeoidGrid(dataExtent, dataStep, (verticalIndex, horizontalIndex) => data.getFloat64((metadata.nColumns * (metadata.nRows - verticalIndex - 1) + horizontalIndex) * BYTES_PER_DOUBLE)));
   }
-};
-exports.default = _default;
+};

package/lib/Parser/GLTFParser.js

@@ -0,0 +1,88 @@
+import * as THREE from 'three';
+import { GLTFLoader } from "../ThreeExtended/loaders/GLTFLoader.js";
+import { DRACOLoader } from "../ThreeExtended/loaders/DRACOLoader.js";
+import { KTX2Loader } from "../ThreeExtended/loaders/KTX2Loader.js";
+import LegacyGLTFLoader from "./deprecated/LegacyGLTFLoader.js";
+const matrixChangeUpVectorYtoZ = new THREE.Matrix4().makeRotationX(Math.PI / 2);
+export const glTFLoader = new GLTFLoader();
+export const legacyGLTFLoader = new LegacyGLTFLoader();
+
+/**
+ * @module GLTFParser
+ * @description Parses [glTF](https://www.khronos.org/gltf/) 1.0 and 2.0 files.
+ *
+ * Under the hood, glTF 2.0 files are parsed with THREE.GltfLoader() and GLTF 1.0 are parsed with the previous THREE
+ * GltfLoader (for 1.0 glTF) that has been kept and maintained in iTowns.
+ */
+
+/**
+ * Enable loading gltf files with [Draco](https://google.github.io/draco/) geometry extension.
+ *
+ * @param {String} path path to draco library folder containing the JS and WASM decoder libraries. They can be found in
+ * [itowns examples](https://github.com/iTowns/itowns/tree/master/examples/libs/draco).
+ * @param {Object} [config] optional configuration for Draco decoder (see threejs'
+ * [setDecoderConfig](https://threejs.org/docs/index.html?q=draco#examples/en/loaders/DRACOLoader.setDecoderConfig) that
+ * is called under the hood with this configuration for details.
+ */
+export function enableDracoLoader(path, config) {
+  if (!path) {
+    throw new Error('Path to draco folder is mandatory');
+  }
+  const dracoLoader = new DRACOLoader();
+  dracoLoader.setDecoderPath(path);
+  if (config) {
+    dracoLoader.setDecoderConfig(config);
+  }
+  glTFLoader.setDRACOLoader(dracoLoader);
+}
+
+/**
+ * Enable loading gltf files with [KTX2](https://www.khronos.org/ktx/) texture extension.
+ *
+ * @param {String} path path to ktx2 library folder containing the JS and WASM decoder libraries. They can be found in
+ * [itowns examples](https://github.com/iTowns/itowns/tree/master/examples/libs/basis).
+ * @param {THREE.WebGLRenderer} renderer the threejs renderer
+ */
+export function enableKtx2Loader(path, renderer) {
+  if (!path || !renderer) {
+    throw new Error('Path to ktx2 folder and renderer are mandatory');
+  }
+  const ktx2Loader = new KTX2Loader();
+  ktx2Loader.setTranscoderPath(path);
+  ktx2Loader.detectSupport(renderer);
+  glTFLoader.setKTX2Loader(ktx2Loader);
+}
+export default {
+  /** Parses a gltf buffer to an object with threejs structures and applies a y-up to z-up conversion to align with
+   * itowns convention. Essentially calls THREE.GltfLoader.parse() for glTF 2.0 files and the legacy threejs parser
+   * for gtTF 1.0 files.
+   * @param {ArrayBuffer} buffer - the glTF asset to parse, as an ArrayBuffer, JSON string or object.
+   * @param {String} path - the base path from which to find subsequent glTF resources such as textures and .bin data files.
+   * @return {Promise} - a promise that resolves with an object containing an Object that contains loaded parts:
+   * .scene, .scenes, .cameras, .animations, and .asset.
+   */
+  parse(buffer, path) {
+    return new Promise((resolve, reject) => {
+      if (!buffer || !path) {
+        reject(new Error('[GLTFParser]: Buffer and path are mandatory to parse a glTF.'));
+        return;
+      }
+
+      // Apply y-up (gltf convention) to z-up (itowns convention) conversion
+      const onload = gltf => {
+        gltf.scene.applyMatrix4(matrixChangeUpVectorYtoZ);
+        resolve(gltf);
+      };
+      const onError = e => {
+        reject(new Error(`[GLTFParser]: Failed to parse gltf with error: ${e}`));
+      };
+      const headerView = new DataView(buffer, 0, 20);
+      const version = headerView.getUint32(4, true);
+      if (version === 1) {
+        legacyGLTFLoader.parse(buffer, path, onload, onError);
+      } else {
+        glTFLoader.parse(buffer, path, onload, onError);
+      }
+    });
+  }
+};

package/lib/Parser/GTXParser.js

@@ -1,18 +1,8 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = exports.BYTES_PER_FLOAT = exports.BYTES_PER_DOUBLE = void 0;
-var THREE = _interopRequireWildcard(require("three"));
-var _GeoidGrid = _interopRequireDefault(require("../Core/Geographic/GeoidGrid"));
-var _Extent = _interopRequireDefault(require("../Core/Geographic/Extent"));
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-const BYTES_PER_DOUBLE = 8;
-exports.BYTES_PER_DOUBLE = BYTES_PER_DOUBLE;
-const BYTES_PER_FLOAT = 4;
+import * as THREE from 'three';
+import GeoidGrid from "../Core/Geographic/GeoidGrid.js";
+import Extent from "../Core/Geographic/Extent.js";
+export const BYTES_PER_DOUBLE = 8;
+export const BYTES_PER_FLOAT = 4;
 
 /**
  * The `GTXParser` module provides a `[parse]{@link module:GTXParser.parse}` method. This method takes the content of a
@@ -21,8 +11,7 @@ const BYTES_PER_FLOAT = 4;
  *
  * @module GTXParser
  */
-exports.BYTES_PER_FLOAT = BYTES_PER_FLOAT;
-var _default = {
+export default {
   /**
    * Parses a GTX file content and returns a corresponding `{@link GeoidGrid}`.
    *
@@ -70,9 +59,9 @@ var _default = {
     const maxX = metadata.minX + metadata.stepX * (metadata.nColumns - 1);
     // formula for the max latitude : maxLatitude = minLatitude + deltaLatitude * (nRows - 1)
     const maxY = metadata.minY + metadata.stepY * (metadata.nRows - 1);
-    const dataExtent = new _Extent.default(options.in.crs || 'EPSG:4326', metadata.minX, maxX, metadata.minY, maxY);
+    const dataExtent = new Extent(options.in.crs || 'EPSG:4326', metadata.minX, maxX, metadata.minY, maxY);
     const dataStep = new THREE.Vector2(metadata.stepX, metadata.stepY);
-    return Promise.resolve(new _GeoidGrid.default(dataExtent, dataStep, (verticalIndex, horizontalIndex) => {
+    return Promise.resolve(new GeoidGrid(dataExtent, dataStep, (verticalIndex, horizontalIndex) => {
       // formula to get the index of a geoid height from a latitude and longitude indexes is :
       // ``(nColumns * latIndex + lonIndex) * nBytes``, where nBytes stands for the number of bytes geoid
       // height data are encoded on.
@@ -83,5 +72,4 @@ var _default = {
       }
     }));
   }
-};
-exports.default = _default;
+};

package/lib/Parser/GeoJsonParser.js

@@ -1,13 +1,6 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _Coordinates = _interopRequireDefault(require("../Core/Geographic/Coordinates"));
-var _Feature = require("../Core/Feature");
-var _Undeprecator = require("../Core/Deprecated/Undeprecator");
+import Coordinates from "../Core/Geographic/Coordinates.js";
+import { FeatureCollection, FEATURE_TYPES } from "../Core/Feature.js";
+import { deprecatedParsingOptionsToNewOne } from "../Core/Deprecated/Undeprecator.js";
 function readCRS(json) {
   if (json.crs) {
     if (json.crs.type.toLowerCase() == 'epsg') {
@@ -28,9 +21,9 @@ function readCRS(json) {
   // assume default crs
   return 'EPSG:4326';
 }
-const coord = new _Coordinates.default('EPSG:4978', 0, 0, 0);
-const last = new _Coordinates.default('EPSG:4978', 0, 0, 0);
-const first = new _Coordinates.default('EPSG:4978', 0, 0, 0);
+const coord = new Coordinates('EPSG:4978', 0, 0, 0);
+const last = new Coordinates('EPSG:4978', 0, 0, 0);
+const first = new Coordinates('EPSG:4978', 0, 0, 0);
 
 // filter with the first point
 const firstPtIsOut = (extent, aCoords, crs) => {
@@ -124,13 +117,13 @@ function toFeatureType(jsonType) {
   switch (jsonType) {
     case 'point':
     case 'multipoint':
-      return _Feature.FEATURE_TYPES.POINT;
+      return FEATURE_TYPES.POINT;
     case 'linestring':
     case 'multilinestring':
-      return _Feature.FEATURE_TYPES.LINE;
+      return FEATURE_TYPES.LINE;
     case 'polygon':
     case 'multipolygon':
-      return _Feature.FEATURE_TYPES.POLYGON;
+      return FEATURE_TYPES.POLYGON;
     case 'geometrycollection':
     default:
       throw new Error(`Unhandled geometry type ${jsonType}`);
@@ -164,7 +157,7 @@ function jsonFeatureToFeature(crsIn, json, collection) {
   return feature;
 }
 function jsonFeaturesToFeatures(crsIn, jsonFeatures, options) {
-  const collection = new _Feature.FeatureCollection(options);
+  const collection = new FeatureCollection(options);
   const filter = options.filter || (() => true);
   for (const jsonFeature of jsonFeatures) {
     if (filter(jsonFeature.properties, jsonFeature.geometry)) {
@@ -183,7 +176,7 @@ function jsonFeaturesToFeatures(crsIn, jsonFeatures, options) {
  *
  * @module GeoJsonParser
  */
-var _default = {
+export default {
   /**
    * Parse a GeoJSON file content and return a [FeatureCollection]{@link FeatureCollection}.
    *
@@ -193,7 +186,7 @@ var _default = {
    */
   parse(json) {
     let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    options = (0, _Undeprecator.deprecatedParsingOptionsToNewOne)(options);
+    options = deprecatedParsingOptionsToNewOne(options);
     options.in = options.in || {};
     const out = options.out;
     const _in = options.in;
@@ -203,7 +196,7 @@ var _default = {
     _in.crs = _in.crs || readCRS(json);
     if (out.filteringExtent) {
       if (typeof out.filteringExtent == 'boolean') {
-        out.filterExtent = json.extent.as(_in.crs);
+        out.filterExtent = options.extent.as(_in.crs);
       } else if (out.filteringExtent.isExtent) {
         out.filterExtent = out.filteringExtent;
       }
@@ -217,5 +210,4 @@ var _default = {
         throw new Error(`Unsupported GeoJSON type: '${json.type}`);
     }
   }
-};
-exports.default = _default;
+};