refactor(PtVisi): change discard to transparency

iTowns · Nov 5, 2024 · 8622f8a · 8622f8a
1 parent a0b6f14
commit 8622f8a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/src/Renderer/PointsMaterial.js b/src/Renderer/PointsMaterial.js
@@ -397,6 +397,7 @@ class PointsMaterial extends THREE.ShaderMaterial {
     }
 
     recomputeVisibleTexture() {
+        let needTransparency;
         const texture = this.visiTexture;
         const scheme = this.classificationScheme;
 
@@ -415,9 +416,15 @@ class PointsMaterial extends THREE.ShaderMaterial {
             }
 
             data[i] = visible ? 255 : 0;
+            needTransparency = needTransparency || visible === false;
         }
         texture.needsUpdate = true;
 
+        this.userData.needTransparency[PNTS_MODE.CLASSIFICATION] = needTransparency;
+        this.userData.needTransparency[PNTS_MODE.RETURN_NUMBER] = needTransparency;
+        this.userData.needTransparency[PNTS_MODE.RETURN_TYPE] = needTransparency;
+        this.userData.needTransparency[PNTS_MODE.RETURN_COUNT] = needTransparency;
+        this.userData.needTransparency[PNTS_MODE.POINT_SOURCE_ID] = needTransparency;
 
         this.dispatchEvent({
             type: 'material_property_changed',

diff --git a/src/Renderer/Shader/PointsFS.glsl b/src/Renderer/Shader/PointsFS.glsl
@@ -8,8 +8,6 @@
 #include <logdepthbuf_pars_fragment>
 #include <clipping_planes_pars_fragment>
 
-varying float visible;
-
 uniform vec3 diffuse;
 uniform float opacity;
 
@@ -20,9 +18,6 @@ void main() {
 
 // Early discard (clipping planes and shape)
 #include <clipping_planes_fragment>
-    if (visible < 0.5) {
-        discard;
-    }
     if (shape == PNTS_SHAPE_CIRCLE) {
         //circular rendering in glsl
         if ((length(gl_PointCoord - 0.5) > 0.5)) {

diff --git a/src/Renderer/Shader/PointsVS.glsl b/src/Renderer/Shader/PointsVS.glsl
@@ -4,7 +4,6 @@
 #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;
@@ -43,7 +42,6 @@ attribute float scanAngle;
 
 void main() {
     vec2 uv = vec2(classification/255., 0.5);
-    visible = texture2D(visiTexture, uv).r;
 
     vColor = vec4(1.0);
     if (picking) {
@@ -107,6 +105,10 @@ void main() {
         }
     }
 
+    if (texture2D(visiTexture, uv).r == 0.) {
+        vColor.a = 0.;
+    }
+
 #define USE_COLOR_ALPHA
 #include <morphcolor_vertex>
 #include <begin_vertex>