itowns 2.42.1-next.8 → 2.43.0

package/lib/Provider/URLBuilder.js

@@ -1,12 +1,5 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _Extent = _interopRequireDefault(require("../Core/Geographic/Extent"));
-const extent = new _Extent.default('EPSG:4326', [0, 0, 0, 0]);
+import Extent from "../Core/Geographic/Extent.js";
+const extent = new Extent('EPSG:4326', [0, 0, 0, 0]);
 let subDomainsCount = 0;
 function subDomains(url) {
   const subDomainsPtrn = /\$\{u:([\w-_.|]+)\}/.exec(url);
@@ -29,7 +22,7 @@ function subDomains(url) {
  *
  * @module URLBuilder
  */
-var _default = {
+export default {
   subDomains,
   /**
    * Builds an URL knowing the coordinates and the source to query.
@@ -109,5 +102,4 @@ var _default = {
     bboxInUnit = bboxInUnit.replace('w', `${w},`).replace('s', `${s},`).replace('e', `${e},`).replace('n', `${n},`).slice(0, -1);
     return subDomains(source.url.replace('%bbox', bboxInUnit));
   }
-};
-exports.default = _default;
+};

package/lib/Renderer/Camera.js

@@ -1,15 +1,7 @@
-"use strict";
+import * as THREE from 'three';
+import Coordinates from "../Core/Geographic/Coordinates.js";
+import DEMUtils from "../Utils/DEMUtils.js";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = exports.CAMERA_TYPE = void 0;
-var THREE = _interopRequireWildcard(require("three"));
-var _Coordinates = _interopRequireDefault(require("../Core/Geographic/Coordinates"));
-var _DEMUtils = _interopRequireDefault(require("../Utils/DEMUtils"));
-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; }
 /**
  * @typedef     {object}    Camera~CAMERA_TYPE
  * Stores the different types of camera usable in iTowns.
@@ -17,11 +9,10 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  * @property    {number}    PERSPECTIVE     Perspective type of camera
  * @property    {number}    ORTHOGRAPHIC    Orthographic type of camera
  */
-const CAMERA_TYPE = {
+export const CAMERA_TYPE = {
   PERSPECTIVE: 0,
   ORTHOGRAPHIC: 1
 };
-exports.CAMERA_TYPE = CAMERA_TYPE;
 const tmp = {
   frustum: new THREE.Frustum(),
   matrix: new THREE.Matrix4(),
@@ -182,7 +173,7 @@ class Camera {
    * @return  {Coordinates}   Coordinates object holding camera's position.
    */
   position(crs) {
-    return new _Coordinates.default(this.crs, this.camera3D.position).as(crs || this.crs);
+    return new Coordinates(this.crs, this.camera3D.position).as(crs || this.crs);
   }
 
   /**
@@ -243,7 +234,7 @@ class Camera {
     // (Should be improved in Coordinates class for all ref)
     const camLocation = view.camera.position().as('EPSG:4326');
     if (elevationLayer !== undefined) {
-      const elevationUnderCamera = _DEMUtils.default.getElevationValueAt(elevationLayer, camLocation);
+      const elevationUnderCamera = DEMUtils.getElevationValueAt(elevationLayer, camLocation);
       if (elevationUnderCamera !== undefined) {
         const difElevation = camLocation.altitude - (elevationUnderCamera + minDistanceCollision);
         // We move the camera to avoid collision if too close to terrain
@@ -287,5 +278,4 @@ function projectBox3PointsInCameraSpace(camera, box3, matrixWorld) {
   }
   return atLeastOneInFrontOfNearPlane ? points : undefined;
 }
-var _default = Camera;
-exports.default = _default;
+export default Camera;

package/lib/Renderer/Color.js

@@ -1,12 +1,4 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.deltaE = deltaE;
-exports.lab2rgb = lab2rgb;
-exports.rgb2lab = rgb2lab;
-function lab2rgb(lab) {
+export function lab2rgb(lab) {
   let y = (lab[0] + 16) / 116;
   let x = lab[1] / 500 + y;
   let z = y - lab[2] / 200;
@@ -24,7 +16,7 @@ function lab2rgb(lab) {
   b = b > 0.0031308 ? 1.055 * b ** (1 / 2.4) - 0.055 : 12.92 * b;
   return [Math.max(0, Math.min(1, r)) * 255, Math.max(0, Math.min(1, g)) * 255, Math.max(0, Math.min(1, b)) * 255];
 }
-function rgb2lab(rgb) {
+export function rgb2lab(rgb) {
   let r = rgb.r || rgb[0] / 255;
   let g = rgb.g || rgb[1] / 255;
   let b = rgb.b || rgb[2] / 255;
@@ -45,7 +37,7 @@ function rgb2lab(rgb) {
 
 // calculate the perceptual distance between colors in CIELAB
 // https://github.com/THEjoezack/ColorMine/blob/master/ColorMine/ColorSpaces/Comparisons/Cie94Comparison.cs
-function deltaE(rgbA, rgbB) {
+export function deltaE(rgbA, rgbB) {
   const labA = rgb2lab(rgbA);
   const labB = rgb2lab(rgbB);
   const deltaL = labA[0] - labB[0];

package/lib/Renderer/ColorLayersOrdering.js

@@ -1,12 +1,6 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = exports.COLOR_LAYERS_ORDER_CHANGED = void 0;
-var _Layer = require("../Layer/Layer");
+import { ImageryLayers } from "../Layer/Layer.js";
 function updateLayersOrdering(geometryLayer, imageryLayers) {
-  const sequence = _Layer.ImageryLayers.getColorLayersIdOrderedBySequence(imageryLayers);
+  const sequence = ImageryLayers.getColorLayersIdOrderedBySequence(imageryLayers);
   const cO = function (object) {
     var _object$material;
     if ((_object$material = object.material) !== null && _object$material !== void 0 && _object$material.setSequence) {
@@ -17,15 +11,14 @@ function updateLayersOrdering(geometryLayer, imageryLayers) {
     node.traverse(cO);
   }
 }
-const COLOR_LAYERS_ORDER_CHANGED = 'layers-order-changed';
+export const COLOR_LAYERS_ORDER_CHANGED = 'layers-order-changed';
 
 /**
  * Utilitary to organize {@link ColorLayer} in a {@link View}.
  *
  * @module ColorLayersOrdering
  */
-exports.COLOR_LAYERS_ORDER_CHANGED = COLOR_LAYERS_ORDER_CHANGED;
-var _default = {
+export default {
   /**
    * Moves up in the layer list. This function has no effect if the layer is
    * moved to its current index.
@@ -40,8 +33,8 @@ var _default = {
     const imageryLayers = view.getLayers(l => l.isColorLayer);
     const layer = view.getLayerById(layerId);
     if (layer) {
-      const previousSequence = _Layer.ImageryLayers.getColorLayersIdOrderedBySequence(imageryLayers);
-      _Layer.ImageryLayers.moveLayerUp(layer, imageryLayers);
+      const previousSequence = ImageryLayers.getColorLayersIdOrderedBySequence(imageryLayers);
+      ImageryLayers.moveLayerUp(layer, imageryLayers);
       updateLayersOrdering(view.tileLayer, imageryLayers);
       view.dispatchEvent({
         type: COLOR_LAYERS_ORDER_CHANGED,
@@ -49,7 +42,7 @@ var _default = {
           sequence: previousSequence
         },
         new: {
-          sequence: _Layer.ImageryLayers.getColorLayersIdOrderedBySequence(imageryLayers)
+          sequence: ImageryLayers.getColorLayersIdOrderedBySequence(imageryLayers)
         }
       });
       view.notifyChange(view.tileLayer);
@@ -71,8 +64,8 @@ var _default = {
     const imageryLayers = view.getLayers(l => l.isColorLayer);
     const layer = view.getLayerById(layerId);
     if (layer) {
-      const previousSequence = _Layer.ImageryLayers.getColorLayersIdOrderedBySequence(imageryLayers);
-      _Layer.ImageryLayers.moveLayerDown(layer, imageryLayers);
+      const previousSequence = ImageryLayers.getColorLayersIdOrderedBySequence(imageryLayers);
+      ImageryLayers.moveLayerDown(layer, imageryLayers);
       updateLayersOrdering(view.tileLayer, imageryLayers);
       view.dispatchEvent({
         type: COLOR_LAYERS_ORDER_CHANGED,
@@ -80,7 +73,7 @@ var _default = {
           sequence: previousSequence
         },
         new: {
-          sequence: _Layer.ImageryLayers.getColorLayersIdOrderedBySequence(imageryLayers)
+          sequence: ImageryLayers.getColorLayersIdOrderedBySequence(imageryLayers)
         }
       });
       view.notifyChange(view.tileLayer);
@@ -103,8 +96,8 @@ var _default = {
     const imageryLayers = view.getLayers(l => l.isColorLayer);
     const layer = view.getLayerById(layerId);
     if (layer) {
-      const previousSequence = _Layer.ImageryLayers.getColorLayersIdOrderedBySequence(imageryLayers);
-      _Layer.ImageryLayers.moveLayerToIndex(layer, index, imageryLayers);
+      const previousSequence = ImageryLayers.getColorLayersIdOrderedBySequence(imageryLayers);
+      ImageryLayers.moveLayerToIndex(layer, index, imageryLayers);
       updateLayersOrdering(view.tileLayer, imageryLayers);
       view.dispatchEvent({
         type: COLOR_LAYERS_ORDER_CHANGED,
@@ -112,7 +105,7 @@ var _default = {
           sequence: previousSequence
         },
         new: {
-          sequence: _Layer.ImageryLayers.getColorLayersIdOrderedBySequence(imageryLayers)
+          sequence: ImageryLayers.getColorLayersIdOrderedBySequence(imageryLayers)
         }
       });
       view.notifyChange(view.tileLayer);
@@ -120,5 +113,4 @@ var _default = {
       throw new Error(`${layerId} isn't color layer`);
     }
   }
-};
-exports.default = _default;
+};

package/lib/Renderer/CommonMaterial.js

@@ -1,13 +1,5 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var THREE = _interopRequireWildcard(require("three"));
-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; }
-var _default = {
+import * as THREE from 'three';
+export default {
   setDefineMapping(object, PROPERTY, mapping) {
     Object.keys(mapping).forEach(key => {
       object.defines[`${PROPERTY}_${key}`] = mapping[key];
@@ -36,5 +28,4 @@ var _default = {
       }
     });
   }
-};
-exports.default = _default;
+};

package/lib/Renderer/Label2DRenderer.js

@@ -1,21 +1,12 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = exports.ScreenGrid = void 0;
-var THREE = _interopRequireWildcard(require("three"));
-var _GlobeLayer = _interopRequireDefault(require("../Core/Prefab/Globe/GlobeLayer"));
-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';
+import GlobeLayer from "../Core/Prefab/Globe/GlobeLayer.js";
 function isIntersectedOrOverlaped(a, b) {
   return !(a.left > b.right || a.right < b.left || a.top > b.bottom || a.bottom < b.top);
 }
 const frustum = new THREE.Frustum();
 
 // A grid to manage labels on the screen.
-class ScreenGrid {
+export class ScreenGrid {
   constructor() {
     let x = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 12;
     let y = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 10;
@@ -83,7 +74,6 @@ class ScreenGrid {
     return true;
   }
 }
-exports.ScreenGrid = ScreenGrid;
 const worldPosition = new THREE.Vector3();
 
 /**
@@ -180,7 +170,7 @@ class Label2DRenderer {
     if (!frustum.containsPoint(worldPosition.applyMatrix4(camera.matrixWorldInverse)) ||
     // Check if globe horizon culls the label
     // Do some horizon culling (if possible) if the tiles level is small enough.
-    label.horizonCullingPoint && _GlobeLayer.default.horizonCulling(label.horizonCullingPoint) ||
+    label.horizonCullingPoint && GlobeLayer.horizonCulling(label.horizonCullingPoint) ||
     // Check if content isn't present in visible labels
     this.grid.visible.some(l => {
       // TODO for icon without text filter by position
@@ -200,5 +190,4 @@ class Label2DRenderer {
     this.garbage.innerHTML = '';
   }
 }
-var _default = Label2DRenderer;
-exports.default = _default;
+export default Label2DRenderer;

package/lib/Renderer/LayeredMaterial.js

@@ -1,30 +1,19 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = exports.colorLayerEffects = exports.ELEVATION_MODES = void 0;
-exports.getMaxColorSamplerUnitsCount = getMaxColorSamplerUnitsCount;
-exports.unpack1K = unpack1K;
-var THREE = _interopRequireWildcard(require("three"));
-var _ShaderUtils = _interopRequireDefault(require("./Shader/ShaderUtils"));
-var _Capabilities = _interopRequireDefault(require("../Core/System/Capabilities"));
-var _RenderMode = _interopRequireDefault(require("./RenderMode"));
-var _CommonMaterial = _interopRequireDefault(require("./CommonMaterial"));
-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';
 /* babel-plugin-inline-import './Shader/TileVS.glsl' */
-const TileVS = "#include <itowns/WebGL2_pars_vertex>\n#include <itowns/precision_qualifier>\n#include <common>\n#include <itowns/project_pars_vertex>\n#include <itowns/elevation_pars_vertex>\n#include <logdepthbuf_pars_vertex>\nattribute vec2      uv_0;\n#if NUM_CRS > 1\nattribute float     uv_1;\n#endif\nattribute vec3      normal;\n\nuniform mat4 modelMatrix;\nuniform bool lightingEnabled;\nvarying vec2 vHighPrecisionZW;\n\n#if MODE == MODE_FINAL\n#include <fog_pars_vertex>\nvarying vec3        vUv;\nvarying vec3        vNormal;\n#endif\nvoid main() {\n        vec2 uv = vec2(uv_0.x, 1.0 - uv_0.y);\n\n        #include <begin_vertex>\n        #include <itowns/elevation_vertex>\n        #include <itowns/geoid_vertex>\n        #include <project_vertex>\n        #include <logdepthbuf_vertex>\n        vHighPrecisionZW = gl_Position.zw;\n#if MODE == MODE_FINAL\n        #include <fog_vertex>\n        #if NUM_CRS > 1\n        vUv = vec3(uv_0, (uv_1 > 0.) ? uv_1 : uv_0.y); // set uv_1 = uv_0 if uv_1 is undefined\n        #else\n        vUv = vec3(uv_0, 0.0);\n        #endif\n        vNormal = normalize ( mat3( modelMatrix[0].xyz, modelMatrix[1].xyz, modelMatrix[2].xyz ) * normal );\n#endif\n}\n";
+const TileVS = "#include <itowns/precision_qualifier>\n#include <common>\n#include <itowns/elevation_pars_vertex>\n#include <logdepthbuf_pars_vertex>\n#if NUM_CRS > 1\nattribute float     uv_1;\n#endif\n\nuniform bool lightingEnabled;\nvarying vec2 vHighPrecisionZW;\n\n#if MODE == MODE_FINAL\n#include <fog_pars_vertex>\nvarying vec3        vUv;\nvarying vec3        vNormal;\n#endif\nvoid main() {\n        #include <begin_vertex>\n        #include <itowns/elevation_vertex>\n        #include <itowns/geoid_vertex>\n        #include <project_vertex>\n        #include <logdepthbuf_vertex>\n        vHighPrecisionZW = gl_Position.zw;\n#if MODE == MODE_FINAL\n        #include <fog_vertex>\n        #if NUM_CRS > 1\n        vUv = vec3(uv, (uv_1 > 0.) ? uv_1 : uv.y); // set uv_1 = uv if uv_1 is undefined\n        #else\n        vUv = vec3(uv, 0.0);\n        #endif\n        vNormal = normalize ( mat3( modelMatrix[0].xyz, modelMatrix[1].xyz, modelMatrix[2].xyz ) * normal );\n#endif\n}\n";
 /* babel-plugin-inline-import './Shader/TileFS.glsl' */
-const TileFS = "#include <itowns/WebGL2_pars_fragment>\n#include <itowns/precision_qualifier>\n#include <logdepthbuf_pars_fragment>\n#include <itowns/pitUV>\n#include <itowns/color_layers_pars_fragment>\n#if MODE == MODE_FINAL\n#include <itowns/fog_pars_fragment>\n#include <itowns/overlay_pars_fragment>\n#include <itowns/lighting_pars_fragment>\n#endif\n#include <itowns/mode_pars_fragment>\n\nuniform vec3        diffuse;\nuniform float       opacity;\nvarying vec3        vUv; // uv_0.x/uv_1.x, uv_0.y, uv_1.y\nvarying vec2        vHighPrecisionZW;\n\nvoid main() {\n    #include <logdepthbuf_fragment>\n\n#if MODE == MODE_ID\n\n    #include <itowns/mode_id_fragment>\n\n#elif MODE == MODE_DEPTH\n\n    #include <itowns/mode_depth_fragment>\n\n#else\n\n    gl_FragColor = vec4(diffuse, opacity);\n\n    uvs[0] = vec3(vUv.xy, 0.);\n\n#if NUM_CRS > 1\n    uvs[1] = vec3(vUv.x, fract(vUv.z), floor(vUv.z));\n#endif\n\n    vec4 color;\n    #pragma unroll_loop\n    for ( int i = 0; i < NUM_FS_TEXTURES; i ++ ) {\n        color = getLayerColor( i , colorTextures[ i ], colorOffsetScales[ i ], colorLayers[ i ]);\n        gl_FragColor.rgb = mix(gl_FragColor.rgb, color.rgb, color.a);\n    }\n\n  #if defined(DEBUG)\n    if (showOutline) {\n        #pragma unroll_loop\n        for ( int i = 0; i < NUM_CRS; i ++) {\n            color = getOutlineColor( outlineColors[ i ], uvs[ i ].xy);\n            gl_FragColor.rgb = mix(gl_FragColor.rgb, color.rgb, color.a);\n        }\n    }\n  #endif\n\n    #include <itowns/fog_fragment>\n    #include <itowns/lighting_fragment>\n    #include <itowns/overlay_fragment>\n\n#endif\n}\n";
+const TileFS = "#include <itowns/precision_qualifier>\n#include <logdepthbuf_pars_fragment>\n#include <itowns/pitUV>\n#include <itowns/color_layers_pars_fragment>\n#if MODE == MODE_FINAL\n#include <itowns/fog_pars_fragment>\n#include <itowns/overlay_pars_fragment>\n#include <itowns/lighting_pars_fragment>\n#endif\n#include <itowns/mode_pars_fragment>\n\nuniform vec3        diffuse;\nuniform float       opacity;\nvarying vec3        vUv; // uv.x/uv_1.x, uv.y, uv_1.y\nvarying vec2        vHighPrecisionZW;\n\nvoid main() {\n    #include <logdepthbuf_fragment>\n\n#if MODE == MODE_ID\n\n    #include <itowns/mode_id_fragment>\n\n#elif MODE == MODE_DEPTH\n\n    #include <itowns/mode_depth_fragment>\n\n#else\n\n    gl_FragColor = vec4(diffuse, opacity);\n\n    uvs[0] = vec3(vUv.xy, 0.);\n\n#if NUM_CRS > 1\n    uvs[1] = vec3(vUv.x, fract(vUv.z), floor(vUv.z));\n#endif\n\n    vec4 color;\n    #pragma unroll_loop\n    for ( int i = 0; i < NUM_FS_TEXTURES; i ++ ) {\n        color = getLayerColor( i , colorTextures[ i ], colorOffsetScales[ i ], colorLayers[ i ]);\n        gl_FragColor.rgb = mix(gl_FragColor.rgb, color.rgb, color.a);\n    }\n\n  #if defined(DEBUG)\n    if (showOutline) {\n        #pragma unroll_loop\n        for ( int i = 0; i < NUM_CRS; i ++) {\n            color = getOutlineColor( outlineColors[ i ], uvs[ i ].xy);\n            gl_FragColor.rgb = mix(gl_FragColor.rgb, color.rgb, color.a);\n        }\n    }\n  #endif\n\n    #include <itowns/fog_fragment>\n    #include <itowns/lighting_fragment>\n    #include <itowns/overlay_fragment>\n\n#endif\n}\n";
+import ShaderUtils from "./Shader/ShaderUtils.js";
+import Capabilities from "../Core/System/Capabilities.js";
+import RenderMode from "./RenderMode.js";
+import CommonMaterial from "./CommonMaterial.js";
 const identityOffsetScale = new THREE.Vector4(0.0, 0.0, 1.0, 1.0);
 const defaultTex = new THREE.Texture();
 
 // from three.js packDepthToRGBA
 const UnpackDownscale = 255 / 256; // 0..1 -> fraction (excluding 1)
 const bitSh = new THREE.Vector4(UnpackDownscale / (256.0 * 256.0 * 256.0), UnpackDownscale / (256.0 * 256.0), UnpackDownscale / 256.0, UnpackDownscale);
-function unpack1K(color, factor) {
+export function unpack1K(color, factor) {
   return factor ? bitSh.dot(color) * factor : bitSh.dot(color);
 }
 
@@ -32,17 +21,16 @@ function unpack1K(color, factor) {
 // Because there's a statement limitation to unroll, in getColorAtIdUv method
 const maxSamplersColorCount = 15;
 const samplersElevationCount = 1;
-function getMaxColorSamplerUnitsCount() {
-  const maxSamplerUnitsCount = _Capabilities.default.getMaxTextureUnitsCount();
+export function getMaxColorSamplerUnitsCount() {
+  const maxSamplerUnitsCount = Capabilities.getMaxTextureUnitsCount();
   return Math.min(maxSamplerUnitsCount - samplersElevationCount, maxSamplersColorCount);
 }
-const colorLayerEffects = {
+export const colorLayerEffects = {
   noEffect: 0,
   removeLightColor: 1,
   removeWhiteColor: 2,
   customEffect: 3
 };
-exports.colorLayerEffects = colorLayerEffects;
 const defaultStructLayer = {
   bias: 0,
   noDataValue: -99999,
@@ -90,15 +78,14 @@ function updateLayersUniforms(uniforms, olayers, max) {
     layers[i] = defaultStructLayer;
   }
 }
-const ELEVATION_MODES = {
+export const ELEVATION_MODES = {
   RGBA: 0,
   COLOR: 1,
   DATA: 2
 };
-exports.ELEVATION_MODES = ELEVATION_MODES;
 let nbSamplers;
 const fragmentShader = [];
-class LayeredMaterial extends THREE.RawShaderMaterial {
+class LayeredMaterial extends THREE.ShaderMaterial {
   #_visible = true;
   constructor() {
     let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -107,40 +94,40 @@ class LayeredMaterial extends THREE.RawShaderMaterial {
     nbSamplers = nbSamplers || [samplersElevationCount, getMaxColorSamplerUnitsCount()];
     this.defines.NUM_VS_TEXTURES = nbSamplers[0];
     this.defines.NUM_FS_TEXTURES = nbSamplers[1];
+    // TODO: We do not use the fog from the scene, is this a desired
+    // behavior?
     this.defines.USE_FOG = 1;
     this.defines.NUM_CRS = crsCount;
-    _CommonMaterial.default.setDefineMapping(this, 'ELEVATION', ELEVATION_MODES);
-    _CommonMaterial.default.setDefineMapping(this, 'MODE', _RenderMode.default.MODES);
-    _CommonMaterial.default.setDefineProperty(this, 'mode', 'MODE', _RenderMode.default.MODES.FINAL);
-    if (_Capabilities.default.isLogDepthBufferSupported()) {
-      this.defines.USE_LOGDEPTHBUF = 1;
-      this.defines.USE_LOGDEPTHBUF_EXT = 1;
-    }
+    CommonMaterial.setDefineMapping(this, 'ELEVATION', ELEVATION_MODES);
+    CommonMaterial.setDefineMapping(this, 'MODE', RenderMode.MODES);
+    CommonMaterial.setDefineProperty(this, 'mode', 'MODE', RenderMode.MODES.FINAL);
     this.vertexShader = TileVS;
-    fragmentShader[crsCount] = fragmentShader[crsCount] || _ShaderUtils.default.unrollLoops(TileFS, this.defines);
+    // three loop unrolling of ShaderMaterial only supports integer bounds,
+    // see https://github.com/mrdoob/three.js/issues/28020
+    fragmentShader[crsCount] = fragmentShader[crsCount] || ShaderUtils.unrollLoops(TileFS, this.defines);
     this.fragmentShader = fragmentShader[crsCount];
 
     // Color uniforms
-    _CommonMaterial.default.setUniformProperty(this, 'diffuse', new THREE.Color(0.04, 0.23, 0.35));
-    _CommonMaterial.default.setUniformProperty(this, 'opacity', this.opacity);
+    CommonMaterial.setUniformProperty(this, 'diffuse', new THREE.Color(0.04, 0.23, 0.35));
+    CommonMaterial.setUniformProperty(this, 'opacity', this.opacity);
 
     // Lighting uniforms
-    _CommonMaterial.default.setUniformProperty(this, 'lightingEnabled', false);
-    _CommonMaterial.default.setUniformProperty(this, 'lightPosition', new THREE.Vector3(-0.5, 0.0, 1.0));
+    CommonMaterial.setUniformProperty(this, 'lightingEnabled', false);
+    CommonMaterial.setUniformProperty(this, 'lightPosition', new THREE.Vector3(-0.5, 0.0, 1.0));
 
     // Misc properties
-    _CommonMaterial.default.setUniformProperty(this, 'fogDistance', 1000000000.0);
-    _CommonMaterial.default.setUniformProperty(this, 'fogColor', new THREE.Color(0.76, 0.85, 1.0));
-    _CommonMaterial.default.setUniformProperty(this, 'overlayAlpha', 0);
-    _CommonMaterial.default.setUniformProperty(this, 'overlayColor', new THREE.Color(1.0, 0.3, 0.0));
-    _CommonMaterial.default.setUniformProperty(this, 'objectId', 0);
-    _CommonMaterial.default.setUniformProperty(this, 'geoidHeight', 0.0);
+    CommonMaterial.setUniformProperty(this, 'fogDistance', 1000000000.0);
+    CommonMaterial.setUniformProperty(this, 'fogColor', new THREE.Color(0.76, 0.85, 1.0));
+    CommonMaterial.setUniformProperty(this, 'overlayAlpha', 0);
+    CommonMaterial.setUniformProperty(this, 'overlayColor', new THREE.Color(1.0, 0.3, 0.0));
+    CommonMaterial.setUniformProperty(this, 'objectId', 0);
+    CommonMaterial.setUniformProperty(this, 'geoidHeight', 0.0);
 
     // > 0 produces gaps,
     // < 0 causes oversampling of textures
     // = 0 causes sampling artefacts due to bad estimation of texture-uv gradients
     // best is a small negative number
-    _CommonMaterial.default.setUniformProperty(this, 'minBorderDistance', -0.01);
+    CommonMaterial.setUniformProperty(this, 'minBorderDistance', -0.01);
 
     // LayeredMaterialLayers
     this.layers = [];
@@ -183,12 +170,6 @@ class LayeredMaterial extends THREE.RawShaderMaterial {
       }
     });
   }
-  onBeforeCompile(shader, renderer) {
-    if (renderer.capabilities.isWebGL2) {
-      this.defines.WEBGL2 = true;
-      shader.glslVersion = '300 es';
-    }
-  }
   getUniformByType(type) {
     return {
       layers: this.uniforms[`${type}Layers`],
@@ -259,5 +240,4 @@ class LayeredMaterial extends THREE.RawShaderMaterial {
     }
   }
 }
-var _default = LayeredMaterial;
-exports.default = _default;
+export default LayeredMaterial;

package/lib/Renderer/OBB.js

@@ -1,26 +1,18 @@
-"use strict";
+import * as THREE from 'three';
+import TileGeometry from "../Core/TileGeometry.js";
+import BuilderEllipsoidTile from "../Core/Prefab/Globe/BuilderEllipsoidTile.js";
+import Coordinates from "../Core/Geographic/Coordinates.js";
+import CRS from "../Core/Geographic/Crs.js";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var THREE = _interopRequireWildcard(require("three"));
-var _TileGeometry = _interopRequireDefault(require("../Core/TileGeometry"));
-var _BuilderEllipsoidTile = _interopRequireDefault(require("../Core/Prefab/Globe/BuilderEllipsoidTile"));
-var _Coordinates = _interopRequireDefault(require("../Core/Geographic/Coordinates"));
-var _Crs = _interopRequireDefault(require("../Core/Geographic/Crs"));
-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; }
 // get oriented bounding box of tile
-const builder = new _BuilderEllipsoidTile.default({
+const builder = new BuilderEllipsoidTile({
   crs: 'EPSG:4978',
   uvCount: 1
 });
 const size = new THREE.Vector3();
 const dimension = new THREE.Vector2();
 const center = new THREE.Vector3();
-const coord = new _Coordinates.default('EPSG:4326', 0, 0, 0);
+const coord = new Coordinates('EPSG:4326', 0, 0, 0);
 let obb;
 
 // it could be considered to remove THREE.Object3D extend.
@@ -126,11 +118,11 @@ class OBB extends THREE.Object3D {
         position
       } = builder.computeSharableExtent(extent);
       // Compute the minimum count of segment to build tile
-      const segment = Math.max(Math.floor(sharableExtent.planarDimensions(dimension).x / 90 + 1), 2);
-      const geometry = new _TileGeometry.default({
+      const segments = Math.max(Math.floor(sharableExtent.planarDimensions(dimension).x / 90 + 1), 2);
+      const geometry = new TileGeometry({
         extent: sharableExtent,
         level: 0,
-        segment,
+        segments,
         disableSkirt: true,
         builder
       });
@@ -144,7 +136,7 @@ class OBB extends THREE.Object3D {
       this.position.copy(position);
       this.quaternion.copy(quaternion);
       this.updateMatrixWorld(true);
-    } else if (!_Crs.default.isTms(extent.crs) && _Crs.default.isMetricUnit(extent.crs)) {
+    } else if (!CRS.isTms(extent.crs) && CRS.isMetricUnit(extent.crs)) {
       extent.center(coord).toVector3(this.position);
       extent.planarDimensions(dimension);
       size.set(dimension.x, dimension.y, Math.abs(maxHeight - minHeight));
@@ -157,5 +149,4 @@ class OBB extends THREE.Object3D {
   }
 }
 obb = new OBB();
-var _default = OBB;
-exports.default = _default;
+export default OBB;

package/lib/Renderer/OrientedImageCamera.js

@@ -1,12 +1,4 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var THREE = _interopRequireWildcard(require("three"));
-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';
 class Distortion {
   constructor(size) {
     this.size = size;
@@ -124,5 +116,4 @@ class OrientedImageCamera extends THREE.PerspectiveCamera {
     return this;
   }
 }
-var _default = OrientedImageCamera;
-exports.default = _default;
+export default OrientedImageCamera;