itowns 2.43.2-next.7 → 2.43.2-next.9

package/lib/Converter/textureConverter.js

@@ -21,7 +21,7 @@ export default {
       const backgroundLayer = layer.source.backgroundLayer;
       const backgroundColor = backgroundLayer && backgroundLayer.paint ? new THREE.Color(backgroundLayer.paint['background-color']) : undefined;
       extentDestination.as(CRS.formatToEPSG(layer.crs), extentTexture);
-      texture = Feature2Texture.createTextureFromFeature(data, extentTexture, 256, layer.style, backgroundColor);
+      texture = Feature2Texture.createTextureFromFeature(data, extentTexture, layer.subdivisionThreshold, layer.style, backgroundColor);
       texture.features = data;
       texture.extent = extentDestination;
     } else if (data.isTexture) {

package/lib/Core/Prefab/Globe/GlobeLayer.js

@@ -3,7 +3,6 @@ import TiledGeometryLayer from "../../../Layer/TiledGeometryLayer.js";
 import { ellipsoidSizes } from "../../Math/Ellipsoid.js";
 import { globalExtentTMS, schemeTiles } from "../../Geographic/Extent.js";
 import BuilderEllipsoidTile from "./BuilderEllipsoidTile.js";
-import { SIZE_DIAGONAL_TEXTURE } from "../../../Process/LayeredMaterialNodeProcessing.js";
 import CRS from "../../Geographic/Crs.js";
 
 // matrix to convert sphere to ellipsoid
@@ -129,7 +128,7 @@ class GlobeLayer extends TiledGeometryLayer {
     return isOccluded;
   }
   computeTileZoomFromDistanceCamera(distance, camera) {
-    const preSinus = SIZE_DIAGONAL_TEXTURE * (this.sseSubdivisionThreshold * 0.5) / camera._preSSE / ellipsoidSizes.x;
+    const preSinus = this.sizeDiagonalTexture * (this.sseSubdivisionThreshold * 0.5) / camera._preSSE / ellipsoidSizes.x;
     let sinus = distance * preSinus;
     let zoom = Math.log(Math.PI / (2.0 * Math.asin(sinus))) / Math.log(2);
     const delta = Math.PI / 2 ** zoom;
@@ -143,7 +142,8 @@ class GlobeLayer extends TiledGeometryLayer {
     const delta = Math.PI / 2 ** zoom;
     const circleChord = 2.0 * ellipsoidSizes.x * Math.sin(delta * 0.5);
     const radius = circleChord * 0.5;
-    return camera._preSSE * (radius / SIZE_DIAGONAL_TEXTURE) / (this.sseSubdivisionThreshold * 0.5) + radius;
+    const error = radius / this.sizeDiagonalTexture;
+    return camera._preSSE * error / (this.sseSubdivisionThreshold * 0.5) + radius;
   }
 }
 export default GlobeLayer;

package/lib/Layer/Layer.js

@@ -66,6 +66,7 @@ class Layer extends THREE.EventDispatcher {
    * @param {boolean} [config.addLabelLayer.performance=false] - In case label layer adding, so remove labels that have no chance of being visible.
    * Indeed, even in the best case, labels will never be displayed. By example, if there's many labels.
    * @param {boolean} [config.addLabelLayer.forceClampToTerrain=false] - use elevation layer to clamp label on terrain.
+   * @param {number} [config.subdivisionThreshold=256] - set the texture size and, if applied to the globe, affects the tile subdivision.
    *
    * @example
    * // Add and create a new Layer
@@ -109,6 +110,8 @@ class Layer extends THREE.EventDispatcher {
       config.style = new Style(config.style);
     }
     this.style = config.style || new Style();
+    this.subdivisionThreshold = config.subdivisionThreshold || 256;
+    this.sizeDiagonalTexture = (2 * (this.subdivisionThreshold * this.subdivisionThreshold)) ** 0.5;
     Object.assign(this, config);
     Object.defineProperty(this, 'id', {
       value: id,

package/lib/Layer/TiledGeometryLayer.js

@@ -4,7 +4,6 @@ import { InfoTiledGeometryLayer } from "./InfoLayer.js";
 import Picking from "../Core/Picking.js";
 import convertToTile from "../Converter/convertToTile.js";
 import ObjectRemovalHelper from "../Process/ObjectRemovalHelper.js";
-import { SIZE_DIAGONAL_TEXTURE } from "../Process/LayeredMaterialNodeProcessing.js";
 import { ImageryLayers } from "./Layer.js";
 import { CACHE_POLICIES } from "../Core/Scheduler/Cache.js";
 const subdivisionVector = new THREE.Vector3();
@@ -89,7 +88,7 @@ class TiledGeometryLayer extends GeometryLayer {
       this.object3d.add(...level0s);
       this.object3d.updateMatrixWorld();
     }));
-    this.maxScreenSizeNode = this.sseSubdivisionThreshold * (SIZE_DIAGONAL_TEXTURE * 2);
+    this.maxScreenSizeNode = this.sseSubdivisionThreshold * (this.sizeDiagonalTexture * 2);
   }
   get hideSkirt() {
     return this._hideSkirt;
@@ -408,7 +407,7 @@ class TiledGeometryLayer extends GeometryLayer {
 
     // The screen space error is calculated to have a correct texture display.
     // For the projection of a texture's texel to be less than or equal to one pixel
-    const sse = node.screenSize / (SIZE_DIAGONAL_TEXTURE * 2);
+    const sse = node.screenSize / (this.sizeDiagonalTexture * 2);
     return this.sseSubdivisionThreshold < sse;
   }
 }

package/lib/Process/LayeredMaterialNodeProcessing.js

@@ -1,8 +1,6 @@
 import { chooseNextLevelToFetch } from "../Layer/LayerUpdateStrategy.js";
 import LayerUpdateState from "../Layer/LayerUpdateState.js";
 import handlingError from "./handlerNodeError.js";
-export const SIZE_TEXTURE_TILE = 256;
-export const SIZE_DIAGONAL_TEXTURE = (2 * (SIZE_TEXTURE_TILE * SIZE_TEXTURE_TILE)) ** 0.5;
 function materialCommandQueuePriorityFunction(material) {
   // We know that 'node' is visible because commands can only be
   // issued for visible nodes.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itowns",
-  "version": "2.43.2-next.7",
+  "version": "2.43.2-next.9",
   "description": "A JS/WebGL framework for 3D geospatial data visualization",
   "type": "module",
   "main": "lib/Main.js",