Skip to content

Commit

Permalink
feat(PointCloud): filtering points based on classification
Browse files Browse the repository at this point in the history
  • Loading branch information
ftoromanoff committed Jul 31, 2024
1 parent 641ed6d commit fa74f28
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 9 deletions.
46 changes: 40 additions & 6 deletions src/Renderer/PointsMaterial.js
Original file line number Diff line number Diff line change
Expand Up @@ -123,19 +123,15 @@ function recomputeTexture(scheme, texture, nbClass) {
for (let i = 0; i < width; i++) {
let color;
let opacity;
let visible = true;

if (scheme[i]) {
color = scheme[i].color;
visible = scheme[i].visible;
opacity = scheme[i].opacity;
} else if (scheme[i % nbClass]) {
color = scheme[i % nbClass].color;
visible = scheme[i % nbClass].visible;
opacity = scheme[i % nbClass].opacity;
} else if (scheme.DEFAULT) {
color = scheme.DEFAULT.color;
visible = scheme.DEFAULT.visible;
opacity = scheme.DEFAULT.opacity;
} else {
color = white;
Expand All @@ -146,9 +142,9 @@ function recomputeTexture(scheme, texture, nbClass) {
data[j + 0] = parseInt(255 * color.r, 10);
data[j + 1] = parseInt(255 * color.g, 10);
data[j + 2] = parseInt(255 * color.b, 10);
data[j + 3] = visible ? parseInt(255 * opacity, 10) : 0;
data[j + 3] = parseInt(255 * opacity, 10);

needTransparency = needTransparency || opacity < 1 || !visible;
needTransparency = needTransparency || opacity < 1;
}
texture.needsUpdate = true;
return needTransparency;
Expand Down Expand Up @@ -258,13 +254,22 @@ class PointsMaterial extends THREE.ShaderMaterial {
textureLUT.magFilter = THREE.NearestFilter;
CommonMaterial.setUniformProperty(this, 'discreteTexture', textureLUT);

// add texture to apply visibility.
const dataVisi = new Uint8Array(256 * 1);
const textureVisi = new THREE.DataTexture(dataVisi, 256, 1, THREE.RedFormat);

textureVisi.needsUpdate = true;
textureVisi.magFilter = THREE.NearestFilter;
CommonMaterial.setUniformProperty(this, 'visiTexture', textureVisi);

// Classification and other discrete values scheme
this.classificationScheme = classificationScheme;
this.discreteScheme = discreteScheme;

// Update classification and discrete Texture
this.recomputeClassification();
this.recomputeDiscreteTexture();
this.recomputeVisibleTexture();

// Gradient texture for continuous values
this.gradient = gradient;
Expand Down Expand Up @@ -386,6 +391,35 @@ class PointsMaterial extends THREE.ShaderMaterial {
});
}

recomputeVisibleTexture() {
const texture = this.visiTexture;
const scheme = this.classificationScheme;

const data = texture.image.data;
const width = texture.image.width;

for (let i = 0; i < width; i++) {
let visible;

if (scheme[i]) {
visible = scheme[i].visible;
} else if (scheme.DEFAULT) {
visible = scheme.DEFAULT.visible;
} else {
visible = true;
}

data[i] = visible ? 255 : 0;
}
texture.needsUpdate = true;


this.dispatchEvent({
type: 'material_property_changed',
target: this.uniforms,
});
}

enablePicking(picking) {
this.picking = picking;
this.blending = picking ? THREE.NoBlending : THREE.NormalBlending;
Expand Down
5 changes: 5 additions & 0 deletions src/Renderer/Shader/PointsFS.glsl
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
#include <logdepthbuf_pars_fragment>
#include <clipping_planes_pars_fragment>

varying float visible;

uniform vec3 diffuse;
uniform float opacity;

Expand All @@ -18,6 +20,9 @@ void main() {

// Early discard (clipping planes and shape)
#include <clipping_planes_pars_fragment>
if (visible < 0.5) {
discard;
}
if (shape == PNTS_SHAPE_CIRCLE) {
//circular rendering in glsl
if ((length(gl_PointCoord - 0.5) > 0.5)) {
Expand Down
11 changes: 8 additions & 3 deletions src/Renderer/Shader/PointsVS.glsl
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@
#include <logdepthbuf_pars_vertex>
#include <clipping_planes_pars_vertex>
varying vec4 vColor; // color_pars_vertex
varying float visible;

#ifdef USE_POINTS_UV
varying vec2 vUv;
uniform mat3 uvTransform;
#endif

#define NB_CLASS 8.
#define SOURCE_ID_GROUP 8.

uniform float size;
uniform float scale;
Expand All @@ -25,6 +26,8 @@ uniform vec2 angleRange;
uniform sampler2D classificationTexture;
uniform sampler2D discreteTexture;
uniform sampler2D gradientTexture;
uniform sampler2D visiTexture;

uniform int sizeMode;
uniform float minAttenuatedSize;
uniform float maxAttenuatedSize;
Expand All @@ -39,12 +42,14 @@ attribute float numberOfReturns;
attribute float scanAngle;

void main() {
vec2 uv = vec2(classification/255., 0.5);
visible = texture2D(visiTexture, uv).r;

vColor = vec4(1.0);
if (picking) {
vColor = unique_id;
} else {
if (mode == PNTS_MODE_CLASSIFICATION) {
vec2 uv = vec2(classification/255., 0.5);
vColor = texture2D(classificationTexture, uv);
} else if (mode == PNTS_MODE_NORMAL) {
vColor.rgb = abs(normal);
Expand Down Expand Up @@ -84,7 +89,7 @@ void main() {
vec2 uv = vec2(numberOfReturns/255., 0.5);
vColor = texture2D(discreteTexture, uv);
} else if (mode == PNTS_MODE_POINT_SOURCE_ID) {
vec2 uv = vec2(mod(pointSourceID, NB_CLASS)/255., 0.5);
vec2 uv = vec2(mod(pointSourceID, SOURCE_ID_GROUP)/255., 0.5);
vColor = texture2D(discreteTexture, uv);
} else if (mode == PNTS_MODE_SCAN_ANGLE) {
float i = (scanAngle - angleRange.x) / (angleRange.y - angleRange.x);
Expand Down
10 changes: 10 additions & 0 deletions utils/debug/PointCloudDebug.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,16 @@ export default {
layer.material.mode = PNTS_MODE[value];
update();
});

const classeUI = styleUI.addFolder('Classe Visibility').close();
Object.entries(layer.material.classificationScheme).forEach((classe) => {
classeUI.add(classe[1], 'visible').name(classe[1].name)
.onChange(() => {
layer.material.recomputeVisibleTexture();
update();
});
});

const gradiantsNames = Object.keys(layer.material.gradients);
styleUI.add({ gradient: gradiantsNames[0] }, 'gradient', gradiantsNames).name('gradient')
.onChange((value) => {
Expand Down

0 comments on commit fa74f28

Please sign in to comment.