@kitware/vtk.js 28.12.4 → 28.13.0

package/Rendering/OpenGL/VolumeMapper.js

@@ -22,6 +22,9 @@ const {
   vtkErrorMacro
 } = macro;
 
+// ----------------------------------------------------------------------------
+// helper methods
+// ----------------------------------------------------------------------------
 // TODO: Do we want this in some shared utility? Shouldwe just use lodash.isEqual
 function arrayEquals(a, b) {
   if (a.length !== b.length) {
@@ -34,6 +37,13 @@ function arrayEquals(a, b) {
   }
   return true;
 }
+function computeFnToString(property, pwfun, numberOfComponents) {
+  if (pwfun) {
+    const iComps = property.getIndependentComponents();
+    return `${pwfun.getMTime()}-${iComps}-${numberOfComponents}`;
+  }
+  return '0';
+}
 
 // ----------------------------------------------------------------------------
 // vtkOpenGLVolumeMapper methods
@@ -283,7 +293,7 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
     }
 
     // has something changed that would require us to recreate the shader?
-    if (cellBO.getProgram() === 0 || needRebuild || model.lastHaveSeenDepthRequest !== model.haveSeenDepthRequest || !!model.lastZBufferTexture !== !!model.zBufferTexture || cellBO.getShaderSourceTime().getMTime() < publicAPI.getMTime() || cellBO.getShaderSourceTime().getMTime() < model.renderable.getMTime()) {
+    if (cellBO.getProgram()?.getHandle() === 0 || needRebuild || model.lastHaveSeenDepthRequest !== model.haveSeenDepthRequest || !!model.lastZBufferTexture !== !!model.zBufferTexture || cellBO.getShaderSourceTime().getMTime() < publicAPI.getMTime() || cellBO.getShaderSourceTime().getMTime() < model.renderable.getMTime()) {
       model.lastZBufferTexture = model.zBufferTexture;
       return true;
     }
@@ -944,6 +954,10 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
     if (!scalars) {
       return;
     }
+    if (model._scalars !== scalars) {
+      model._openGLRenderWindow.releaseGraphicsResourcesForObject(model._scalars);
+      model._scalars = scalars;
+    }
     const vprop = actor.getProperty();
     if (!model.jitterTexture.getHandle()) {
       const oTable = new Uint8Array(32 * 32);
@@ -957,10 +971,12 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
     const numComp = scalars.getNumberOfComponents();
     const iComps = vprop.getIndependentComponents();
     const numIComps = iComps ? numComp : 1;
-
-    // rebuild opacity tfun?
-    let toString = `${vprop.getMTime()}`;
-    if (model.opacityTextureString !== toString) {
+    const scalarOpacityFunc = vprop.getScalarOpacity();
+    const opTex = model._openGLRenderWindow.getGraphicsResourceForObject(scalarOpacityFunc);
+    let toString = computeFnToString(vprop, scalarOpacityFunc, numIComps);
+    const reBuildOp = !opTex.vtkObj || opTex.hash !== toString || model.opacityTextureString !== toString;
+    if (reBuildOp) {
+      // rebuild opacity tfun?
       const oWidth = 1024;
       const oSize = oWidth * 2 * numIComps;
       const ofTable = new Float32Array(oSize);
@@ -977,6 +993,7 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
         }
       }
       model.opacityTexture.releaseGraphicsResources(model._openGLRenderWindow);
+      model.opacityTexture.resetFormatAndType();
       model.opacityTexture.setMinificationFilter(Filter.LINEAR);
       model.opacityTexture.setMagnificationFilter(Filter.LINEAR);
 
@@ -994,11 +1011,20 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
         model.opacityTexture.create2DFromRaw(oWidth, 2 * numIComps, 1, VtkDataTypes.UNSIGNED_CHAR, oTable);
       }
       model.opacityTextureString = toString;
+      if (scalarOpacityFunc) {
+        model._openGLRenderWindow.setGraphicsResourceForObject(scalarOpacityFunc, model.opacityTexture, model.opacityTextureString);
+      }
+    } else {
+      model.opacityTexture = opTex.vtkObj;
+      model.opacityTextureString = opTex.hash;
     }
 
     // rebuild color tfun?
-    toString = `${vprop.getMTime()}`;
-    if (model.colorTextureString !== toString) {
+    const colorTransferFunc = vprop.getRGBTransferFunction();
+    toString = computeFnToString(vprop, colorTransferFunc, numIComps);
+    const cTex = model._openGLRenderWindow.getGraphicsResourceForObject(colorTransferFunc);
+    const reBuildC = !cTex?.vtkObj || cTex?.hash !== toString || model.colorTextureString !== toString;
+    if (reBuildC) {
       const cWidth = 1024;
       const cSize = cWidth * 2 * numIComps * 3;
       const cTable = new Uint8Array(cSize);
@@ -1013,15 +1039,23 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
         }
       }
       model.colorTexture.releaseGraphicsResources(model._openGLRenderWindow);
+      model.colorTexture.resetFormatAndType();
       model.colorTexture.setMinificationFilter(Filter.LINEAR);
       model.colorTexture.setMagnificationFilter(Filter.LINEAR);
       model.colorTexture.create2DFromRaw(cWidth, 2 * numIComps, 3, VtkDataTypes.UNSIGNED_CHAR, cTable);
       model.colorTextureString = toString;
+      if (colorTransferFunc) {
+        model._openGLRenderWindow.setGraphicsResourceForObject(colorTransferFunc, model.colorTexture, model.colorTextureString);
+      }
+    } else {
+      model.colorTexture = cTex.vtkObj;
+      model.colorTextureString = cTex.hash;
     }
-
+    const tex = model._openGLRenderWindow.getGraphicsResourceForObject(scalars);
     // rebuild the scalarTexture if the data has changed
-    toString = `${image.getMTime()}`;
-    if (model.scalarTextureString !== toString) {
+    toString = `${image.getMTime()}A${scalars.getMTime()}`;
+    const reBuildTex = !tex?.vtkObj || tex?.hash !== toString || model.scalarTextureString !== toString;
+    if (reBuildTex) {
       // Build the textures
       const dims = image.getDimensions();
       // Use norm16 for scalar texture if the extension is available
@@ -1030,6 +1064,12 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
       model.scalarTexture.resetFormatAndType();
       model.scalarTexture.create3DFilterableFromDataArray(dims[0], dims[1], dims[2], scalars, model.renderable.getPreferSizeOverAccuracy());
       model.scalarTextureString = toString;
+      if (scalars) {
+        model._openGLRenderWindow.setGraphicsResourceForObject(scalars, model.scalarTexture, model.scalarTextureString);
+      }
+    } else {
+      model.scalarTexture = tex.vtkObj;
+      model.scalarTextureString = tex.hash;
     }
     if (!model.tris.getCABO().getElementCount()) {
       // build the CABO
@@ -1122,7 +1162,8 @@ const DEFAULT_VALUES = {
   modelToView: null,
   projectionToView: null,
   avgWindowArea: 0.0,
-  avgFrameTime: 0.0
+  avgFrameTime: 0.0,
+  _scalars: null
 };
 
 // ----------------------------------------------------------------------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitware/vtk.js",
-  "version": "28.12.4",
+  "version": "28.13.0",
   "description": "Visualization Toolkit for the Web",
   "keywords": [
     "3d",