Merge pull request #28 from EarthyScience/Plot-Alphas

Added appropriate alphas to the nan values.

Author: TheJeran

src/components/PlotObjects.tsx

@@ -245,8 +245,10 @@ export const PointCloud = ({textures} : {textures:PCProps} )=>{
     },
     vertexShader:pointVert,
     fragmentShader:pointFrag,
-    blending: THREE.NoBlending,
     depthWrite: true,
+    transparent: true,
+    blending:THREE.NormalBlending,
+    side:THREE.DoubleSide,
   });
 
   return (

src/components/TextureMakers.tsx

@@ -63,7 +63,7 @@ function ArrayTo3D(array: Array){
     });
 
     const normed = data.map((i)=>(i-minVal)/(maxVal-minVal))
-    const textureData = new Uint8Array(normed.map((i)=>i*255));   
+    const textureData = new Uint8Array(normed.map((i)=>isNaN(i) ? 255 : i*254));   
     const volTexture = new THREE.Data3DTexture(textureData, lx, ly, lz);
     volTexture.format = THREE.RedFormat;
     volTexture.minFilter = THREE.NearestFilter;

src/utils/colormap.tsx

@@ -38,7 +38,6 @@ export function GetColorMapTexture(
   colData[lastIndex + 1] = to_nan[1];
   colData[lastIndex + 2] = to_nan[2];
   colData[lastIndex + 3] = nan_alpha;
-
   if (texture) {
     // Update the existing texture data
     (texture.image.data as Uint8Array).set(colData);

src/utils/shaders/fragment.glsl

@@ -76,8 +76,8 @@ void main() {
 
         if (cond) {
             vec4 col = texture(cmap, vec2(d, 0.5));
-            // Change this later back to intensity then delete comment
-            float alpha = 1.;
+            // Change this later back to use intensity then delete comment. Or maybe we don't need intensity
+            float alpha = float(col.a > 0.);
 
             accumColor.rgb += (1.0 - alphaAcc) * alpha * col.rgb;
             alphaAcc += alpha * (1.0 - alphaAcc);

src/utils/shaders/pointFrag.glsl

@@ -1,12 +1,13 @@
-out vec4 Color;
-
-varying float vValue;
-uniform sampler2D cmap;
-
-void main() {
-
-    Color = texture(cmap, vec2(vValue, 0.1));
-    Color.a = 1.;
-    //Color = vec4(vec3(vValue),1.);
-    
-}
+out vec4 Color;
+
+varying float vValue;
+uniform sampler2D cmap;
+
+void main() {
+
+    vec4 color = texture(cmap, vec2(vValue, 0.5));
+    color.a = 1.;
+
+    Color = color;
+    
+}

src/utils/shaders/pointVertex.glsl

@@ -1,11 +1,15 @@
-attribute float value;
-varying float vValue;
-uniform float pointSize;
-uniform bool scalePoints;
-
-void main() {
-    vValue = value/255.;
-    gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);
-    float pointScale = pointSize/gl_Position.w;
-    gl_PointSize = scalePoints ? pointScale*pow(vValue,2.) : pointScale ;
-}
+attribute float value;
+varying float vValue;
+uniform float pointSize;
+uniform bool scalePoints;
+
+void main() {
+    vValue = value/255.;
+    gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);
+    //If it is nan we just yeet it tf out of the screen space. LMAO I love this solution
+    if (value == 255.){
+        gl_Position = vec4(2.0, 2.0, 2.0, 1.0);
+    }
+    float pointScale = pointSize/gl_Position.w;
+    gl_PointSize = scalePoints ? pointScale*pow(vValue,2.) : pointScale ;
+}