@niivue/niivue 0.31.0 → 0.32.0

package/dist/niivue.es.js

@@ -758,7 +758,7 @@ const kDrawFunc = `
 		return dcolor;
 }`;
 const kRenderFunc = `vec3 GetBackPosition(vec3 startPositionTex) {
-	vec3 startPosition = startPositionTex * volScale; 
+	vec3 startPosition = startPositionTex * volScale;
 	vec3 invR = 1.0 / rayDir;
 	vec3 tbot = invR * (vec3(0.0)-startPosition);
 	vec3 ttop = invR * (volScale-startPosition);
@@ -1033,7 +1033,7 @@ out vec4 color;` + kDrawFunc + `void main() {
 			vec3 vxA = vec3(texPos.x, texPos.y+vx.y, texPos.z);
 			vec3 vxP = vec3(texPos.x, texPos.y-vx.y, texPos.z);
 			vec3 vxS = vec3(texPos.x, texPos.y, texPos.z+vx.z);
-			vec3 vxI = vec3(texPos.x, texPos.y, texPos.z-vx.z);	
+			vec3 vxI = vec3(texPos.x, texPos.y, texPos.z-vx.z);
 			float a = 1.0;
 			if (axCorSag != 2) {
 				a = min(a, texture(overlay, vxR).a);
@@ -1283,7 +1283,7 @@ uniform float opacity;
 uniform mat4 mtx;
 void main(void) {
 	vec4 vx = vec4(TexCoord.xy, coordZ, 1.0) * mtx;
-	if ((vx.x < 0.0) || (vx.x > 1.0) || (vx.y < 0.0) || (vx.y > 1.0) || (vx.z < 0.0) || (vx.z > 1.0)) { 
+	if ((vx.x < 0.0) || (vx.x > 1.0) || (vx.y < 0.0) || (vx.y > 1.0) || (vx.z < 0.0) || (vx.z > 1.0)) {
 		//set transparent if out of range
 		//https://webglfundamentals.org/webgl/webgl-3d-textures-repeat-clamp.html
 		FragColor = vec4(0.0, 0.0, 0.0, 0.0);
@@ -1292,7 +1292,7 @@ void main(void) {
 	float f = (scl_slope * float(texture(intensityVol, vx.xyz).r)) + scl_inter;
 	float mn = cal_min;
 	float mx = cal_max;
-	if (isAlphaThreshold) 
+	if (isAlphaThreshold)
 		mn = 0.0;
 	float r = max(0.00001, abs(mx - mn));
 	mn = min(mn, mx);
@@ -1300,15 +1300,17 @@ void main(void) {
 	//https://stackoverflow.com/questions/5879403/opengl-texture-coordinates-in-pixel-space
 	float nlayer = float(textureSize(colormap, 0).y);
 	float y = (layer + 0.5)/nlayer;
-	if (!isnan(cal_minNeg))
+	//if (!isnan(cal_minNeg)) //Radeon drivers have issues NaN
+	if (cal_minNeg < cal_maxNeg)
 		y = (layer + 1.5)/nlayer;
 	FragColor = texture(colormap, vec2(txl, y)).rgba;
 	//negative colors
 	mn = cal_minNeg;
 	mx = cal_maxNeg;
-	if (isAlphaThreshold) 
-		mx = 0.0;	
-	if ((!isnan(cal_minNeg)) && ( f < mx)) {
+	if (isAlphaThreshold)
+		mx = 0.0;
+	//if ((!isnan(cal_minNeg)) && ( f < mx)) {
+	if ((cal_minNeg < cal_maxNeg) && ( f < mx)) {
 		r = max(0.00001, abs(mx - mn));
 		mn = min(mn, mx);
 		txl = 1.0 - mix(0.0, 1.0, (f - mn) / r);
@@ -1321,7 +1323,7 @@ void main(void) {
 	//	FragColor.a *= texture(modulationVol, vx.xyz).r;
 	//	FragColor.rgb *= texture(modulationVol, vx.xyz).r;
 	if (isAlphaThreshold) {
-		if ((cal_minNeg != cal_maxNeg) && ( f < 0.0) && (f > cal_maxNeg)) 
+		if ((cal_minNeg != cal_maxNeg) && ( f < 0.0) && (f > cal_maxNeg))
 			FragColor.a = pow(-f / -cal_maxNeg, 2.0);
 		else if ((f > 0.0) && (cal_min > 0.0))
 			FragColor.a *= pow(f / cal_min, 2.0); //issue435:  A = (V/X)**2
@@ -1580,6 +1582,26 @@ void main() {
 	color.rgb = a + d + s;
 	color.a = opacity;
 }`;
