zincjs 2.0.0 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zincjs",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "ZincJS (Web-based-Zinc-Visualisation)",
   "main": "build/zinc.js",
   "directories": {
@@ -48,7 +48,7 @@
     "@vitest/coverage-v8": "^1.6.1",
     "auto-changelog": "^2.4.0",
     "chai": "^4.1.0",
-    "gl": "^6.0.2",
+    "gl": "^8.1.6",
     "happy-dom": "^20.10.6",
     "jsdoc": "^4.0.2",
     "msw": "^2.14.6",

package/src/loaders/niftiReader.js

@@ -1,9 +1,7 @@
 import * as nifti from 'nifti-reader-js';
-import {
-  THREE,
-  TextureArray,
-  TextureSlides
-} from "zincjs";
+import * as THREE from 'three';
+import { TextureArray } from '../texture/textureArray';
+import { TextureSlides } from '../primitives/textureSlides';
 
 const defaultTextureSettings = {
   "id": "mesh-location-orientation",

package/src/primitives/glyphset.js

@@ -27,6 +27,7 @@ const Glyphset = function () {
   let numberOfVertices = 0;
   let baseSize = [0, 0, 0];
   let offset = [0, 0, 0];
+  let labelsOn = false;
   let scaleFactors = [0, 0, 0];
   let repeat_mode = "NONE";
   this.ready = false;
@@ -407,13 +408,26 @@ const Glyphset = function () {
     return undefined;
   }
 
+  this.isLabelDisplayed = () => {
+    return labelsOn;
+  }
+
+  /**
+   * Check whether label can be shown
+   */
+  this.canShowLabel = () => {
+    return (glyphList?.length && (labels?.length || this.groupName));
+  }
 
   /**
    * Display the label of the glyphs in the glyphset.
    */
   this.showLabel = () => {
-    for (let i = 0; i < glyphList.length; i++) {
-      glyphList[i].showLabel(this.morph.material ? this.morph.material.color : undefined);
+    if (glyphList?.length) {
+      labelsOn = true;
+      for (let i = 0; i < glyphList.length; i++) {
+        glyphList[i].showLabel(this.morph.material ? this.morph.material.color : undefined);
+      }
     }
   }
 
@@ -424,6 +438,7 @@ const Glyphset = function () {
       for (let i = 0; i < glyphList.length; i++) {
         glyphList[i].hideLabel();
       }
+      labelsOn = false;
     }
 
   /**
@@ -445,7 +460,8 @@ const Glyphset = function () {
       glyphList[i] = glyph;
       this.morph.add(glyph.getGroup());
     }
-    if (displayLabels) {
+    //Only display labels if the label list is available
+    if (labels && displayLabels) {
       this.showLabel();
     }
     //Update the transformation of the glyphs.

package/src/sceneLoader.js

@@ -284,7 +284,7 @@ const SceneLoader = function (sceneIn) {
       }
       let isInline  = (options && options.isInline) ? options.isInline : undefined;
       let anatomicalId = (options && options.anatomicalId) ? options.anatomicalId : undefined;
-      let displayLabels = (options && options.displayLabels) ? options.displayLabels : undefined;
+      let displayLabels = options?.displayLabels ? options.displayLabels : true;
       let renderOrder = (options && "renderOrder" in options) ? options.renderOrder : undefined;
       const newGlyphset = new Glyphset();
       newGlyphset.setDuration(scene.getDuration());
@@ -760,9 +760,7 @@ const SceneLoader = function (sceneIn) {
           } else {
             newGeometryURL = item.Inline.GlyphGeometriesURL;
           }
-          if (item.DisplayLabels) {
-            options.displayLabels = true;
-          }
+          options.displayLabels = item.displayLabels ? item.displayLabels : true;
           options.loaderOptions.isGlyphsets = true;
           this.loadGlyphsetURL(region, newURL, newGeometryURL, groupName, finishCallback, options);
           break;

package/src/zinc.js

@@ -12,6 +12,10 @@ import { TextureArray } from './texture/textureArray';
 import { TextureSlides } from './primitives/textureSlides';
 import { Renderer } from './renderer';
 import { Scene } from './scene';
+import {
+  createPrimitivesFromNIFTI,
+  createTextureFromNIFTI
+} from './loaders/niftiReader';
 //import { GeometryCSG } from './geometryCSG';
 //import { GlyphsetCSG } from './glyphsetCSG';
 import {
@@ -58,6 +62,8 @@ const Zinc = function() {
   this.StereoEffect = StereoEffect;
   this.loadExternalFile = loadExternalFile;
   this.loadExternalFiles = loadExternalFiles;
+  this.createPrimitivesFromNIFTI = createPrimitivesFromNIFTI;
+  this.createTextureFromNIFTI = createTextureFromNIFTI;
   this.THREE = THREE;
 };
 

package/vite.config.js

@@ -13,7 +13,12 @@ export default defineConfig({
       formats: ['es', 'umd'],
     },
     rollupOptions: {
-      external: (id) => !id.startsWith('.') && !path.isAbsolute(id) && !id.includes('package.json'),
+      external(id) {
+        if (id.includes("nifti-reader-js")) {
+          return false
+        }
+        return !id.startsWith('.') && !path.isAbsolute(id) && !id.includes('package.json')
+      },
       output: {
         extend: true,
         globals: {
@@ -26,4 +31,4 @@ export default defineConfig({
     },
     assetsInlineLimit: 8192,
   },
-});
+});