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

package/lib/Renderer/OrientedImageMaterial.js

@@ -1,24 +1,15 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var THREE = _interopRequireWildcard(require("three"));
-var _Capabilities = _interopRequireDefault(require("../Core/System/Capabilities"));
-var _ShaderUtils = _interopRequireDefault(require("./Shader/ShaderUtils"));
-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 Capabilities from "../Core/System/Capabilities.js";
 /* babel-plugin-inline-import './Shader/ProjectiveTextureVS.glsl' */
-const textureVS = "#include <itowns/WebGL2_pars_vertex>\n#include <itowns/precision_qualifier>\n#include <itowns/project_pars_vertex>\n#include <itowns/projective_texturing_pars_vertex>\n#include <common>\n#include <logdepthbuf_pars_vertex>\n\nvarying vec3 vNormal;\nattribute vec3 normal;\n\nvoid main() {\n    #include <begin_vertex>\n    #include <project_vertex>\n    vNormal = normal;\n    #include <itowns/projective_texturing_vertex>\n    #include <logdepthbuf_vertex>\n}\n";
+const textureVS = "#include <itowns/precision_qualifier>\n#include <itowns/projective_texturing_pars_vertex>\n#include <common>\n#include <logdepthbuf_pars_vertex>\n\nvarying vec3 vNormal;\n\nvoid main() {\n    #include <begin_vertex>\n    #include <project_vertex>\n    vNormal = normal;\n    #include <itowns/projective_texturing_vertex>\n    #include <logdepthbuf_vertex>\n}\n";
 /* babel-plugin-inline-import './Shader/ProjectiveTextureFS.glsl' */
-const textureFS = "#include <itowns/WebGL2_pars_fragment>\n#include <itowns/precision_qualifier>\n#include <logdepthbuf_pars_fragment>\n#include <itowns/projective_texturing_pars_fragment>\nvarying vec3 vNormal;\n\n#ifdef USE_BASE_MATERIAL\nstruct noPT {\n    vec3 lightDirection;\n    vec3 ambient;\n    float opacity;\n};\n\nuniform noPT noProjectiveMaterial;\n#endif\n\nvoid main(void)\n{\n    #include <logdepthbuf_fragment>\n    #ifdef USE_BASE_MATERIAL\n    float nDotVP = (max(0.1, dot(vNormal, normalize(noProjectiveMaterial.lightDirection))));\n    vec4 color = vec4(noProjectiveMaterial.ambient + nDotVP, 0.0);\n    #else\n    vec4 color = vec4(0.0);\n    #endif\n\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\n    #ifdef USE_BASE_MATERIAL\n    color.a = color.a < 1.0 ? max(noProjectiveMaterial.opacity, color.a) : 1.0 ;\n    gl_FragColor = vec4(color.rgb, color.a * opacity);\n    #else\n    gl_FragColor = vec4(color.rgb / color.a, opacity);\n    #endif\n\n}\n";
+const textureFS = "#include <itowns/precision_qualifier>\n#include <logdepthbuf_pars_fragment>\n#include <itowns/projective_texturing_pars_fragment>\nvarying vec3 vNormal;\n\n#ifdef USE_BASE_MATERIAL\nstruct noPT {\n    vec3 lightDirection;\n    vec3 ambient;\n    float opacity;\n};\n\nuniform noPT noProjectiveMaterial;\n#endif\n\nvoid main(void)\n{\n    #include <logdepthbuf_fragment>\n    #ifdef USE_BASE_MATERIAL\n    float nDotVP = (max(0.1, dot(vNormal, normalize(noProjectiveMaterial.lightDirection))));\n    vec4 color = vec4(noProjectiveMaterial.ambient + nDotVP, 0.0);\n    #else\n    vec4 color = vec4(0.0);\n    #endif\n\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\n    #ifdef USE_BASE_MATERIAL\n    color.a = color.a < 1.0 ? max(noProjectiveMaterial.opacity, color.a) : 1.0 ;\n    gl_FragColor = vec4(color.rgb, color.a * opacity);\n    #else\n    gl_FragColor = vec4(color.rgb / color.a, opacity);\n    #endif\n\n}\n";
+import ShaderUtils from "./Shader/ShaderUtils.js";
 const ndcToTextureMatrix = new THREE.Matrix4(1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 2, 0, 0, 0, 0, 2);
 const noMask = new THREE.DataTexture(new Uint8Array([255, 255, 255, 255]), 1, 1, THREE.RGBAFormat, THREE.UnsignedByteType);
 noMask.needsUpdate = true;
 const noTexture = new THREE.Texture();
-const rawShaderMaterial = new THREE.RawShaderMaterial();
+const shaderMaterial = new THREE.ShaderMaterial();
 /**
  * @classdesc OrientedImageMaterial is a custom shader material used to do projective texture mapping.<br/>
  *
@@ -37,7 +28,7 @@ const rawShaderMaterial = new THREE.RawShaderMaterial();
  * <br/>
  * To get a more comprehensive support of camera Micmac models, you can consider using [three-photogrammetric-camera]{@link https://github.com/mbredif/three-photogrammetric-camera} instead.
  */
