itowns 2.43.2-next.13 → 2.43.2-next.15

package/examples/potree2_25d_map.html

@@ -63,7 +63,7 @@
                 potreeLayer = new itowns.Potree2Layer('Lion', {
                     source: new itowns.Potree2Source({
                         file: 'metadata.json',
-                        url: 'https://blocinbloc-public-test.s3.fr-par.scw.cloud/lion-potree2',
+                        url: 'https://raw.githubusercontent.com/iTowns/iTowns2-sample-data/master/pointclouds/potree2.0/lion',
                         crs: view.referenceCrs,
                     }),
                 });

package/lib/Core/Potree2Node.js

@@ -105,11 +105,16 @@ class Potree2Node extends PointCloudNode {
   }
   networkOptions(byteOffset, byteSize) {
     const first = byteOffset;
+    // When we specify 'multipart/byteranges' on headers request it trigger a preflight request
+    // Actually github doesn't support it https://github.com/orgs/community/discussions/24659
+    // But if we omit header parameter, github seems to know it's a 'multipart/byteranges' request (thanks to 'Range' parameter)
     const networkOptions = {
       ...this.layer.source.networkOptions,
       headers: {
         ...this.layer.source.networkOptions.headers,
-        'content-type': 'multipart/byteranges',
+        ...(this.url.startsWith('https://raw.githubusercontent.com') ? {} : {
+          'content-type': 'multipart/byteranges'
+        }),
         Range: `bytes=${first}-${first + byteSize - 1n}`
       }
     };

package/lib/Layer/C3DTilesLayer.js

@@ -116,8 +116,8 @@ class C3DTilesLayer extends GeometryLayer {
     this.pntsShape = PNTS_SHAPE.CIRCLE;
     this.classification = config.classification;
     this.pntsSizeMode = PNTS_SIZE_MODE.VALUE;
-    this.pntsMinAttenuatedSize = config.pntsMinAttenuatedSize || 3;
-    this.pntsMaxAttenuatedSize = config.pntsMaxAttenuatedSize || 10;
+    this.pntsMinAttenuatedSize = config.pntsMinAttenuatedSize || 1;
+    this.pntsMaxAttenuatedSize = config.pntsMaxAttenuatedSize || 7;
     if (config.pntsMode) {
       const exists = Object.values(PNTS_MODE).includes(config.pntsMode);
       if (!exists) {
@@ -186,8 +186,8 @@ class C3DTilesLayer extends GeometryLayer {
       init3dTilesLayer(view, view.mainLoop.scheduler, this, tileset.root).then(resolve);
     });
   }
-  preUpdate() {
-    return pre3dTilesUpdate.bind(this)();
+  preUpdate(context) {
+    return pre3dTilesUpdate.bind(this)(context);
   }
   update(context, layer, node) {
     return update(context, layer, node);

package/lib/Layer/ReferencingLayerProperties.js

@@ -38,6 +38,11 @@ function ReferLayerProperties(material, layer) {
         get: () => material.layer.pntsMaxAttenuatedSize
       });
     }
+    if (material.uniforms && material.uniforms.scale != undefined) {
+      Object.defineProperty(material.uniforms.scale, 'value', {
+        get: () => material.layer.scale
+      });
+    }
     Object.defineProperty(material, 'wireframe', {
       get: () => material.layer.wireframe
     });

package/lib/Process/3dTilesProcessing.js

@@ -160,10 +160,11 @@ function cleanup3dTileset(layer, n) {
 }
 
 // this is a layer
-export function pre3dTilesUpdate() {
+export function pre3dTilesUpdate(context) {
   if (!this.visible) {
     return [];
   }
+  this.scale = context.camera._preSSE;
 
   // Elements removed are added in the layer._cleanableTiles list.
   // Since we simply push in this array, the first item is always

package/lib/Provider/3dTilesProvider.js

@@ -35,7 +35,7 @@ function gltfToMesh(data, layer, url) {
 function pntsParse(data, layer) {
   return PntsParser.parse(data, layer.registeredExtensions).then(result => {
     const material = layer.material ? layer.material.clone() : new PointsMaterial({
-      size: 0.05,
+      size: 1,
       mode: layer.pntsMode,
       shape: layer.pntsShape,
       classification: layer.classification,

package/package.json

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