@kitware/vtk.js 25.2.0 → 25.2.1

package/Rendering/Core/Actor.d.ts

@@ -1,7 +1,7 @@
-import { Bounds } from './../../types';
+import { Bounds, Nullable } from './../../types';
 import vtkMapper from './Mapper';
 import vtkProp3D, { IProp3DInitialValues } from './Prop3D';
-import vtkProperty from './Property';
+import vtkProperty, { IPropertyInitialValues } from './Property';
 
 /**
  * 
@@ -62,7 +62,7 @@ export interface vtkActor extends vtkProp3D {
 	/**
 	 * Get the Mapper that this actor is getting its data from.
 	 */
-	getMapper(): null | vtkMapper;
+	getMapper(): Nullable<vtkMapper>;
 
 	/**
 	 * Get the property object that controls this actors surface
@@ -82,8 +82,9 @@ export interface vtkActor extends vtkProp3D {
 
 	/**
 	 * Create a new property suitable for use with this type of Actor.
+	 * @param {IPropertyInitialValues} [initialValues] (default: {})
 	 */
-	makeProperty(): vtkProperty;
+	makeProperty(initialValues?: IPropertyInitialValues): vtkProperty;
 
 	/**
 	 * Set the property object that controls this actors backface surface

package/Rendering/Core/ImageSlice.d.ts

@@ -1,5 +1,5 @@
 import { Bounds } from './../../types';
-import vtkImageProperty from './ImageProperty';
+import vtkImageProperty, { IImagePropertyInitialValues } from './ImageProperty';
 import vtkImageMapper from './ImageMapper';
 import vtkProp3D, { IProp3DInitialValues } from './Prop3D';
 
@@ -23,6 +23,12 @@ export interface vtkImageSlice extends vtkProp3D {
 	 */
 	getBounds(): Bounds;
 
+	/**
+	 * Get the bounds for this mapper as [xmin, xmax, ymin, ymax,zmin, zmax].
+	 * @return {Bounds} The bounds for the mapper.
+	 */
+	getBoundsByReference(): Bounds;
+
 	/**
 	 * Get the bounds for a given slice as [xmin, xmax, ymin, ymax,zmin, zmax].
 	 * @param {Number} slice The slice index.
@@ -111,6 +117,24 @@ export interface vtkImageSlice extends vtkProp3D {
 	 * and the Renderer will do the images in their own pass.
 	 */
 	hasTranslucentPolygonalGeometry(): boolean;
+
+	/**
+	 * Create a new property suitable for use with this type of Actor.
+	 * @param {IImageSliceInitialValues} [initialValues] (default: {})
+	 */
+	makeProperty(initialValues?: IImagePropertyInitialValues): vtkImageProperty;
+
+	/**
+	 * 
+	 * @param {vtkImageMapper} mapper The vtkImageMapper instance.
+	 */
+	setMapper(mapper: vtkImageMapper): boolean;
+
+	/**
+	 * 
+	 * @param {vtkImageProperty} property The vtkImageProperty instance.
+	 */
+	setProperty(property: vtkImageProperty): boolean;
 }
 
 /**

package/Rendering/Core/Volume.d.ts

@@ -1,7 +1,7 @@
-import { Bounds } from './../../types';
+import { Bounds, Nullable } from './../../types';
 import vtkProp3D, { IProp3DInitialValues } from './Prop3D';
 import vtkVolumeMapper from './VolumeMapper';
-import vtkVolumeProperty from './VolumeProperty';
+import vtkVolumeProperty, { IVolumePropertyInitialValues } from './VolumeProperty';
 
 /**
  * 
@@ -20,7 +20,7 @@ export interface vtkVolume extends vtkProp3D {
 	/**
 	 * Get the volume mapper
 	 */
-	getMapper(): vtkVolumeMapper;
+	getMapper(): Nullable<vtkVolumeMapper>;
 
 	/**
 	 * For some exporters and other other operations we must be able to collect
@@ -63,9 +63,10 @@ export interface vtkVolume extends vtkProp3D {
 	getRedrawMTime(): number;
 
 	/**
-	 * 
+	 * Create a new property suitable for use with this type of Actor.
+	 * @param {IVolumePropertyInitialValues} [initialValues] (default: {})
 	 */
-	makeProperty(): void;
+	makeProperty(initialValues?: IVolumePropertyInitialValues): vtkVolumeProperty;
 
 	/**
 	 * Set the volume mapper

package/Rendering/Core/VolumeMapper.d.ts

@@ -5,7 +5,7 @@ import { BlendMode, FilterMode } from './VolumeMapper/Constants';
 /**
  * 
  */
