@niivue/niivue 0.44.1 → 0.44.2

package/build/index.js

@@ -4,16 +4,13 @@ var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 
 // src/niivue/index.ts
 import { mat4 as mat46, vec2, vec3 as vec311, vec4 as vec48 } from "gl-matrix";
 
 // package.json
-var version = "0.44.1";
+var version = "0.44.2";
 
 // src/logger.ts
 var _Log = class _Log {
@@ -1271,11 +1268,11 @@ uniform mat4 mvpMtx;
 uniform mat4 normMtx;
 out vec4 vClr;
 out vec3 vN;
-out vec4 vP;
+out vec4 vPc;
 void main(void) {
 	vec3 lightPosition = vec3(0.0, 0.0, -10.0);
-	vP = vec4(pos, 1.0);
-	gl_Position = mvpMtx * vP;
+	vPc = mvpMtx * vec4(pos, 1.0);
+	gl_Position = vPc;
 	vN = normalize((normMtx * vec4(norm.xyz,1.0)).xyz);
 	//vV = -vec3(modelMtx*vec4(pos,1.0));
 	vClr = clr;
@@ -1420,6 +1417,45 @@ void main() {
 	s *= specularWhite;
 	color = vec4(d3 + s3 + s, opacity);
 }`;
+var fragMeshShaderCrevice = `#version 300 es
+precision highp int;
+precision highp float;
+uniform float opacity;
+in vec4 vClr;
+in vec3 vN;
+in vec4 vPc;
+out vec4 color;
+void main() {
+	vec3 n = normalize(vN);
+	// Compute curvature
+	vec3 dx = dFdx(n);
+	vec3 dy = dFdy(n);
+	vec3 xneg = n - dx;
+	vec3 xpos = n + dx;
+	vec3 yneg = n - dy;
+	vec3 ypos = n + dy;
+	float depth = length(vPc.xyz);
+	float curv = (cross(xneg, xpos).y - cross(yneg, ypos).x) / depth;
+	//at this stage 0.5 for flat, with valleys dark and ridges bright
+	curv = 1.0 - (curv + 0.5);
+	//clamp
+	curv =  min(max(curv, 0.0), 1.0);
+	// easing function
+	curv = pow(curv, 0.5);
+	//modulate ambient and diffuse with curvature
+	vec3 r = vec3(0.0, 0.0, 1.0); //rayDir: for orthographic projections moving in Z direction (no need for normal matrix)
+	float ambient = 0.6;
+	float diffuse = 0.6;
+	float specular = 0.2;
+	float shininess = 10.0;
+	vec3 lightPosition = vec3(0.0, 10.0, -2.0);
+	vec3 l = normalize(lightPosition);
+	float lightNormDot = dot(n, l);
+	vec3 a = vClr.rgb * ambient * curv;
+	vec3 d = max(lightNormDot, 0.0) * vClr.rgb * diffuse;
+	float s = specular * pow(max(dot(reflect(l, n), r), 0.0), shininess);
+	color = vec4(a + d + s, opacity);
+}`;
 var fragMeshShader = `#version 300 es
 precision highp int;
 precision highp float;
@@ -18369,76 +18405,90 @@ function getBestTransform(imageDirections, voxelDimensions, imagePosition) {
   }
   return m;
 }
-function str2Buffer(str) {
+function str2Buffer(str, maxLen = 80) {
+  str = str.replace(/[`$]/g, "");
   const bytes = [];
-  for (let i = 0; i < str.length; i++) {
+  const len = Math.min(maxLen, str.length);
+  for (let i = 0; i < len; i++) {
     const char = str.charCodeAt(i);
     bytes.push(char & 255);
   }
   return bytes;
 }
-function hdrToArrayBuffer(hdr, isDrawing8 = false) {
+function hdrToArrayBuffer(hdr, isDrawing8 = false, isInputEndian = false) {
   const SHORT_SIZE = 2;
   const FLOAT32_SIZE = 4;
+  let isLittleEndian = true;
+  if (isInputEndian) {
+    isLittleEndian = hdr.littleEndian;
+  }
   const byteArray = new Uint8Array(348);
   const view = new DataView(byteArray.buffer);
-  view.setInt32(0, 348, hdr.littleEndian);
+  view.setInt32(0, 348, isLittleEndian);
+  view.setUint8(38, 114);
   view.setUint8(39, hdr.dim_info);
   for (let i = 0; i < 8; i++) {
-    view.setUint16(40 + SHORT_SIZE * i, hdr.dims[i], hdr.littleEndian);
+    view.setUint16(40 + SHORT_SIZE * i, hdr.dims[i], isLittleEndian);
   }
-  view.setFloat32(56, hdr.intent_p1, hdr.littleEndian);
-  view.setFloat32(60, hdr.intent_p2, hdr.littleEndian);
-  view.setFloat32(64, hdr.intent_p3, hdr.littleEndian);
-  view.setInt16(68, hdr.intent_code, hdr.littleEndian);
+  view.setFloat32(56, hdr.intent_p1, isLittleEndian);
+  view.setFloat32(60, hdr.intent_p2, isLittleEndian);
+  view.setFloat32(64, hdr.intent_p3, isLittleEndian);
+  view.setInt16(68, hdr.intent_code, isLittleEndian);
   if (isDrawing8) {
-    view.setInt16(70, 2, hdr.littleEndian);
-    view.setInt16(72, 8, hdr.littleEndian);
+    view.setInt16(70, 2, isLittleEndian);
+    view.setInt16(72, 8, isLittleEndian);
   } else {
-    view.setInt16(70, hdr.datatypeCode, hdr.littleEndian);
-    view.setInt16(72, hdr.numBitsPerVoxel, hdr.littleEndian);
+    view.setInt16(70, hdr.datatypeCode, isLittleEndian);
+    view.setInt16(72, hdr.numBitsPerVoxel, isLittleEndian);
   }
-  view.setInt16(74, hdr.slice_start, hdr.littleEndian);
+  view.setInt16(74, hdr.slice_start, isLittleEndian);
   for (let i = 0; i < 8; i++) {
-    view.setFloat32(76 + FLOAT32_SIZE * i, hdr.pixDims[i], hdr.littleEndian);
+    view.setFloat32(76 + FLOAT32_SIZE * i, hdr.pixDims[i], isLittleEndian);
   }
   if (isDrawing8) {
-    view.setFloat32(108, 352, hdr.littleEndian);
-    view.setFloat32(112, 1, hdr.littleEndian);
-    view.setFloat32(116, 0, hdr.littleEndian);
+    view.setFloat32(108, 352, isLittleEndian);
+    view.setFloat32(112, 1, isLittleEndian);
+    view.setFloat32(116, 0, isLittleEndian);
   } else {
-    view.setFloat32(108, hdr.vox_offset, hdr.littleEndian);
-    view.setFloat32(112, hdr.scl_slope, hdr.littleEndian);
-    view.setFloat32(116, hdr.scl_inter, hdr.littleEndian);
+    view.setFloat32(108, 352, isLittleEndian);
+    view.setFloat32(112, hdr.scl_slope, isLittleEndian);
+    view.setFloat32(116, hdr.scl_inter, isLittleEndian);
   }
-  view.setInt16(120, hdr.slice_end, hdr.littleEndian);
+  view.setInt16(120, hdr.slice_end, isLittleEndian);
   view.setUint8(122, hdr.slice_code);
-  view.setUint8(123, hdr.xyzt_units);
+  if (hdr.xyzt_units === 0) {
+    view.setUint8(123, 10);
+  } else {
+    view.setUint8(123, hdr.xyzt_units);
+  }
   if (isDrawing8) {
-    view.setFloat32(124, 0, hdr.littleEndian);
-    view.setFloat32(128, 0, hdr.littleEndian);
+    view.setFloat32(124, 0, isLittleEndian);
+    view.setFloat32(128, 0, isLittleEndian);
   } else {
-    view.setFloat32(124, hdr.cal_max, hdr.littleEndian);
-    view.setFloat32(128, hdr.cal_min, hdr.littleEndian);
+    view.setFloat32(124, hdr.cal_max, isLittleEndian);
+    view.setFloat32(128, hdr.cal_min, isLittleEndian);
   }
-  view.setFloat32(132, hdr.slice_duration, hdr.littleEndian);
-  view.setFloat32(136, hdr.toffset, hdr.littleEndian);
+  view.setFloat32(132, hdr.slice_duration, isLittleEndian);
+  view.setFloat32(136, hdr.toffset, isLittleEndian);
   byteArray.set(str2Buffer(hdr.description), 148);
   byteArray.set(str2Buffer(hdr.aux_file), 228);
-  view.setInt16(252, hdr.qform_code, hdr.littleEndian);
-  view.setInt16(254, hdr.sform_code, hdr.littleEndian);
-  view.setFloat32(256, hdr.quatern_b, hdr.littleEndian);
-  view.setFloat32(260, hdr.quatern_c, hdr.littleEndian);
-  view.setFloat32(264, hdr.quatern_d, hdr.littleEndian);
-  view.setFloat32(268, hdr.qoffset_x, hdr.littleEndian);
-  view.setFloat32(272, hdr.qoffset_y, hdr.littleEndian);
-  view.setFloat32(276, hdr.qoffset_z, hdr.littleEndian);
+  view.setInt16(252, hdr.qform_code, isLittleEndian);
+  if (hdr.sform_code < 1 || hdr.sform_code < 1) {
+    view.setInt16(254, 1, isLittleEndian);
+  } else {
+    view.setInt16(254, hdr.sform_code, isLittleEndian);
+  }
+  view.setFloat32(256, hdr.quatern_b, isLittleEndian);
+  view.setFloat32(260, hdr.quatern_c, isLittleEndian);
+  view.setFloat32(264, hdr.quatern_d, isLittleEndian);
+  view.setFloat32(268, hdr.qoffset_x, isLittleEndian);
+  view.setFloat32(272, hdr.qoffset_y, isLittleEndian);
+  view.setFloat32(276, hdr.qoffset_z, isLittleEndian);
   const flattened = hdr.affine.flat();
   for (let i = 0; i < 12; i++) {
-    view.setFloat32(280 + FLOAT32_SIZE * i, flattened[i], hdr.littleEndian);
+    view.setFloat32(280 + FLOAT32_SIZE * i, flattened[i], isLittleEndian);
   }
-  byteArray.set(str2Buffer(hdr.intent_name), 328);
-  byteArray.set(str2Buffer(hdr.magic), 344);
+  view.setInt32(344, 3222382, true);
   return byteArray;
 }
 function getExtents(positions, forceOriginInVolume = true) {
@@ -24101,6 +24151,10 @@ var Niivue = class _Niivue {
         Name: "Hemispheric",
         Frag: fragMeshHemiShader
       },
+      {
+        Name: "Crevice",
+        Frag: fragMeshShaderCrevice
+      },
       {
         Name: "Edge",
         Frag: fragMeshEdgeShader
@@ -25503,7 +25557,6 @@ var Niivue = class _Niivue {
                     this.loadDrawing(volume);
                   } else {
                     this.addVolume(volume);
-                    this.setDrawingEnabled(true);
                   }
                 }).catch((e2) => {
                   throw e2;