+var fragMeshEdgeShader = `#version 300 es
+precision highp int;
+precision highp float;
+uniform float opacity;
+in vec4 vClr;
+in vec3 vN;
+out vec4 color;
+void main() {
+	vec3 r = vec3(0.0, 0.0, 1.0); //rayDir: for orthographic projections moving in Z direction (no need for normal matrix)
+	float diffuse = 1.0;
+	float specular = 0.2;
+	float shininess = 10.0;
+	vec3 n = normalize(vN);
+	vec3 lightPosition = vec3(0.0, 0.0, -5.0);
+	vec3 l = normalize(lightPosition);
+	float lightNormDot = max(dot(n, l), 0.0);
+	vec3 d = lightNormDot * vClr.rgb * diffuse;
+	float s = specular * pow(max(dot(reflect(l, n), r), 0.0), shininess);
+	color = vec4(d + s, opacity);
+}`;
 var fragMeshShader = `#version 300 es
 precision highp int;
 precision highp float;
@@ -110775,6 +110797,8 @@ NVMesh.prototype.updateMesh = function(gl) {
         layer.cal_min = Math.max(0, layer.cal_min);
         layer.cal_max = Math.max(layer.cal_min + 1e-6, layer.cal_max);
       }
+      if (!layer.hasOwnProperty("isTransparentBelowCalMin"))
+        layer.isTransparentBelowCalMin = true;
       let scale255 = 255 / (layer.cal_max - layer.cal_min);
       if (!layer.isOutlineBorder) {
         for (let j = 0; j < nvtx; j++) {
@@ -116310,6 +116334,10 @@ function Niivue(options = {}) {
       Name: "Hemispheric",
       Frag: fragMeshHemiShader
     },
+    {
+      Name: "Edge",
+      Frag: fragMeshEdgeShader
+    },
     {
       Name: "Outline",
       Frag: fragMeshOutlineShader
@@ -116501,7 +116529,7 @@ Niivue.prototype.attachToCanvas = async function(canvas, isAntiAlias = null) {
     alert("unable to get webgl2 context. Perhaps this browser does not support webgl2");
     log.warn("unable to get webgl2 context. Perhaps this browser does not support webgl2");
   }
-  console.log("NIIVUE VERSION ", "0.30.0");
+  console.log("NIIVUE VERSION ", "0.32.0");
   this.canvas.parentElement.style.backgroundColor = "black";
   if (this.opts.isResizeCanvas) {
     this.canvas.style.width = "100%";
@@ -116947,7 +116975,7 @@ Niivue.prototype.keyDownListener = function(e) {
   } else if (e.code === "ArrowRight") {
     this.setFrame4D(this.volumes[0].id, this.volumes[0].frame4D + 1);
   } else if (e.code === "Slash" && e.shiftKey) {
-    alert(`NIIVUE VERSION: ${"0.30.0"}`);
+    alert(`NIIVUE VERSION: ${"0.32.0"}`);
   }
 };
 Niivue.prototype.wheelListener = function(e) {
@@ -119221,8 +119249,8 @@ Niivue.prototype.refreshLayers = function(overlayItem, layer) {
   this.gl.uniform1i(orientShader.uniforms["isAlphaThreshold"], overlayItem.alphaThreshold);
   this.gl.uniform1f(orientShader.uniforms["cal_min"], overlayItem.cal_min);
   this.gl.uniform1f(orientShader.uniforms["cal_max"], overlayItem.cal_max);
-  let mnNeg = NaN;
-  let mxNeg = NaN;
+  let mnNeg = Number.POSITIVE_INFINITY;
+  let mxNeg = Number.NEGATIVE_INFINITY;
   if (overlayItem.colorMapNegative.length > 0) {
     mnNeg = Math.min(-overlayItem.cal_min, -overlayItem.cal_max);
     mxNeg = Math.max(-overlayItem.cal_min, -overlayItem.cal_max);
@@ -120731,7 +120759,7 @@ Niivue.prototype.depthPicker = function(leftTopWidthHeight, mvpMatrix) {
   let frac = this.mm2frac(mm, 0, true);
   if (frac[0] < 0 || frac[0] > 1 || frac[1] < 0 || frac[1] > 1 || frac[2] < 0 || frac[2] > 1)
     return;
-  this.scene.crosshairPos = this.mm2frac(mm);
+  this.scene.crosshairPos = this.mm2frac(mm, 0, true);
 };
 Niivue.prototype.drawImage3D = function(mvpMatrix, azimuth, elevation) {
   if (this.volumes.length === 0)
@@ -120744,12 +120772,6 @@ Niivue.prototype.drawImage3D = function(mvpMatrix, azimuth, elevation) {
     gl.blendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA);
     gl.enable(gl.CULL_FACE);
     gl.cullFace(gl.FRONT);
-    this.gl.activeTexture(this.gl.TEXTURE0);
-    this.gl.bindTexture(this.gl.TEXTURE_3D, this.volumeTexture);
-    this.gl.activeTexture(this.gl.TEXTURE2);
-    this.gl.bindTexture(this.gl.TEXTURE_3D, this.overlayTexture);
-    this.gl.activeTexture(this.gl.TEXTURE7);
-    this.gl.bindTexture(this.gl.TEXTURE_3D, this.drawTexture);
     let shader = this.renderShader;
     if (this.uiData.mouseDepthPicker)
       shader = this.pickingImageShader;