-interface IVolumeMapperInitialValues extends IAbstractMapperInitialValues {
+export interface IVolumeMapperInitialValues extends IAbstractMapperInitialValues {
 	bounds?: Bounds;
 	blendMode?: BlendMode;
 	sampleDistance?: number;

package/Rendering/Core/VolumeProperty.d.ts

@@ -1,7 +1,9 @@
+import vtkPiecewiseFunction from './../../Common/DataModel/PiecewiseFunction';
 import { vtkObject } from './../../interfaces';
+import vtkColorTransferFunction from './ColorTransferFunction';
 import { InterpolationType, OpacityMode } from './VolumeProperty/Constants';
 
-interface IVolumePropertyInitialValues  {
+export interface IVolumePropertyInitialValues  {
 	independentComponents?: boolean;
 	shade?: number;
 	ambient?: number;
@@ -33,7 +35,7 @@ export interface vtkVolumeProperty extends vtkObject {
 
 	/**
 	 *
-	 * @param {Number} index 
+	 * @param {Number} index
 	 */
 	getColorChannels(index: number): number;
 
@@ -44,25 +46,25 @@ export interface vtkVolumeProperty extends vtkObject {
 
 	/**
 	 *
-	 * @param {Number} index 
+	 * @param {Number} index
 	 */
 	getGradientOpacityMaximumOpacity(index: number): number;
 
 	/**
 	 *
-	 * @param {Number} index 
+	 * @param {Number} index
 	 */
 	getGradientOpacityMaximumValue(index: number): number;
 
 	/**
 	 *
-	 * @param {Number} index 
+	 * @param {Number} index
 	 */
 	getGradientOpacityMinimumOpacity(index: number): number;
 
 	/**
 	 *
-	 * @param {Number} index 
+	 * @param {Number} index
 	 */
 	getGradientOpacityMinimumValue(index: number): number;
 
@@ -73,15 +75,15 @@ export interface vtkVolumeProperty extends vtkObject {
 
 	/**
 	 * Get the unit distance on which the scalar opacity transfer function is defined.
-	 * @param {Number} index 
+	 * @param {Number} index
 	 */
 	getScalarOpacityUnitDistance(index: number): number;
 
 	/**
 	 * Get the currently set gray transfer function. Create one if none set.
-	 * @param {Number} index 
+	 * @param {Number} index
 	 */
-	getGrayTransferFunction(index: number): any;
+	getGrayTransferFunction(index: number): vtkPiecewiseFunction;
 
 	/**
 	 *
@@ -98,13 +100,13 @@ export interface vtkVolumeProperty extends vtkObject {
 	 * Get the currently set RGB transfer function. Create one if none set.
 	 * @param {Number} index 
 	 */
-	getRGBTransferFunction(index: number): any;
+	getRGBTransferFunction(index: number): vtkColorTransferFunction;
 
 	/**
 	 * Get the scalar opacity transfer function. Create one if none set.
 	 * @param {Number} index 
 	 */
-	getScalarOpacity(index: number): any;
+	getScalarOpacity(index: number): vtkPiecewiseFunction;
 
 	/**
 	 * Get the shading of a volume.
@@ -147,37 +149,37 @@ export interface vtkVolumeProperty extends vtkObject {
 	/**
 	 *
 	 * @param {Number} index 
-	 * @param {Number} value
+	 * @param {Number} value 
 	 */
 	setGradientOpacityMaximumOpacity(index: number, value: number): boolean;
 
 	/**
 	 *
 	 * @param {Number} index 
-	 * @param {Number} value
+	 * @param {Number} value 
 	 */
 	setGradientOpacityMaximumValue(index: number, value: number): boolean;
 
 	/**
 	 *
 	 * @param {Number} index 
-	 * @param {Number} value
+	 * @param {Number} value 
 	 */
 	setGradientOpacityMinimumOpacity(index: number, value: number): boolean;
 
 	/**
 	 *
 	 * @param {Number} index 
-	 * @param {Number} value
+	 * @param {Number} value 
 	 */
 	setGradientOpacityMinimumValue(index: number, value: number): boolean;
 
 	/**
 	 * Set the color of a volume to a gray transfer function
 	 * @param {Number} index 
-	 * @param func
+	 * @param {vtkPiecewiseFunction} func 
 	 */
-	setGrayTransferFunction(index: number, func: any): boolean;
+	setGrayTransferFunction(index: number, func: vtkPiecewiseFunction): boolean;
 
 	/**
 	 * Does the data have independent components, or do some define color only?
@@ -204,14 +206,14 @@ export interface vtkVolumeProperty extends vtkObject {
 
 	/**
 	 *
-	 * @param {Number} labelOutlineThickness
+	 * @param {Number} labelOutlineThickness 
 	 */
 	setLabelOutlineThickness(labelOutlineThickness: number): boolean;
 
 	/**
 	 *
 	 * @param {Number} index 
-	 * @param {Number} value
+	 * @param {Number} value 
 	 */
 	setOpacityMode(index: number, value: number): boolean;
 
@@ -219,7 +221,7 @@ export interface vtkVolumeProperty extends vtkObject {
 	 * Set the unit distance on which the scalar opacity transfer function is
 	 * defined.
 	 * @param {Number} index 
-	 * @param {Number} value
+	 * @param {Number} value 
 	 */
 	setScalarOpacityUnitDistance(index: number, value: number): boolean;
 
@@ -234,7 +236,7 @@ export interface vtkVolumeProperty extends vtkObject {
 	 * turning shading off is generally the same as setting ambient=1,
 	 * diffuse=0, specular=0. Shading can be independently turned on/off per
 	 * component.
-	 * @param {Number} shade
+	 * @param {Number} shade 
 	 */
 	setShade(shade: number): boolean;
 
@@ -252,35 +254,35 @@ export interface vtkVolumeProperty extends vtkObject {
 
 	/**
 	 *
-	 * @param {Boolean} index 
-	 * @param {Number} value
+	 * @param {Number} index 
+	 * @param {Boolean} value 
 	 */
 	setUseGradientOpacity(index: number, value: boolean): boolean;
 
 	/**
 	 *
-	 * @param {Boolean} useLabelOutline
+	 * @param {Boolean} useLabelOutline 
 	 */
 	setUseLabelOutline(useLabelOutline: boolean): boolean;
 
 	/**
 	 * Set the color of a volume to an RGB transfer function
 	 * @param {Number} index 
-	 * @param func
+	 * @param {vtkColorTransferFunction} func 
 	 */
-	setRGBTransferFunction(index: number, func: any): boolean;
+	setRGBTransferFunction(index: number, func: vtkColorTransferFunction): boolean;
 
 	/**
 	 * Set the scalar opacity of a volume to a transfer function
 	 * @param {Number} index 
-	 * @param func
+	 * @param {vtkPiecewiseFunction} func 
 	 */
-	setScalarOpacity(index: number, func: any): boolean;
+	setScalarOpacity(index: number, func: vtkPiecewiseFunction): boolean;
 
 	/**
 	 * Set the scalar component weights.
 	 * @param {Number} index 
-	 * @param {Number} value
+	 * @param {Number} value 
 	 */
 	setComponentWeight(index: number, value: number): boolean;
 
@@ -292,7 +294,7 @@ export interface vtkVolumeProperty extends vtkObject {
 
 	/**
 	 * Set the interpolation type for sampling a volume.
-	 * @param {InterpolationType} interpolationType
+	 * @param {InterpolationType} interpolationType 
 	 */
 	setInterpolationType(interpolationType: InterpolationType): boolean;
 

package/Rendering/WebGPU/ImageMapper.js

@@ -106,7 +106,10 @@ function vtkWebGPUImageMapper(publicAPI, model) {
       var modelToIndex = image.getWorldToIndex();
       mat4.multiply(tmpMat4, modelToIndex, tmpMat4); // tmpMat4 is now SC -> Index, save this as we need it later
 
-      mat4.invert(tmp3Mat4, tmpMat4);
+      mat4.invert(tmp3Mat4, tmpMat4); // need translation and scale
+
+      mat4.fromTranslation(tmp2Mat4, [0.5, 0.5, 0.5]);
+      mat4.multiply(tmpMat4, tmp2Mat4, tmpMat4);
       var dims = image.getDimensions();
       mat4.identity(tmp2Mat4);
       mat4.scale(tmp2Mat4, tmp2Mat4, [1.0 / dims[0], 1.0 / dims[1], 1.0 / dims[2]]);
@@ -143,22 +146,22 @@ function vtkWebGPUImageMapper(publicAPI, model) {
       }
 
       ptsArray1[axis0] = nSlice;
-      ptsArray1[axis1] = ext[axis1 * 2];
-      ptsArray1[axis2] = ext[axis2 * 2];
+      ptsArray1[axis1] = ext[axis1 * 2] - 0.5;
+      ptsArray1[axis2] = ext[axis2 * 2] - 0.5;
       ptsArray1[3] = 1.0;
       vec4.transformMat4(ptsArray1, ptsArray1, tmp3Mat4);
       model.UBO.setArray('Origin', ptsArray1);
       ptsArray2[axis0] = nSlice;
-      ptsArray2[axis1] = ext[axis1 * 2 + 1];
-      ptsArray2[axis2] = ext[axis2 * 2];
+      ptsArray2[axis1] = ext[axis1 * 2 + 1] + 0.5;
+      ptsArray2[axis2] = ext[axis2 * 2] - 0.5;
       ptsArray2[3] = 1.0;
       vec4.transformMat4(ptsArray2, ptsArray2, tmp3Mat4);
       vec4.subtract(ptsArray2, ptsArray2, ptsArray1);
       ptsArray2[3] = 1.0;
       model.UBO.setArray('Axis1', ptsArray2);
       ptsArray2[axis0] = nSlice;
-      ptsArray2[axis1] = ext[axis1 * 2];
-      ptsArray2[axis2] = ext[axis2 * 2 + 1];
+      ptsArray2[axis1] = ext[axis1 * 2] - 0.5;
+      ptsArray2[axis2] = ext[axis2 * 2 + 1] + 0.5;
       ptsArray2[3] = 1.0;
       vec4.transformMat4(ptsArray2, ptsArray2, tmp3Mat4);
       vec4.subtract(ptsArray2, ptsArray2, ptsArray1);
@@ -179,7 +182,7 @@ function vtkWebGPUImageMapper(publicAPI, model) {
         var target = iComps ? i : 0;
         var cfun = actor.getProperty().getRGBTransferFunction(target);
 
-        if (cfun && actor.getProperty().getUseLookupTableScalarRange()) {
+        if (cfun) {
           var cRange = cfun.getRange();
           cw = cRange[1] - cRange[0];
           cl = 0.5 * (cRange[1] + cRange[0]);

package/Rendering/WebGPU/Pipeline.js

@@ -83,17 +83,6 @@ function vtkWebGPUPipeline(publicAPI, model) {
   publicAPI.bindVertexInput = function (renderEncoder, vInput) {
     vInput.bindBuffers(renderEncoder);
   };
-
-  publicAPI.addDrawCallback = function (cb) {
-    model._drawCallbacks.push(cb);
-  }; // handle anything that needs to be done when drawing
-
-
-  publicAPI.draw = function (encoder) {
-    for (var cb = 0; cb < model._drawCallbacks.length; cb++) {
-      model._drawCallbacks[cb](encoder, publicAPI);
-    }
-  };
 } // ----------------------------------------------------------------------------
 // Object factory
 // ----------------------------------------------------------------------------
@@ -116,7 +105,6 @@ function extend(publicAPI, model) {
   obj(publicAPI, model);
   model.layouts = [];
   model.shaderDescriptions = [];
-  model._drawCallbacks = [];
   get(publicAPI, model, ['handle', 'pipelineDescription']);
   setGet(publicAPI, model, ['device', 'renderEncoder', 'topology', 'vertexState']); // For more macro methods, see "Sources/macros.js"
   // Object specific methods

package/Rendering/WebGPU/RenderEncoder.js

@@ -74,7 +74,6 @@ function vtkWebGPURenderEncoder(publicAPI, model) {
     }
 
     model.boundPipeline = pl;
-    pl.draw(publicAPI);
   };
 
   publicAPI.replaceShaderCode = function (pipeline) {

package/Rendering/WebGPU/SimpleMapper.js

@@ -176,7 +176,12 @@ function vtkWebGPUSimpleMapper(publicAPI, model) {
   publicAPI.draw = function (renderEncoder) {
     var pipeline = renderEncoder.getBoundPipeline(); // bind the mapper bind group
 
-    renderEncoder.activateBindGroup(model.bindGroup); // bind the vertex input
+    renderEncoder.activateBindGroup(model.bindGroup);
+
+    if (model.WebGPURenderer) {
+      model.WebGPURenderer.bindUBO(renderEncoder);
+    } // bind the vertex input
+
 
     pipeline.bindVertexInput(renderEncoder, model.vertexInput);
     var indexBuffer = model.vertexInput.getIndexBuffer();
@@ -222,7 +227,6 @@ function vtkWebGPUSimpleMapper(publicAPI, model) {
 
       if (model.WebGPURenderer) {
         model.pipeline.addBindGroupLayout(model.WebGPURenderer.getBindGroup());
-        model.pipeline.addDrawCallback(model.WebGPURenderer.bindUBO);
       }
 
       model.pipeline.addBindGroupLayout(model.bindGroup);

package/package.json

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