@kitware/vtk.js 29.10.0 → 29.11.1

package/Common/Core/StringArray.js

@@ -52,7 +52,8 @@ function vtkStringArray(publicAPI, model) {
   /* eslint-disable no-use-before-define */
   publicAPI.newClone = () => newInstance({
     name: model.name,
-    numberOfComponents: model.numberOfComponents
+    numberOfComponents: model.numberOfComponents,
+    empty: true
   });
   /* eslint-enable no-use-before-define */
 

package/Rendering/Core/AxesActor.d.ts

@@ -15,32 +15,32 @@ export interface vtkAxesActor extends vtkActor {
 	/**
 	 * 
 	 */
-	getXAxisColor(): number[];
+	getXConfig(): object;
 
 	/**
 	 * 
 	 */
-	getXAxisColorByReference(): number[];
+	getYConfig(): object;
 
 	/**
 	 * 
 	 */
-	getYAxisColor(): number[];
+	getZConfig(): object;
 
 	/**
 	 * 
 	 */
-	getYAxisColorByReference(): number[];
+	getXAxisColor(): number[];
 
 	/**
 	 * 
 	 */
-	getZAxisColor(): number[];
+	getYAxisColor(): number[];
 
 	/**
 	 * 
 	 */
-	getZAxisColorByReference(): number[];
+	getZAxisColor(): number[];
 
 	/**
 	 * 
@@ -49,32 +49,38 @@ export interface vtkAxesActor extends vtkActor {
 	setConfig(config: object): boolean;
 
 	/**
-	 * Set X axis color.
-	 * @param {Number} r Defines the red component (between 0 and 1).
-	 * @param {Number} g Defines the green component (between 0 and 1).
-	 * @param {Number} b Defines the blue component (between 0 and 1).
+	 * 
+	 * @param config 
 	 */
-	setXAxisColor(r: number, g: number, b: number): boolean;
+	setXConfig(config: object): boolean;
 
 	/**
-	 * Set X axis color.
-	 * @param XAxisColor 
+	 * 
+	 * @param config 
 	 */
-	setXAxisColorFrom(XAxisColor: number[]): boolean;
+	setYConfig(config: object): boolean;
 
 	/**
-	 * Set Y axis color.
+	 * 
+	 * @param config 
+	 */
+	setZConfig(config: object): boolean;
+
+	/**
+	 * Set X axis color.
 	 * @param {Number} r Defines the red component (between 0 and 1).
 	 * @param {Number} g Defines the green component (between 0 and 1).
 	 * @param {Number} b Defines the blue component (between 0 and 1).
 	 */
-	setYAxisColor(r: number, g: number, b: number): boolean;
+	setXAxisColor(r: number, g: number, b: number): boolean;
 
 	/**
 	 * Set Y axis color.
-	 * @param YAxisColor 
+	 * @param {Number} r Defines the red component (between 0 and 1).
+	 * @param {Number} g Defines the green component (between 0 and 1).
+	 * @param {Number} b Defines the blue component (between 0 and 1).
 	 */
-	setYAxisColorFrom(YAxisColor: number[]): boolean;
+	setYAxisColor(r: number, g: number, b: number): boolean;
 
 	/**
 	 * Set Z axis color.
@@ -84,12 +90,6 @@ export interface vtkAxesActor extends vtkActor {
 	 */
 	setZAxisColor(r: number, g: number, b: number): boolean;
 
-	/**
-	 * Set E axis color.
-	 * @param ZAxisColor 
-	 */
-	setZAxisColorFrom(ZAxisColor: number[]): boolean;
-
 	/**
 	 * 
 	 */

package/Rendering/Core/AxesActor.js

@@ -14,9 +14,14 @@ function centerDataSet(ds) {
   vtkMatrixBuilder.buildFromDegree().translate(...center).apply(ds.getPoints().getData());
 }
 function shiftDataset(ds, axis) {
+  let invert = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   const bounds = ds.getPoints().getBounds();
   const center = [0, 0, 0];
-  center[axis] = -bounds[axis * 2];
+  if (invert) {
+    center[axis] = -bounds[axis * 2 + 1];
+  } else {
+    center[axis] = -bounds[axis * 2];
+  }
   vtkMatrixBuilder.buildFromDegree().translate(...center).apply(ds.getPoints().getData());
 }
 
@@ -48,36 +53,48 @@ function vtkAxesActor(publicAPI, model) {
   const _mapper = vtkMapper.newInstance();
   publicAPI.setMapper(_mapper);
   publicAPI.update = () => {
+    let currentConfig = {
+      ...model.config,
+      ...model.xConfig
+    };
     const xAxis = vtkArrowSource.newInstance({
       direction: [1, 0, 0],
-      ...model.config
+      ...currentConfig
     }).getOutputData();
     if (model.config.recenter) {
       centerDataSet(xAxis);
     } else {
-      shiftDataset(xAxis, 0);
+      shiftDataset(xAxis, 0, currentConfig.invert);
     }
-    addColor(xAxis, ...model.xAxisColor);
+    addColor(xAxis, ...currentConfig.color);
+    currentConfig = {
+      ...model.config,
+      ...model.yConfig
+    };
     const yAxis = vtkArrowSource.newInstance({
       direction: [0, 1, 0],
-      ...model.config
+      ...currentConfig
     }).getOutputData();
     if (model.config.recenter) {
       centerDataSet(yAxis);
     } else {
-      shiftDataset(yAxis, 1);
+      shiftDataset(yAxis, 1, currentConfig.invert);
     }
-    addColor(yAxis, ...model.yAxisColor);
+    addColor(yAxis, ...currentConfig.color);
+    currentConfig = {
+      ...model.config,
+      ...model.zConfig
+    };
     const zAxis = vtkArrowSource.newInstance({
       direction: [0, 0, 1],
-      ...model.config
+      ...currentConfig
     }).getOutputData();
     if (model.config.recenter) {
       centerDataSet(zAxis);
     } else {
-      shiftDataset(zAxis, 2);
+      shiftDataset(zAxis, 2, currentConfig.invert);
     }
-    addColor(zAxis, ...model.zAxisColor);
+    addColor(zAxis, ...currentConfig.color);
     const source = vtkAppendPolyData.newInstance();
     source.setInputData(xAxis);
     source.addInputData(yAxis);
@@ -86,71 +103,68 @@ function vtkAxesActor(publicAPI, model) {
   };
   publicAPI.update();
   const _debouncedUpdate = macro.debounce(publicAPI.update, 0);
-  const {
-    setConfig,
-    setXAxisColor,
-    setYAxisColor,
-    setZAxisColor
-  } = publicAPI;
-  publicAPI.setConfig = c => {
-    if (setConfig(c)) {
-      _debouncedUpdate();
-      return true;
-    }
-    return false;
-  };
-  publicAPI.setXAxisColor = c => {
-    if (setXAxisColor(c)) {
-      _debouncedUpdate();
-      return true;
-    }
-    return false;
-  };
-  publicAPI.setYAxisColor = c => {
-    if (setYAxisColor(c)) {
-      _debouncedUpdate();
-      return true;
-    }
-    return false;
-  };
-  publicAPI.setZAxisColor = c => {
-    if (setZAxisColor(c)) {
-      _debouncedUpdate();
-      return true;
-    }
-    return false;
-  };
+  publicAPI.setXAxisColor = color => publicAPI.setXConfig({
+    ...publicAPI.getXConfig(),
+    color
+  });
+  publicAPI.setYAxisColor = color => publicAPI.setYConfig({
+    ...publicAPI.getYConfig(),
+    color
+  });
+  publicAPI.setZAxisColor = color => publicAPI.setZConfig({
+    ...publicAPI.getZConfig(),
+    color
+  });
+  publicAPI.getXAxisColor = () => model.getXConfig().color;
+  publicAPI.getYAxisColor = () => model.getYConfig().color;
+  publicAPI.getZAxisColor = () => model.getZConfig().color;
+  model._onConfigChanged = _debouncedUpdate;
+  model._onXConfigChanged = _debouncedUpdate;
+  model._onYConfigChanged = _debouncedUpdate;
+  model._onZConfigChanged = _debouncedUpdate;
 }
 
 // ----------------------------------------------------------------------------
 // Object factory
 // ----------------------------------------------------------------------------
 
-const DEFAULT_VALUES = {
-  config: {
-    recenter: true,
-    tipResolution: 60,
-    tipRadius: 0.1,
-    tipLength: 0.2,
-    shaftResolution: 60,
-    shaftRadius: 0.03,
-    invert: false
-  },
-  xAxisColor: [255, 0, 0],
-  yAxisColor: [255, 255, 0],
-  zAxisColor: [0, 128, 0]
-};
+function defaultValues(initialValues) {
+  return {
+    config: {
+      recenter: true,
+      tipResolution: 60,
+      tipRadius: 0.1,
+      tipLength: 0.2,
+      shaftResolution: 60,
+      shaftRadius: 0.03,
+      invert: false,
+      ...initialValues?.config
+    },
+    xConfig: {
+      color: [255, 0, 0],
+      invert: false,
+      ...initialValues?.xConfig
+    },
+    yConfig: {
+      color: [255, 255, 0],
+      invert: false,
+      ...initialValues?.yConfig
+    },
+    zConfig: {
+      color: [0, 128, 0],
+      invert: false,
+      ...initialValues?.zConfig
+    }
+  };
+}
 
 // ----------------------------------------------------------------------------
 
 function extend(publicAPI, model) {
   let initialValues = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  Object.assign(model, DEFAULT_VALUES, initialValues);
-
   // Inheritance
-  vtkActor.extend(publicAPI, model, initialValues);
-  macro.setGet(publicAPI, model, ['config']);
-  macro.setGetArray(publicAPI, model, ['xAxisColor', 'yAxisColor', 'zAxisColor'], 3, 255);
+  vtkActor.extend(publicAPI, model, defaultValues(initialValues));
+  macro.setGet(publicAPI, model, ['config', 'xConfig', 'yConfig', 'zConfig']);
 
   // Object methods
   vtkAxesActor(publicAPI, model);
@@ -167,4 +181,4 @@ var vtkAxesActor$1 = {
   extend
 };
 
-export { DEFAULT_VALUES, vtkAxesActor$1 as default, extend, newInstance };
+export { vtkAxesActor$1 as default, extend, newInstance };

package/package.json

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