@niivue/niivue 0.43.4 → 0.43.6

package/build/index.d.ts

@@ -1176,6 +1176,7 @@ declare class NVMesh {
     createFiberDensityMap(): void;
     updateFibers(gl: WebGL2RenderingContext): void;
     indexNearestXYZmm(Xmm: number, Ymm: number, Zmm: number): number[];
+    unloadMesh(gl: WebGL2RenderingContext): void;
     updateMesh(gl: WebGL2RenderingContext): void;
     reverseFaces(gl: WebGL2RenderingContext): void;
     setLayerProperty(id: number, key: keyof NVMeshLayer, val: number | string | boolean, gl: WebGL2RenderingContext): void;
@@ -1686,6 +1687,7 @@ declare class Niivue {
     private resizeObserver;
     syncOpts: Record<string, unknown>;
     readyForSync: boolean;
+    centerMosaic: boolean;
     uiData: UIData;
     back: NVImage | null;
     overlays: NVImage[];

package/build/index.js

@@ -13,7 +13,7 @@ var __publicField = (obj, key, value) => {
 import { mat4 as mat46, vec2, vec3 as vec311, vec4 as vec48 } from "gl-matrix";
 
 // package.json
-var version = "0.43.4";
+var version = "0.43.6";
 
 // src/logger.ts
 var _Log = class _Log {
@@ -76,29 +76,12 @@ var log = new Log({ name: "niivue", level: "info" });
 // src/shader.ts
 var compileShader = function(gl, vert, frag) {
   const vs = gl.createShader(gl.VERTEX_SHADER);
-  if (vs === null) {
-    throw new Error("could not create vertex shader");
-  }
   gl.shaderSource(vs, vert);
   gl.compileShader(vs);
-  if (!gl.getShaderParameter(vs, gl.COMPILE_STATUS)) {
-    log.error(gl.getShaderInfoLog(vs));
-    throw new Error("Vertex shader failed to compile, see console for log");
-  }
   const fs = gl.createShader(gl.FRAGMENT_SHADER);
-  if (fs === null) {
-    throw new Error("could not create fragment shader");
-  }
   gl.shaderSource(fs, frag);
   gl.compileShader(fs);
-  if (!gl.getShaderParameter(fs, gl.COMPILE_STATUS)) {
-    log.error(gl.getShaderInfoLog(fs));
-    throw new Error("Fragment shader failed to compile, see console for log");
-  }
   const program = gl.createProgram();
-  if (program === null) {
-    throw new Error("could not create GL program");
-  }
   gl.attachShader(program, vs);
   gl.attachShader(program, fs);
   gl.linkProgram(program);
@@ -15649,6 +15632,34 @@ var NVMesh2 = class _NVMesh {
     return [mnIdx, mnDx];
   }
   // indexNearestXYZmm()
+  // internal function discards GPU resources
+  unloadMesh(gl) {
+    gl.bindBuffer(gl.ARRAY_BUFFER, null);
+    gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, null);
+    gl.bindVertexArray(null);
+    gl.deleteBuffer(this.vertexBuffer);
+    gl.deleteBuffer(this.indexBuffer);
+    gl.deleteVertexArray(this.vao);
+    gl.deleteVertexArray(this.vaoFiber);
+    this.offsetPt0 = null;
+    this.tris = null;
+    this.pts = null;
+    if (this.layers && this.layers.length > 0) {
+      for (let i = 0; i < this.layers.length; i++) {
+        this.layers[i].values = null;
+      }
+    }
+    if (this.dpg && this.dpg.length > 0) {
+      for (let i = 0; i < this.dpg.length; i++) {
+        this.dpg[i].vals = null;
+      }
+    }
+    if (this.dps && this.dps.length > 0) {
+      for (let i = 0; i < this.dps.length; i++) {
+        this.dps[i].vals = null;
+      }
+    }
+  }
   // internal function filters mesh to identify which color of triangulated mesh vertices
   updateMesh(gl) {
     if (this.offsetPt0) {
@@ -22000,11 +22011,11 @@ var DEFAULT_OPTIONS = {
 var INITIAL_SCENE_DATA = {
   azimuth: 110,
   elevation: 10,
-  crosshairPos: vec38.fromValues(0.5, 0.5, 0.5),
+  crosshairPos: vec38.create(),
   clipPlane: [0, 0, 0, 0],
   clipPlaneDepthAziElev: [2, 0, 0],
   volScaleMultiplier: 1,
-  pan2Dxyzmm: vec46.fromValues(0, 0, 0, 1),
+  pan2Dxyzmm: vec46.create(),
   clipThick: 2,
   clipVolumeLow: [0, 0, 0],
   clipVolumeHigh: [1, 1, 1]
@@ -22033,7 +22044,11 @@ var NVDocument = class _NVDocument {
       },
       onZoom3DChange: () => {
       },
-      sceneData: { ...INITIAL_SCENE_DATA },
+      sceneData: {
+        ...INITIAL_SCENE_DATA,
+        pan2Dxyzmm: vec46.fromValues(0, 0, 0, 1),
+        crosshairPos: vec38.fromValues(0.5, 0.5, 0.5)
+      },
       get renderAzimuth() {
         return this.sceneData.azimuth;
       },
@@ -23768,6 +23783,7 @@ var Niivue = class _Niivue {
     __publicField(this, "resizeObserver", null);
     __publicField(this, "syncOpts", {});
     __publicField(this, "readyForSync", false);
+    __publicField(this, "centerMosaic", false);
     // UI Data
     __publicField(this, "uiData", {
       mousedown: false,
@@ -24231,7 +24247,7 @@ var Niivue = class _Niivue {
    */
   syncWith(otherNV, syncOpts = { "2d": true, "3d": true }) {
     this.otherNV = otherNV;
-    this.syncOpts = syncOpts;
+    this.syncOpts = { ...syncOpts };
   }
   /**
    * Sync the scene controls (orientation, crosshair location, etc.) from one Niivue instance to others. useful for using one canvas to drive another.
@@ -24268,10 +24284,12 @@ var Niivue = class _Niivue {
     if (this.otherNV instanceof _Niivue) {
       if (this.syncOpts["2d"]) {
         this.otherNV.scene.crosshairPos = this.otherNV.mm2frac(thisMM);
+        this.otherNV.scene.pan2Dxyzmm = vec48.clone(this.scene.pan2Dxyzmm);
       }
       if (this.syncOpts["3d"]) {
         this.otherNV.scene.renderAzimuth = this.scene.renderAzimuth;
         this.otherNV.scene.renderElevation = this.scene.renderElevation;
+        this.otherNV.scene.volScaleMultiplier = this.scene.volScaleMultiplier;
       }
       this.otherNV.drawScene();
       this.otherNV.createOnLocationChange();
@@ -24282,10 +24300,12 @@ var Niivue = class _Niivue {
         }
         if (this.syncOpts["2d"]) {
           this.otherNV[i].scene.crosshairPos = this.otherNV[i].mm2frac(thisMM);
+          this.otherNV[i].scene.pan2Dxyzmm = vec48.clone(this.scene.pan2Dxyzmm);
         }
         if (this.syncOpts["3d"]) {
           this.otherNV[i].scene.renderAzimuth = this.scene.renderAzimuth;
           this.otherNV[i].scene.renderElevation = this.scene.renderElevation;
+          this.otherNV[i].scene.volScaleMultiplier = this.scene.volScaleMultiplier;
         }
         this.otherNV[i].drawScene();
         this.otherNV[i].createOnLocationChange();
@@ -26051,6 +26071,7 @@ var Niivue = class _Niivue {
    * @see {@link https://niivue.github.io/niivue/features/multiuser.meshes.html | live demo usage}
    */
   removeMesh(mesh) {
+    mesh.unloadMesh(this.gl);
     this.setMesh(mesh, -1);
     if (this.mediaUrlMap.has(mesh)) {
       const url = this.mediaUrlMap.get(mesh);
@@ -32128,6 +32149,8 @@ var Niivue = class _Niivue {
     const items = mosaicStr.split(/\s+/);
     let scale = 1;
     const labelSize = this.opts.textHeight;
+    let marginLeft = 0;
+    let marginTop = 0;
     for (let pass = 0; pass < 2; pass++) {
       let isRender = false;
       let isCrossLines = false;
@@ -32203,7 +32226,7 @@ var Niivue = class _Niivue {
             }
           }
         } else {
-          const ltwh = [scale * left, scale * top, scale * w, scale * h];
+          const ltwh = [marginLeft + scale * left, marginTop + scale * top, scale * w, scale * h];
           this.opts.textHeight = isLabel ? labelSize : 0;
           if (isRender) {
             let inf = sliceMM < 0 ? -Infinity : Infinity;
@@ -32231,6 +32254,10 @@ var Niivue = class _Niivue {
       const scaleW = this.gl.canvas.width / mxRowWid;
       const scaleH = this.effectiveCanvasHeight() / top;
       scale = Math.min(scaleW, scaleH);
+      if (this.centerMosaic) {
+        marginLeft = Math.floor(0.5 * (this.gl.canvas.width - mxRowWid * scale));
+        marginTop = Math.floor(0.5 * (this.effectiveCanvasHeight() - top * scale));
+      }
     }
     this.opts.textHeight = labelSize;
   }