@niivue/niivue 0.12.1 → 0.12.2

package/README.md

@@ -38,7 +38,7 @@ We host many NiiVue examples via github pages. These are updated and deployed au
 
 ## existing html page
 ```html
-<script src="https://unpkg.com/@niivue/niivue@0.12.1/dist/niivue.js"></script>
+<script src="https://unpkg.com/@niivue/niivue@0.12.2/dist/niivue.umd.js"></script>
 
 <canvas id="gl" height=480 width=640></canvas>
 

package/dist/niivue.es.js

@@ -12367,6 +12367,8 @@ const Niivue = function(options = {}) {
   this.clipPlaneObject3D = null;
   this.intensityRange$ = new Subject();
   this.scene.location$ = new Subject();
+  this.scene.loading$ = new Subject();
+  this.loadingText = "drag and drop to start";
   this.currentClipPlaneIndex = 0;
   this.lastCalled = new Date().getTime();
   this.multiTouchGesture = false;
@@ -12380,7 +12382,8 @@ const Niivue = function(options = {}) {
     this.opts[prop] = options[prop] === void 0 ? this.defaults[prop] : options[prop];
   }
   this.eventsToSubjects = {
-    location: this.scene.location$
+    location: this.scene.location$,
+    loading: this.scene.loading$
   };
   this.subscriptions = [];
 };
@@ -12900,14 +12903,24 @@ Niivue.prototype.cloneVolume = function(index) {
   return this.volumes[index].clone();
 };
 Niivue.prototype.loadVolumes = async function(volumeList) {
+  this.on("loading", (isLoading) => {
+    if (isLoading) {
+      this.loadingText = "loading...";
+      this.drawScene();
+    } else {
+      this.loadingText = "drag and drop to start";
+    }
+  });
   if (!this.initialized) {
     await this.init();
   }
   this.volumes = [];
   this.gl.clearColor(0, 0, 0, 1);
   this.gl.clear(this.gl.COLOR_BUFFER_BIT);
+  this.scene.loading$.next(true);
   for (let i = 0; i < volumeList.length; i++) {
     let volume = await NVImage.loadFromUrl(volumeList[i].url, volumeList[i].name, volumeList[i].colorMap, volumeList[i].opacity, this.opts.trustCalMinMax);
+    this.scene.loading$.next(false);
     this.volumes.push(volume);
     if (i === 0) {
       this.back = volume;
@@ -13013,7 +13026,7 @@ Niivue.prototype.initText = async function() {
   this.fontShader = new Shader(this.gl, vertFontShader, fragFontShader);
   this.fontShader.use(this.gl);
   await this.loadDefaultFont();
-  this.drawLoadingText("drag and drop");
+  this.drawLoadingText(this.loadingText);
 };
 Niivue.prototype.init = async function() {
   this.gl.enable(this.gl.CULL_FACE);
@@ -13865,11 +13878,7 @@ Niivue.prototype.drawScene = function() {
   this.gl.clear(this.gl.COLOR_BUFFER_BIT);
   let posString = "";
   if (!this.back.dims) {
-    if (this.volumes && this.volumes.length > 0) {
-      this.drawLoadingText("loading");
-    } else {
-      this.drawLoadingText("drag and drop a file to start");
-    }
+    this.drawLoadingText(this.loadingText);
     return;
   }
   if (this.sliceType === this.sliceTypeRender)