@kitware/vtk.js 25.1.3 → 25.2.2

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/OpenGL/ImageMapper.js

@@ -405,8 +405,6 @@ function vtkOpenGLImageMapper(publicAPI, model) {
         numClipPlanes = 6;
       }
 
-      var image = model.currentInput;
-      var w2imat4 = image.getWorldToIndex();
       var shiftScaleEnabled = cellBO.getCABO().getCoordShiftAndScaleEnabled();
       var inverseShiftScaleMatrix = shiftScaleEnabled ? cellBO.getCABO().getInverseShiftAndScaleMatrix() : null;
       var mat = inverseShiftScaleMatrix ? mat4.copy(model.imagematinv, actor.getMatrix()) : actor.getMatrix();
@@ -415,9 +413,11 @@ function vtkOpenGLImageMapper(publicAPI, model) {
         mat4.transpose(mat, mat);
         mat4.multiply(mat, mat, inverseShiftScaleMatrix);
         mat4.transpose(mat, mat);
-      }
+      } // transform crop plane normal with transpose(inverse(worldToIndex))
+
 
-      mat4.multiply(model.imagematinv, mat, w2imat4);
+      mat4.transpose(model.imagemat, model.currentInput.getIndexToWorld());
+      mat4.multiply(model.imagematinv, mat, model.imagemat);
       var planeEquations = [];
 
       for (var _i3 = 0; _i3 < numClipPlanes; _i3++) {

package/Rendering/OpenGL/ShaderCache.js

@@ -99,9 +99,7 @@ function vtkShaderCache(publicAPI, model) {
     var hashInput = "".concat(vertexCode).concat(fragmentCode).concat(geometryCode);
     var result = Md5.hash(hashInput); // does it already exist?
 
-    var loc = Object.keys(model.shaderPrograms).indexOf(result);
-
-    if (loc === -1) {
+    if (!(result in model.shaderPrograms)) {
       // create one
       var sps = vtkShaderProgram.newInstance();
       sps.setContext(model.context);

package/Rendering/OpenGL/ShaderProgram.js

@@ -478,9 +478,7 @@ function vtkShaderProgram(publicAPI, model) {
     } // see if we have cached the result
 
 
-    var loc = Object.keys(model.attributeLocs).indexOf(name);
-
-    if (loc !== -1) {
+    if (name in model.attributeLocs) {
       return true;
     }
 
@@ -489,7 +487,7 @@ function vtkShaderProgram(publicAPI, model) {
       return false;
     }
 
-    loc = model.context.getAttribLocation(model.handle, name);
+    var loc = model.context.getAttribLocation(model.handle, name);
 
     if (loc === -1) {
       return false;