-class OrientedImageMaterial extends THREE.RawShaderMaterial {
+class OrientedImageMaterial extends THREE.ShaderMaterial {
   /**
    * @constructor
    * @param { OrientedImageCamera[]} cameras - Array of {@link OrientedImageCamera}. Each camera will project a texture.
@@ -62,21 +53,21 @@ class OrientedImageMaterial extends THREE.RawShaderMaterial {
     options.transparent = options.transparent ?? true;
     options.opacity = options.opacity ?? 1;
 
-    // Filter the rawShaderMaterial options
-    const rawShaderMaterialOptions = {};
+    // Filter out non-ShaderMaterial options
+    const shaderMaterialOptions = {};
     for (const key in options) {
       if (Object.prototype.hasOwnProperty.call(options, key)) {
-        const currentValue = rawShaderMaterial[key];
+        const currentValue = shaderMaterial[key];
         if (currentValue !== undefined) {
-          rawShaderMaterialOptions[key] = options[key];
+          shaderMaterialOptions[key] = options[key];
         }
       }
     }
-    super(rawShaderMaterialOptions);
+    super(shaderMaterialOptions);
     this.defines.ORIENTED_IMAGES_COUNT = options.OrientedImagesCount ?? cameras.length;
 
     // verify that number of textures doesn't exceed GPU capabilities
-    const maxTexturesUnits = _Capabilities.default.getMaxTextureUnitsCount();
+    const maxTexturesUnits = Capabilities.getMaxTextureUnitsCount();
     if (this.defines.ORIENTED_IMAGES_COUNT > maxTexturesUnits) {
       console.warn(`OrientedImageMaterial: Can't project ${cameras.length} textures, because it's more than GPU capabilities maximum texture units (${maxTexturesUnits})`);
 
@@ -116,18 +107,10 @@ class OrientedImageMaterial extends THREE.RawShaderMaterial {
       ambient: new THREE.Color(0.1, 0.1, 0.1),
       opacity: 0.75
     });
-    if (_Capabilities.default.isLogDepthBufferSupported()) {
-      this.defines.USE_LOGDEPTHBUF = 1;
-      this.defines.USE_LOGDEPTHBUF_EXT = 1;
-    }
     this.vertexShader = textureVS;
-    this.fragmentShader = _ShaderUtils.default.unrollLoops(textureFS, this.defines);
-  }
-  onBeforeCompile(shader, renderer) {
-    if (renderer.capabilities.isWebGL2) {
-      this.defines.WEBGL2 = true;
-      shader.glslVersion = '300 es';
-    }
+    // three loop unrolling of ShaderMaterial only supports integer bounds,
+    // see https://github.com/mrdoob/three.js/issues/28020
+    this.fragmentShader = ShaderUtils.unrollLoops(textureFS, this.defines);
   }
 
   /**
@@ -182,5 +165,4 @@ class OrientedImageMaterial extends THREE.RawShaderMaterial {
     }
   }
 }
-var _default = OrientedImageMaterial;
-exports.default = _default;
+export default OrientedImageMaterial;

package/lib/Renderer/PointsMaterial.js

@@ -1,22 +1,12 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = exports.PNTS_SIZE_MODE = exports.PNTS_SHAPE = exports.PNTS_MODE = exports.ClassificationScheme = void 0;
-var THREE = _interopRequireWildcard(require("three"));
-var _Capabilities = _interopRequireDefault(require("../Core/System/Capabilities"));
-var _ShaderUtils = _interopRequireDefault(require("./Shader/ShaderUtils"));
-var _CommonMaterial = _interopRequireDefault(require("./CommonMaterial"));
-var _Gradients = _interopRequireDefault(require("../Utils/Gradients"));
-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/PointsVS.glsl' */
-const PointsVS = "#include <itowns/WebGL2_pars_vertex>\n#include <itowns/precision_qualifier>\n#include <itowns/project_pars_vertex>\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 bool applyOpacityClassication;\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#else\nattribute vec3 normal;\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 = opacity;\n        if (applyOpacityClassication || mode == PNTS_MODE_CLASSIFICATION) {\n            vec2 uv = vec2(classification/255., 0.5);\n            vColor = texture2D(classificationTexture, uv);\n            vColor.a *= opacity;\n        }\n\n        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\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 bool applyOpacityClassication;\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 = opacity;\n        if (applyOpacityClassication || mode == PNTS_MODE_CLASSIFICATION) {\n            vec2 uv = vec2(classification/255., 0.5);\n            vColor = texture2D(classificationTexture, uv);\n            vColor.a *= opacity;\n        }\n\n        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\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/WebGL2_pars_fragment>\n#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";
-const PNTS_MODE = {
+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";
+import CommonMaterial from "./CommonMaterial.js";
+import Gradients from "../Utils/Gradients.js";
+export const PNTS_MODE = {
   COLOR: 0,
   INTENSITY: 1,
   CLASSIFICATION: 2,
@@ -28,17 +18,14 @@ const PNTS_MODE = {
   SCAN_ANGLE: 8,
   NORMAL: 9
 };
-exports.PNTS_MODE = PNTS_MODE;
-const PNTS_SHAPE = {
+export const PNTS_SHAPE = {
   CIRCLE: 0,
   SQUARE: 1
 };
-exports.PNTS_SHAPE = PNTS_SHAPE;
-const PNTS_SIZE_MODE = {
+export const PNTS_SIZE_MODE = {
   VALUE: 0,
   ATTENUATED: 1
 };
-exports.PNTS_SIZE_MODE = PNTS_SIZE_MODE;
 const white = new THREE.Color(1.0, 1.0, 1.0);
 
 /**
@@ -56,7 +43,7 @@ const white = new THREE.Color(1.0, 1.0, 1.0);
  */
 // eslint-disable-next-line
 class /* istanbul ignore next */Classification {}
-const ClassificationScheme = {
+export const ClassificationScheme = {
   DEFAULT: {
     0: {
       visible: true,
@@ -144,7 +131,6 @@ const ClassificationScheme = {
     }
   }
 };
-exports.ClassificationScheme = ClassificationScheme;
 const DiscreteScheme = {
   DEFAULT: {
     0: {
@@ -267,7 +253,7 @@ function recomputeTexture(scheme, texture, nbClass) {
   }
   texture.needsUpdate = true;
 }
-class PointsMaterial extends THREE.RawShaderMaterial {
+class PointsMaterial extends THREE.ShaderMaterial {
   /**
    * @class      PointsMaterial
    * @param      {object}  [options={}]  The options
@@ -314,11 +300,11 @@ class PointsMaterial extends THREE.RawShaderMaterial {
     const sizeMode = size === 0 ? PNTS_SIZE_MODE.ATTENUATED : options.sizeMode || PNTS_SIZE_MODE.VALUE;
     const minAttenuatedSize = options.minAttenuatedSize || 3;
     const maxAttenuatedSize = options.maxAttenuatedSize || 10;
-    let gradients = _Gradients.default;
+    let gradients = Gradients;
     if (options.gradient) {
       gradients = {
         ...options.gradient,
-        ..._Gradients.default
+        ...Gradients
       };
     }
     delete options.intensityRange;
@@ -341,37 +327,37 @@ class PointsMaterial extends THREE.RawShaderMaterial {
     this.vertexShader = PointsVS;
     const scale = options.scale || 0.05 * 0.5 / Math.tan(1.0 / 2.0); // autosizing scale
 
-    _CommonMaterial.default.setDefineMapping(this, 'PNTS_MODE', PNTS_MODE);
-    _CommonMaterial.default.setDefineMapping(this, 'PNTS_SHAPE', PNTS_SHAPE);
-    _CommonMaterial.default.setDefineMapping(this, 'PNTS_SIZE_MODE', PNTS_SIZE_MODE);
-    _CommonMaterial.default.setUniformProperty(this, 'size', size);
-    _CommonMaterial.default.setUniformProperty(this, 'mode', mode);
-    _CommonMaterial.default.setUniformProperty(this, 'shape', shape);
-    _CommonMaterial.default.setUniformProperty(this, 'picking', false);
-    _CommonMaterial.default.setUniformProperty(this, 'opacity', this.opacity);
-    _CommonMaterial.default.setUniformProperty(this, 'overlayColor', options.overlayColor || new THREE.Vector4(0, 0, 0, 0));
-    _CommonMaterial.default.setUniformProperty(this, 'intensityRange', intensityRange);
-    _CommonMaterial.default.setUniformProperty(this, 'elevationRange', elevationRange);
-    _CommonMaterial.default.setUniformProperty(this, 'angleRange', angleRange);
-    _CommonMaterial.default.setUniformProperty(this, 'applyOpacityClassication', applyOpacityClassication);
-    _CommonMaterial.default.setUniformProperty(this, 'sizeMode', sizeMode);
-    _CommonMaterial.default.setUniformProperty(this, 'scale', scale);
-    _CommonMaterial.default.setUniformProperty(this, 'minAttenuatedSize', minAttenuatedSize);
-    _CommonMaterial.default.setUniformProperty(this, 'maxAttenuatedSize', maxAttenuatedSize);
+    CommonMaterial.setDefineMapping(this, 'PNTS_MODE', PNTS_MODE);
+    CommonMaterial.setDefineMapping(this, 'PNTS_SHAPE', PNTS_SHAPE);
+    CommonMaterial.setDefineMapping(this, 'PNTS_SIZE_MODE', PNTS_SIZE_MODE);
+    CommonMaterial.setUniformProperty(this, 'size', size);
+    CommonMaterial.setUniformProperty(this, 'mode', mode);
+    CommonMaterial.setUniformProperty(this, 'shape', shape);
+    CommonMaterial.setUniformProperty(this, 'picking', false);
+    CommonMaterial.setUniformProperty(this, 'opacity', this.opacity);
+    CommonMaterial.setUniformProperty(this, 'overlayColor', options.overlayColor || new THREE.Vector4(0, 0, 0, 0));
+    CommonMaterial.setUniformProperty(this, 'intensityRange', intensityRange);
+    CommonMaterial.setUniformProperty(this, 'elevationRange', elevationRange);
+    CommonMaterial.setUniformProperty(this, 'angleRange', angleRange);
+    CommonMaterial.setUniformProperty(this, 'applyOpacityClassication', applyOpacityClassication);
+    CommonMaterial.setUniformProperty(this, 'sizeMode', sizeMode);
+    CommonMaterial.setUniformProperty(this, 'scale', scale);
+    CommonMaterial.setUniformProperty(this, 'minAttenuatedSize', minAttenuatedSize);
+    CommonMaterial.setUniformProperty(this, 'maxAttenuatedSize', maxAttenuatedSize);
 
     // add classification texture to apply classification lut.
     const data = new Uint8Array(256 * 4);
     const texture = new THREE.DataTexture(data, 256, 1, THREE.RGBAFormat);
     texture.needsUpdate = true;
     texture.magFilter = THREE.NearestFilter;
-    _CommonMaterial.default.setUniformProperty(this, 'classificationTexture', texture);
+    CommonMaterial.setUniformProperty(this, 'classificationTexture', texture);
 
     // add texture to applying the discrete lut.
     const dataLUT = new Uint8Array(256 * 4);
     const textureLUT = new THREE.DataTexture(dataLUT, 256, 1, THREE.RGBAFormat);
     textureLUT.needsUpdate = true;
     textureLUT.magFilter = THREE.NearestFilter;
-    _CommonMaterial.default.setUniformProperty(this, 'discreteTexture', textureLUT);
+    CommonMaterial.setUniformProperty(this, 'discreteTexture', textureLUT);
 
     // Classification and other discrete values scheme
     this.classificationScheme = classificationScheme;
@@ -383,7 +369,7 @@ class PointsMaterial extends THREE.RawShaderMaterial {
 
     // Gradient texture for continuous values
     this.gradient = Object.values(gradients)[0];
-    _CommonMaterial.default.setUniformProperty(this, 'gradientTexture', this.gradientTexture);
+    CommonMaterial.setUniformProperty(this, 'gradientTexture', this.gradientTexture);
     if (oiMaterial) {
       this.uniforms.projectiveTextureAlphaBorder = oiMaterial.uniforms.projectiveTextureAlphaBorder;
       this.uniforms.projectiveTextureDistortion = oiMaterial.uniforms.projectiveTextureDistortion;
@@ -396,14 +382,12 @@ class PointsMaterial extends THREE.RawShaderMaterial {
       this.defines.DEBUG_ALPHA_BORDER = oiMaterial.defines.DEBUG_ALPHA_BORDER;
       this.defines.USE_TEXTURES_PROJECTIVE = true;
       this.defines.USE_BASE_MATERIAL = true;
-      this.fragmentShader = _ShaderUtils.default.unrollLoops(PointsFS, this.defines);
+      // three loop unrolling of ShaderMaterial only supports integer
+      // bounds, see https://github.com/mrdoob/three.js/issues/28020
+      this.fragmentShader = ShaderUtils.unrollLoops(PointsFS, this.defines);
     } else {
       this.fragmentShader = PointsFS;
     }
-    if (_Capabilities.default.isLogDepthBufferSupported()) {
-      this.defines.USE_LOGDEPTHBUF = 1;
-      this.defines.USE_LOGDEPTHBUF_EXT = 1;
-    }
   }
   recomputeClassification() {
     recomputeTexture(this.classificationScheme, this.classificationTexture, 32);
@@ -419,12 +403,6 @@ class PointsMaterial extends THREE.RawShaderMaterial {
       target: this.uniforms
     });
   }
-  onBeforeCompile(shader, renderer) {
-    if (renderer.capabilities.isWebGL2) {
-      this.defines.WEBGL2 = true;
-      shader.glslVersion = '300 es';
-    }
-  }
   copy(source) {
     super.copy(source);
     if (source.uniforms.projectiveTextureAlphaBorder) {
@@ -466,5 +444,4 @@ class PointsMaterial extends THREE.RawShaderMaterial {
     this.gradientTexture = generateGradientTexture(value);
   }
 }
-var _default = PointsMaterial;
-exports.default = _default;
+export default PointsMaterial;

package/lib/Renderer/RasterTile.js

@@ -1,18 +1,8 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = exports.RasterElevationTile = exports.RasterColorTile = exports.EMPTY_TEXTURE_ZOOM = void 0;
-var THREE = _interopRequireWildcard(require("three"));
-var _LayeredMaterial = require("./LayeredMaterial");
-var _XbilParser = require("../Parser/XbilParser");
-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; }
-const EMPTY_TEXTURE_ZOOM = -1;
-exports.EMPTY_TEXTURE_ZOOM = EMPTY_TEXTURE_ZOOM;
+import * as THREE from 'three';
+import { ELEVATION_MODES } from "./LayeredMaterial.js";
+import { checkNodeElevationTextureValidity, insertSignificantValuesFromParent, computeMinMaxElevation } from "../Parser/XbilParser.js";
+import CRS from "../Core/Geographic/Crs.js";
+export const EMPTY_TEXTURE_ZOOM = -1;
 const pitch = new THREE.Vector4();
 function getIndiceWithPitch(i, pitch, w) {
   // Return corresponding indice in parent tile using pitch
@@ -39,7 +29,7 @@ class RasterTile extends THREE.EventDispatcher {
   constructor(material, layer) {
     super();
     this.layer = layer;
-    this.crs = layer.parent.tileMatrixSets.indexOf(_Crs.default.formatToTms(layer.crs));
+    this.crs = layer.parent.tileMatrixSets.indexOf(CRS.formatToTms(layer.crs));
     if (this.crs == -1) {
       console.error('Unknown crs:', layer.crs);
     }
@@ -95,7 +85,7 @@ class RasterTile extends THREE.EventDispatcher {
     this.material.layersNeedUpdate = true;
   }
   setTexture(index, texture, offsetScale) {
-    this.level = texture && index == 0 ? texture.extent.zoom : this.level;
+    this.level = texture && texture.extent && index == 0 ? texture.extent.zoom : this.level;
     this.textures[index] = texture || null;
     this.offsetScales[index] = offsetScale;
     this.material.layersNeedUpdate = true;
@@ -107,9 +97,8 @@ class RasterTile extends THREE.EventDispatcher {
     }
   }
 }
-var _default = RasterTile;
-exports.default = _default;
-class RasterColorTile extends RasterTile {
+export default RasterTile;
+export class RasterColorTile extends RasterTile {
   get effect_type() {
     return this.layer.effect_type;
   }
@@ -120,13 +109,12 @@ class RasterColorTile extends RasterTile {
     return this.layer.transparent;
   }
 }
-exports.RasterColorTile = RasterColorTile;
-class RasterElevationTile extends RasterTile {
+export class RasterElevationTile extends RasterTile {
   constructor(material, layer) {
     super(material, layer);
     const defaultEle = {
       bias: 0,
-      mode: _LayeredMaterial.ELEVATION_MODES.DATA,
+      mode: ELEVATION_MODES.DATA,
       zmin: -Infinity,
       zmax: Infinity
     };
@@ -134,12 +122,12 @@ class RasterElevationTile extends RasterTile {
 
     // Define elevation properties
     if (layer.useRgbaTextureElevation) {
-      defaultEle.mode = _LayeredMaterial.ELEVATION_MODES.RGBA;
+      defaultEle.mode = ELEVATION_MODES.RGBA;
       defaultEle.zmax = 5000;
       throw new Error('Restore this feature');
     } else if (layer.useColorTextureElevation) {
       this.scaleFactor = layer.colorTextureElevationMaxZ - layer.colorTextureElevationMinZ;
-      defaultEle.mode = _LayeredMaterial.ELEVATION_MODES.COLOR;
+      defaultEle.mode = ELEVATION_MODES.COLOR;
       defaultEle.bias = layer.colorTextureElevationMinZ;
       this.min = this.layer.colorTextureElevationMinZ;
       this.max = this.layer.colorTextureElevationMaxZ;
@@ -190,7 +178,7 @@ class RasterElevationTile extends RasterTile {
       const {
         min,
         max
-      } = (0, _XbilParser.computeMinMaxElevation)(this.textures[0], this.offsetScales[0], {
+      } = computeMinMaxElevation(this.textures[0], this.offsetScales[0], {
         noDataValue: this.layer.noDataValue,
         zmin: this.layer.zmin,
         zmax: this.layer.zmax
@@ -210,12 +198,11 @@ class RasterElevationTile extends RasterTile {
     const parentTexture = this.textures[0];
     const parentDataElevation = parentTexture && parentTexture.image && parentTexture.image.data;
     const dataElevation = texture.image && texture.image.data;
-    if (dataElevation && !(0, _XbilParser.checkNodeElevationTextureValidity)(dataElevation, nodatavalue)) {
-      (0, _XbilParser.insertSignificantValuesFromParent)(dataElevation, parentDataElevation && dataParent(texture, parentTexture, parentDataElevation, pitch), nodatavalue);
+    if (dataElevation && !checkNodeElevationTextureValidity(dataElevation, nodatavalue)) {
+      insertSignificantValuesFromParent(dataElevation, parentDataElevation && dataParent(texture, parentTexture, parentDataElevation, pitch), nodatavalue);
     }
   }
 }
-exports.RasterElevationTile = RasterElevationTile;
 function dataParent(texture, parentTexture, parentDataElevation, pitch) {
   texture.extent.offsetToParent(parentTexture.extent, pitch);
   return i => parentDataElevation[getIndiceWithPitch(i, pitch, 256)];

package/lib/Renderer/RenderMode.js

@@ -1,9 +1,3 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
 const MODES = {
   FINAL: 0,
   // final color
@@ -32,8 +26,7 @@ function push(object3d, mode) {
 // Rendering mode
 // According to the rendering mode, the material's object switches
 // the mode property of the materials
-var _default = {
+export default {
   MODES,
   push
-};
-exports.default = _default;
+};

package/lib/Renderer/Shader/ShaderChunk.js

@@ -1,16 +1,8 @@
-"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';
 /* babel-plugin-inline-import './Chunk/color_layers_pars_fragment.glsl' */
 const color_layers_pars_fragment = "struct Layer {\n    int textureOffset;\n    int crs;\n    int effect_type;\n    float effect_parameter;\n    float opacity;\n    bool transparent;\n};\n\n#include <itowns/custom_header_colorLayer>\n\nuniform sampler2D   colorTextures[NUM_FS_TEXTURES];\nuniform vec4        colorOffsetScales[NUM_FS_TEXTURES];\nuniform Layer       colorLayers[NUM_FS_TEXTURES];\nuniform int         colorTextureCount;\n\nvec3 uvs[NUM_CRS];\n\nfloat getBorderDistance(vec2 uv) {\n    vec2 p2 = min(uv, 1. -uv);\n    return min(p2.x, p2.y);\n}\n\nfloat tolerance = 0.99;\n\nvec4 applyWhiteToInvisibleEffect(vec4 color) {\n    float a = dot(color.rgb, vec3(0.333333333));\n    if (a >= tolerance) {\n        color.a = 0.0;\n    }\n    return color;\n}\n\nvec4 applyLightColorToInvisibleEffect(vec4 color, float intensity) {\n    float a = max(0.05,1. - length(color.xyz - 1.));\n    color.a *= 1.0 - pow(abs(a), intensity);\n    color.rgb *= color.rgb * color.rgb;\n    return color;\n}\n\n#if defined(DEBUG)\nuniform bool showOutline;\nuniform vec3 outlineColors[NUM_CRS];\nuniform float outlineWidth;\n\nvec4 getOutlineColor(vec3 outlineColor, vec2 uv) {\n    float alpha = 1. - clamp(getBorderDistance(uv) / outlineWidth, 0., 1.);\n    return vec4(outlineColor, alpha);\n}\n#endif\n\nuniform float minBorderDistance;\nvec4 getLayerColor(int textureOffset, sampler2D tex, vec4 offsetScale, Layer layer) {\n    if ( textureOffset >= colorTextureCount ) return vec4(0);\n\n    vec3 uv;\n    // #pragma unroll_loop\n    for ( int i = 0; i < NUM_CRS; i ++ ) {\n        if ( i == layer.crs ) uv = uvs[ i ];\n    }\n\n    float borderDistance = getBorderDistance(uv.xy);\n    if (textureOffset != layer.textureOffset + int(uv.z) || borderDistance < minBorderDistance ) return vec4(0);\n    vec4 color = texture2D(tex, pitUV(uv.xy, offsetScale));\n    if (layer.effect_type == 3) {\n        #include <itowns/custom_body_colorLayer>\n    } else {\n        if (layer.transparent && color.a != 0.0) {\n            color.rgb /= color.a;\n        }\n\n        if (layer.effect_type == 1) {\n            color = applyLightColorToInvisibleEffect(color, layer.effect_parameter);\n        } else if (layer.effect_type == 2) {\n            color = applyWhiteToInvisibleEffect(color);\n        }\n    }\n    color.a *= layer.opacity;\n    return color;\n}\n";
 /* babel-plugin-inline-import './Chunk/elevation_pars_vertex.glsl' */
-const elevation_pars_vertex = "#if NUM_VS_TEXTURES > 0\n    struct Layer {\n        float scale;\n        float bias;\n        int mode;\n        float zmin;\n        float zmax;\n    };\n\n    uniform Layer       elevationLayers[NUM_VS_TEXTURES];\n    uniform sampler2D   elevationTextures[NUM_VS_TEXTURES];\n    uniform vec4        elevationOffsetScales[NUM_VS_TEXTURES];\n    uniform int         elevationTextureCount;\n    uniform float       geoidHeight;\n\n    highp float decode32(highp vec4 rgba) {\n        highp float Sign = 1.0 - step(128.0,rgba[0])*2.0;\n        highp float Exponent = 2.0 * mod(rgba[0],128.0) + step(128.0,rgba[1]) - 127.0;\n        highp float Mantissa = mod(rgba[1],128.0)*65536.0 + rgba[2]*256.0 +rgba[3] + float(0x800000);\n        highp float Result =  Sign * exp2(Exponent) * (Mantissa * exp2(-23.0 ));\n        return Result;\n    }\n\n    float getElevationMode(vec2 uv, sampler2D tex, int mode) {\n        if (mode == ELEVATION_RGBA)\n            return decode32(texture2D( tex, uv ).abgr * 255.0);\n        if (mode == ELEVATION_DATA || mode == ELEVATION_COLOR)\n        #if defined(WEBGL2)\n            return texture2D( tex, uv ).r;\n        #else\n            return texture2D( tex, uv ).w;\n        #endif\n        return 0.;\n    }\n\n    float getElevation(vec2 uv, sampler2D tex, vec4 offsetScale, Layer layer) {\n        uv = uv * offsetScale.zw + offsetScale.xy;\n        float d = clamp(getElevationMode(uv, tex, layer.mode), layer.zmin, layer.zmax);\n        return d * layer.scale + layer.bias;\n    }\n#endif\n";
+const elevation_pars_vertex = "#if NUM_VS_TEXTURES > 0\n    struct Layer {\n        float scale;\n        float bias;\n        int mode;\n        float zmin;\n        float zmax;\n    };\n\n    uniform Layer       elevationLayers[NUM_VS_TEXTURES];\n    uniform sampler2D   elevationTextures[NUM_VS_TEXTURES];\n    uniform vec4        elevationOffsetScales[NUM_VS_TEXTURES];\n    uniform int         elevationTextureCount;\n    uniform float       geoidHeight;\n\n    highp float decode32(highp vec4 rgba) {\n        highp float Sign = 1.0 - step(128.0,rgba[0])*2.0;\n        highp float Exponent = 2.0 * mod(rgba[0],128.0) + step(128.0,rgba[1]) - 127.0;\n        highp float Mantissa = mod(rgba[1],128.0)*65536.0 + rgba[2]*256.0 +rgba[3] + float(0x800000);\n        highp float Result =  Sign * exp2(Exponent) * (Mantissa * exp2(-23.0 ));\n        return Result;\n    }\n\n    float getElevationMode(vec2 uv, sampler2D tex, int mode) {\n        if (mode == ELEVATION_RGBA)\n            return decode32(texture2D( tex, uv ).abgr * 255.0);\n        if (mode == ELEVATION_DATA || mode == ELEVATION_COLOR)\n            return texture2D( tex, uv ).r;\n        return 0.;\n    }\n\n    float getElevation(vec2 uv, sampler2D tex, vec4 offsetScale, Layer layer) {\n        // Elevation textures are inverted along the y-axis\n        uv = vec2(uv.x, 1.0 - uv.y);\n        uv = uv * offsetScale.zw + offsetScale.xy;\n        float d = clamp(getElevationMode(uv, tex, layer.mode), layer.zmin, layer.zmax);\n        return d * layer.scale + layer.bias;\n    }\n#endif\n";
 /* babel-plugin-inline-import './Chunk/elevation_vertex.glsl' */
 const elevation_vertex = "#if NUM_VS_TEXTURES > 0\n    if(elevationTextureCount > 0) {\n        float elevation = getElevation(uv, elevationTextures[0], elevationOffsetScales[0], elevationLayers[0]);\n        transformed += elevation * normal;\n    }\n#endif\n";
 /* babel-plugin-inline-import './Chunk/geoid_vertex.glsl' */
@@ -26,7 +18,7 @@ const lighting_pars_fragment = "uniform bool lightingEnabled;\nuniform vec3 ligh
 /* babel-plugin-inline-import './Chunk/mode_pars_fragment.glsl' */
 const mode_pars_fragment = "#if MODE == MODE_ID || MODE == MODE_DEPTH\n#include <packing>\n#endif\n\n#if MODE == MODE_ID\nuniform int objectId;\n#endif\n";
 /* babel-plugin-inline-import './Chunk/mode_depth_fragment.glsl' */
-const mode_depth_fragment = "#if defined(USE_LOGDEPTHBUF) && defined(USE_LOGDEPTHBUF_EXT)\ngl_FragColor = packDepthToRGBA(gl_FragDepthEXT);\n#else\nfloat fragCoordZ = 0.5 * vHighPrecisionZW[0] / vHighPrecisionZW[1] + 0.5;\ngl_FragColor = packDepthToRGBA(fragCoordZ);\n#endif";
+const mode_depth_fragment = "#if defined(USE_LOGDEPTHBUF)\ngl_FragColor = packDepthToRGBA(gl_FragDepthEXT);\n#else\nfloat fragCoordZ = 0.5 * vHighPrecisionZW[0] / vHighPrecisionZW[1] + 0.5;\ngl_FragColor = packDepthToRGBA(fragCoordZ);\n#endif\n";
 /* babel-plugin-inline-import './Chunk/mode_id_fragment.glsl' */
 const mode_id_fragment = "// 16777216.0 == 256.0 * 256.0 * 256.0\ngl_FragColor = packDepthToRGBA(float(objectId) / 16777216.0);\n";
 /* babel-plugin-inline-import './Chunk/overlay_fragment.glsl' */
@@ -37,18 +29,12 @@ const overlay_pars_fragment = "uniform vec3  overlayColor;\nuniform float overla
 const pitUV = "vec2 pitUV(vec2 uv, vec4 pit)\n{\n    return uv * pit.zw + vec2(pit.x, 1.0 - pit.w - pit.y);\n}\n\n";
 /* babel-plugin-inline-import './Chunk/precision_qualifier.glsl' */
 const precision_qualifier = "precision highp float;\nprecision highp int;\n";
-/* babel-plugin-inline-import './Chunk/project_pars_vertex.glsl' */
-const project_pars_vertex = "attribute vec3 position;\nuniform mat4 projectionMatrix;\nuniform mat4 modelViewMatrix;\n";
 /* babel-plugin-inline-import './Chunk/projective_texturing_vertex.glsl' */
 const projective_texturing_vertex = "for(int i = 0; i < ORIENTED_IMAGES_COUNT; ++i)\n    projectiveTextureCoords[i] = projectiveTextureMatrix[i] * mvPosition;\n";
 /* babel-plugin-inline-import './Chunk/projective_texturing_pars_vertex.glsl' */
 const projective_texturing_pars_vertex = "uniform mat4 projectiveTextureMatrix[ORIENTED_IMAGES_COUNT];\nvarying vec4 projectiveTextureCoords[ORIENTED_IMAGES_COUNT];\n";
 /* babel-plugin-inline-import './Chunk/projective_texturing_pars_fragment.glsl' */
 const projective_texturing_pars_fragment = "uniform sampler2D projectiveTexture[ORIENTED_IMAGES_COUNT];\nuniform sampler2D mask[ORIENTED_IMAGES_COUNT];\nvarying vec4      projectiveTextureCoords[ORIENTED_IMAGES_COUNT];\nuniform float     projectiveTextureAlphaBorder;\nuniform float     opacity;\nuniform bool      boostLight;\n\nstruct Distortion {\n    vec2 size;\n#if USE_DISTORTION\n    vec2 pps;\n    vec4 polynom;\n    vec3 l1l2;\n#endif\n};\n\nuniform Distortion projectiveTextureDistortion[ORIENTED_IMAGES_COUNT];\n\nfloat getAlphaBorder(vec2 p)\n{\n    vec2 d = clamp(projectiveTextureAlphaBorder * min(p, 1. - p), 0., 1.);\n    return min(d.x, d.y);\n}\n\n#if USE_DISTORTION\nvoid distort(inout vec2 p, vec4 polynom, vec2 pps)\n{\n    vec2 v = p - pps;\n    float v2 = dot(v, v);\n    if (v2 > polynom.w) {\n        p = vec2(-1.);\n    }\n    else {\n        p += (v2 * (polynom.x + v2 * (polynom.y + v2 * polynom.z) ) ) * v;\n    }\n}\n\nvoid distort(inout vec2 p, vec4 polynom, vec3 l1l2, vec2 pps)\n{\n    if ((l1l2.x == 0.) && (l1l2.y == 0.)) {\n        distort(p, polynom, pps);\n    } else {\n        vec2 AB = (p - pps) / l1l2.z;\n        float R = length(AB);\n        float lambda = atan(R) / R;\n        vec2 ab = lambda * AB;\n        float rho2 = dot(ab, ab);\n        float r357 = 1. + rho2* (polynom.x + rho2* (polynom.y + rho2 * polynom.z));\n        p = pps + l1l2.z * (r357 * ab + vec2(dot(l1l2.xy, ab), l1l2.y * ab.x));\n    }\n}\n#endif\n\nvec4 mixBaseColor(vec4 aColor, vec4 baseColor) {\n    #ifdef USE_BASE_MATERIAL\n        baseColor.rgb = aColor.a == 1.0 ? aColor.rgb : mix(baseColor, aColor, aColor.a).rgb;\n        baseColor.a = min(1.0, aColor.a + baseColor.a);\n    #else\n        baseColor.rgb += aColor.rgb * aColor.a;\n        baseColor.a += aColor.a;\n    #endif\n    return baseColor;\n}\n\nvec4 projectiveTextureColor(vec4 coords, Distortion distortion, sampler2D tex, sampler2D mask, vec4 baseColor) {\n    vec3 p = coords.xyz / coords.w;\n    if(p.z * p.z < 1.) {\n#if USE_DISTORTION\n        p.xy *= distortion.size;\n        distort(p.xy, distortion.polynom, distortion.l1l2, distortion.pps);\n        p.xy /= distortion.size;\n#endif\n\n        float d = getAlphaBorder(p.xy) * texture2D(mask, p.xy).r;\n\n        if(d > 0.) {\n\n#if DEBUG_ALPHA_BORDER\n        vec3 r = texture2D(tex, p.xy).rgb;\n        return mixBaseColor(vec4( r.r * d, r.g, r.b, 1.0), baseColor);\n#else\n        vec4 color = texture2D(tex, p.xy);\n        color.a *= d;\n        if (boostLight) {\n            return mixBaseColor(vec4(sqrt(color.rgb), color.a), baseColor);\n        } else {\n            return mixBaseColor(color, baseColor);\n        }\n#endif\n\n        }\n    }\n    return mixBaseColor(vec4(0.), baseColor);\n}\n";
-/* babel-plugin-inline-import './Chunk/WebGL2_pars_vertex.glsl' */
-const WebGL2_pars_vertex = "// Copy from GLSL 3.0 conversion for built-in materials and ShaderMaterial in THREE.WebGLProgram\n// https://github.com/mrdoob/three.js/blob/696d7836d1fc56c4702a475e6991c4adef7357f4/src/renderers/webgl/WebGLProgram.js#L682\n#if defined(WEBGL2)\n#define attribute in\n#define varying out\n#define texture2D texture\n#endif\n";
-/* babel-plugin-inline-import './Chunk/WebGL2_pars_fragment.glsl' */
-const WebGL2_pars_fragment = "// Copy from GLSL 3.0 conversion for built-in materials and ShaderMaterial in THREE.WebGLProgram\n// https://github.com/mrdoob/three.js/blob/696d7836d1fc56c4702a475e6991c4adef7357f4/src/renderers/webgl/WebGLProgram.js#L682\n#if defined(WEBGL2)\n#define varying in\nout highp vec4 pc_fragColor;\n#define gl_FragColor pc_fragColor\n#define gl_FragDepthEXT gl_FragDepth\n#define texture2D texture\n#define textureCube texture\n#define texture2DProj textureProj\n#define texture2DLodEXT textureLod\n#define texture2DProjLodEXT textureProjLod\n#define textureCubeLodEXT textureLod\n#define texture2DGradEXT textureGrad\n#define texture2DProjGradEXT textureProjGrad\n#define textureCubeGradEXT textureGrad\n#endif\n";
 const custom_header_colorLayer = '// no custom header';
 const custom_body_colorLayer = '// no custom body';
 const itownsShaderChunk = {
@@ -71,10 +57,7 @@ const itownsShaderChunk = {
   precision_qualifier,
   projective_texturing_vertex,
   projective_texturing_pars_vertex,
-  projective_texturing_pars_fragment,
-  project_pars_vertex,
-  WebGL2_pars_vertex,
-  WebGL2_pars_fragment
+  projective_texturing_pars_fragment
 };
 
 /**
@@ -174,5 +157,4 @@ class ShaderChunkManager {
   }
 }
 const ShaderChunk = new ShaderChunkManager(THREE.ShaderChunk, 'itowns/');
-var _default = ShaderChunk;
-exports.default = _default;
+export default ShaderChunk;

package/lib/Renderer/Shader/ShaderUtils.js

@@ -1,14 +1,8 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
 const pattern_gl_Position = 'gl_Position.*(?![^]*gl_Position)';
 const pattern_Main = '[^\\w]*main[^\\w]*(void)?[^\\w]*{';
 const rePosition = new RegExp(pattern_gl_Position);
 const reMain = new RegExp(pattern_Main);
-var _default = {
+export default {
   patchMaterialForLogDepthSupport(material) {
     // Check if the shader does not already use the log depth buffer
     if (material.vertexShader.includes('USE_LOGDEPTHBUF') || material.vertexShader.includes('logdepthbuf_pars_vertex')) {
@@ -50,5 +44,4 @@ var _default = {
     }
     return string.replace(/#pragma unroll_loop\s+for\s*\(\s*int\s+i\s*=\s*([\w\d]+);\s*i\s+<\s+([\w\d]+);\s*i\s*\+\+\s*\)\s*\{\n([^}]*)\}/g, replace);
   }
-};
-exports.default = _default;
+};

package/lib/Renderer/SphereHelper.js

@@ -1,18 +1,10 @@
-"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; }
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
 
+import * as THREE from 'three';
 function SphereHelper(radius) {
   THREE.Mesh.call(this);
   this.geometry = new THREE.SphereGeometry(radius, 8, 8);
@@ -28,5 +20,4 @@ SphereHelper.prototype.update = function (radius) {
   this.geometry.dispose();
   this.geometry = new THREE.SphereGeometry(radius, 8, 8);
 };
-var _default = SphereHelper;
-exports.default = _default;
+export default SphereHelper;

package/lib/Renderer/WebXR.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';
 async function shutdownXR(session) {
   if (session) {
     await session.end();
@@ -56,5 +48,4 @@ const initializeWebXR = (view, options) => {
     });
   });
 };
-var _default = initializeWebXR;
-exports.default = _default;
+export default initializeWebXR;