[PointMaterial] Custom attenuated points parameters

CONTRIBUTORS.md

@@ -45,6 +45,10 @@ The following people have contributed to iTowns.
 * [Diginove](http://diginove.com/index.php/fr/diginove-lexpertise-en-traitement-dimages/):
   * [Michel Benet](https://github.com/mbenevole)
 
+* [Sogelink](https://www.sogelink.com/)
+  * [Kévin ETOURNEAU](https://github.com/ketourneau)
+  * [Alexis DELFORGES](https://github.com/pourfex)
+
 The following organizations are the current maintainers of iTowns:
 * IGN (http://www.ign.fr)
 * Ciril Group (https://www.cirilgroup.com/)

src/Layer/C3DTilesLayer.js

@@ -3,7 +3,7 @@ import GeometryLayer from 'Layer/GeometryLayer';
 import { init3dTilesLayer, pre3dTilesUpdate, process3dTilesNode } from 'Process/3dTilesProcessing';
 import C3DTileset from 'Core/3DTiles/C3DTileset';
 import C3DTExtensions from 'Core/3DTiles/C3DTExtensions';
-import { PNTS_MODE } from 'Renderer/PointsMaterial';
+import { PNTS_MODE, PNTS_SIZE } from 'Renderer/PointsMaterial';
 // eslint-disable-next-line no-unused-vars
 import Style from 'Core/Style';
 import C3DTFeature from 'Core/3DTiles/C3DTFeature';
@@ -70,6 +70,9 @@ class C3DTilesLayer extends GeometryLayer {
      * removed from the scene.
      * @param {C3DTExtensions} [config.registeredExtensions] 3D Tiles extensions managers registered for this tileset.
      * @param {String} [config.pntsMode= PNTS_MODE.COLOR] {@link PointsMaterials} Point cloud coloring mode. Only 'COLOR' or 'CLASSIFICATION' are possible. COLOR uses RGB colors of the points, CLASSIFICATION uses a classification property of the batch table to color points.
+     * @param {String} [config.pntsSize= PNTS_SIZE.VALUE] {@link PointsMaterials} Point cloud size mode. Only 'VALUE' or 'ATTENUATE' are possible. VALUE use constant size, ATTENUATE compute size depending on distance from point to camera.
+     * @param {Number} [config.pntsMinAttenuateSize=3] Minimum scale used by 'ADAPTIVE' size mode
+     * @param {Number} [config.pntsMaxAttenuateSize=10] Maximum scale used by 'ADAPTIVE' size mode
      * @param {Style} [config.style=null] - style used for this layer
      * @param  {View}  view  The view
      */
@@ -84,13 +87,19 @@ class C3DTilesLayer extends GeometryLayer {
 
         this.pntsMode = PNTS_MODE.COLOR;
         this.classification = config.classification;
-
+        this.pntsSize = PNTS_SIZE.VALUE;
+        this.pntsMinAttenuateSize = config.pntsMinAttenuateSize || 3;
+        this.pntsMaxAttenuateSize = config.pntsMaxAttenuateSize || 10;
 
         if (config.pntsMode) {
             const exists = Object.values(PNTS_MODE).includes(config.pntsMode);
             if (!exists) { console.warn("The points cloud mode doesn't exist. Use 'COLOR' or 'CLASSIFICATION' instead."); } else { this.pntsMode = config.pntsMode; }
         }
 
+        if (config.pntsSize) {
+            const exists = Object.values(PNTS_SIZE).includes(config.pntsSize);
+            if (!exists) { console.warn("The points cloud size doesn't exist. Use 'VALUE' or 'ATTENUATE' instead."); } else { this.pntsSize = config.pntsSize; }
+        }
 
         /** @type {Style} */
         this._style = config.style || null;

src/Layer/PointCloudLayer.js

@@ -160,6 +160,7 @@ class PointCloudLayer extends GeometryLayer {
             this.material.opacity = this.opacity;
             this.material.transparent = this.opacity < 1;
             this.material.size = this.pointSize;
+            this.material.preSSE = context.camera.preSSE;
             if (this.material.updateUniforms) {
                 this.material.updateUniforms();
             }

src/Layer/ReferencingLayerProperties.js

@@ -21,6 +21,21 @@ function ReferLayerProperties(material, layer) {
                 get: () => material.layer.pntsMode,
             });
         }
+        if (material.uniforms && material.uniforms.sizeMode != undefined) {
+            Object.defineProperty(material.uniforms.sizeMode, 'value', {
+                get: () => material.layer.pntsSize,
+            });
+        }
+        if (material.uniforms && material.uniforms.minAttenuateSize != undefined) {
+            Object.defineProperty(material.uniforms.minAttenuateSize, 'value', {
+                get: () => material.layer.pntsMinAttenuateSize,
+            });
+        }
+        if (material.uniforms && material.uniforms.maxAttenuateSize != undefined) {
+            Object.defineProperty(material.uniforms.maxAttenuateSize, 'value', {
+                get: () => material.layer.pntsMaxAttenuateSize,
+            });
+        }
 
         Object.defineProperty(material, 'wireframe', {
             get: () => material.layer.wireframe,

src/Main.js

@@ -19,7 +19,7 @@ export { VIEW_EVENTS } from 'Core/View';
 export { default as FeatureProcessing } from 'Process/FeatureProcessing';
 export { updateLayeredMaterialNodeImagery, updateLayeredMaterialNodeElevation } from 'Process/LayeredMaterialNodeProcessing';
 export { default as OrientedImageCamera } from 'Renderer/OrientedImageCamera';
-export { default as PointsMaterial, PNTS_MODE, ClassificationScheme } from 'Renderer/PointsMaterial';
+export { default as PointsMaterial, PNTS_MODE, PNTS_SIZE, ClassificationScheme } from 'Renderer/PointsMaterial';
 export { default as GlobeControls } from 'Controls/GlobeControls';
 export { default as FlyControls } from 'Controls/FlyControls';
 export { default as FirstPersonControls } from 'Controls/FirstPersonControls';

src/Provider/3dTilesProvider.js

@@ -29,7 +29,14 @@ function pntsParse(data, layer) {
     return PntsParser.parse(data, layer.registeredExtensions).then((result) => {
         const material = layer.material ?
             layer.material.clone() :
-            new PointsMaterial({ size: 0.05, mode: layer.pntsMode, classification: layer.classification });
+            new PointsMaterial({
+                size: 0.05,
+                mode: layer.pntsMode,
+                classification: layer.classification,
+                sizeMode: layer.pntsSize,
+                minAttenuateSize: layer.pntsMinAttenuateSize,
+                maxAttenuateSize: layer.pntsMaxAttenuateSize,
+            });
 
         // refer material properties in the layer so when layers opacity and visibility is updated, the material is
         // automatically updated

src/Renderer/PointsMaterial.js

@@ -12,6 +12,11 @@ export const PNTS_MODE = {
     NORMAL: 3,
 };
 
+export const PNTS_SIZE = {
+    VALUE: 0,
+    ATTENUATE: 1,
+};
+
 const white = new THREE.Color(1.0,  1.0,  1.0);
 
 /**
@@ -59,6 +64,9 @@ class PointsMaterial extends THREE.RawShaderMaterial {
      * @param      {THREE.Vector2}  [options.intensityRange=new THREE.Vector2(0, 1)]  intensity range.
      * @param      {boolean}  [options.applyOpacityClassication=false]  apply opacity classification on all display mode.
      * @param      {Classification}  [options.classification] -  define points classification.
+     * @param      {number}  [options.sizeMode=SIZE_MODE.VALUE]  point cloud size mode. Only 'VALUE' or 'ATTENUATE' are possible. VALUE use constant size, ATTENUATE compute size depending on distance from point to camera.
+     * @param      {number}  [options.minAttenuateSize=3]  minimum scale used by 'ATTENUATE' size mode
+     * @param      {number}  [options.maxAttenuateSize=10]  maximum scale used by 'ATTENUATE' size mode
      * @property {Classification}  classification - points classification.
      *
      * @example
@@ -74,13 +82,19 @@ class PointsMaterial extends THREE.RawShaderMaterial {
         const applyOpacityClassication = options.applyOpacityClassication == undefined ? false : options.applyOpacityClassication;
         const size = options.size || 0;
         const mode = options.mode || PNTS_MODE.COLOR;
+        const sizeMode = size === 0 ? PNTS_SIZE.ATTENUATE : (options.sizeMode || PNTS_SIZE.VALUE);
+        const minAttenuateSize = options.minAttenuateSize || 3;
+        const maxAttenuateSize = options.maxAttenuateSize || 10;
 
         delete options.orientedImageMaterial;
         delete options.intensityRange;
         delete options.classification;
         delete options.applyOpacityClassication;
         delete options.size;
         delete options.mode;
+        delete options.sizeMode;
+        delete options.minAttenuateSize;
+        delete options.maxAttenuateSize;
 
         super(options);
 
@@ -89,6 +103,7 @@ class PointsMaterial extends THREE.RawShaderMaterial {
         this.scale = options.scale || 0.05 * 0.5 / Math.tan(1.0 / 2.0); // autosizing scale
 
         CommonMaterial.setDefineMapping(this, 'PNTS_MODE', PNTS_MODE);
+        CommonMaterial.setDefineMapping(this, 'PNTS_SIZE', PNTS_SIZE);
 
         CommonMaterial.setUniformProperty(this, 'size', size);
         CommonMaterial.setUniformProperty(this, 'mode', mode);
@@ -97,6 +112,10 @@ class PointsMaterial extends THREE.RawShaderMaterial {
         CommonMaterial.setUniformProperty(this, 'overlayColor', options.overlayColor || new THREE.Vector4(0, 0, 0, 0));
         CommonMaterial.setUniformProperty(this, 'intensityRange', intensityRange);
         CommonMaterial.setUniformProperty(this, 'applyOpacityClassication', applyOpacityClassication);
+        CommonMaterial.setUniformProperty(this, 'sizeMode', sizeMode);
+        CommonMaterial.setUniformProperty(this, 'preSSE', 1.0);
+        CommonMaterial.setUniformProperty(this, 'minAttenuateSize', minAttenuateSize);
+        CommonMaterial.setUniformProperty(this, 'maxAttenuateSize', maxAttenuateSize);
 
         // add classification texture to apply classification lut.
         const data = new Uint8Array(256 * 4);
@@ -214,6 +233,9 @@ class PointsMaterial extends THREE.RawShaderMaterial {
         this.transparent = source.transparent;
         this.size = source.size;
         this.mode = source.mode;
+        this.sizeMode = source.sizeMode;
+        this.minAttenuateSize = source.minAttenuateSize;
+        this.maxAttenuateSize = source.maxAttenuateSize;
         this.picking = source.picking;
         this.scale = source.scale;
         this.overlayColor.copy(source.overlayColor);

src/Renderer/Shader/PointsVS.glsl

@@ -8,6 +8,7 @@
 #include <logdepthbuf_pars_vertex>
 
 uniform float size;
+uniform float preSSE;
 
 uniform bool picking;
 uniform int mode;
@@ -20,6 +21,9 @@ attribute vec4 unique_id;
 attribute float intensity;
 attribute float classification;
 uniform sampler2D classificationLUT;
+uniform int sizeMode;
+uniform float minAttenuateSize;
+uniform float maxAttenuateSize;
 
 #if defined(NORMAL_OCT16)
 attribute vec2 oct16Normal;
@@ -90,7 +94,7 @@ void main() {
             vColor.rgb = vec3(i, i, i);
         } else if (mode == PNTS_MODE_NORMAL) {
             vColor.rgb = abs(normal);
-        } else if (mode ==PNTS_MODE_COLOR) {
+        } else if (mode == PNTS_MODE_COLOR) {
             // default to color mode
             vColor.rgb = mix(color, overlayColor.rgb, overlayColor.a);
         }
@@ -99,10 +103,12 @@ void main() {
     #include <begin_vertex>
     #include <project_vertex>
 
-    if (size > 0.) {
+    if (sizeMode == PNTS_SIZE_VALUE) {
         gl_PointSize = size;
-    } else {
-        gl_PointSize = clamp(-size / gl_Position.w, 3.0, 10.0);
+    } else if (sizeMode == PNTS_SIZE_ATTENUATE) {
+        gl_PointSize = size;
+        gl_PointSize *= (preSSE / -mvPosition.z);
+        gl_PointSize = clamp(gl_PointSize, minAttenuateSize, maxAttenuateSize);
     }
 
 #if defined(USE_TEXTURES_PROJECTIVE)

utils/debug/3dTilesDebug.js

@@ -1,6 +1,7 @@
 import * as THREE from 'three';
 import View from 'Core/View';
 import GeometryLayer from 'Layer/GeometryLayer';
+import { PNTS_SIZE } from 'Renderer/PointsMaterial';
 import GeometryDebug from './GeometryDebug';
 import OBBHelper from './OBBHelper';
 
@@ -112,4 +113,16 @@ export default function create3dTilesDebugUI(datDebugTool, view, _3dTileslayer)
     gui.add(_3dTileslayer, 'sseThreshold', 0, 100).name('sseThreshold').onChange(() => {
         view.notifyChange(view.camera.camera3D);
     });
+
+    gui.add(_3dTileslayer, 'pntsSize', PNTS_SIZE).name('Pnts size mode').onChange(() => {
+        view.notifyChange(view.camera.camera3D);
+    });
+
+    gui.add(_3dTileslayer, 'pntsMinAttenuateSize', 0, 15).name('Min attenuate size').onChange(() => {
+        view.notifyChange(view.camera.camera3D);
+    });
+
+    gui.add(_3dTileslayer, 'pntsMaxAttenuateSize', 0, 15).name('Max attenuate size').onChange(() => {
+        view.notifyChange(view.camera.camera3D);
+    });
 }

utils/debug/PotreeDebug.js

@@ -1,4 +1,4 @@
-import { PNTS_MODE } from 'Renderer/PointsMaterial';
+import { PNTS_MODE, PNTS_SIZE } from 'Renderer/PointsMaterial';
 
 export default {
     initTools(view, layer, datUi) {
@@ -26,6 +26,13 @@ export default {
         }
         styleUI.add(layer, 'opacity', 0, 1).name('Layer Opacity').onChange(update);
         styleUI.add(layer, 'pointSize', 0, 15).name('Point Size').onChange(update);
+        if (layer.material.sizeMode != undefined) {
+            styleUI.add(layer.material, 'sizeMode', PNTS_SIZE).name('Point size mode').onChange(() => {
+                update();
+            });
+        }
+        styleUI.add(layer.material, 'minAttenuateSize', 0, 15).name('Min attenuate size').onChange(update);
+        styleUI.add(layer.material, 'maxAttenuateSize', 0, 15).name('Max attenuate size').onChange(update);
         if (layer.material.picking != undefined) {
             styleUI.add(layer.material, 'picking').name('Display picking id').onChange(update);
         }