@kitware/vtk.js 34.8.0 → 34.8.1

package/Rendering/Core/VectorText/Utils.js

@@ -384,7 +384,7 @@ function addTriangle(layers, a, b, c, verticesArray, uvArray, colorArray, color)
     uvArray.push(uv[0], uv[1]);
   });
   if (colorArray && color) {
-    for (let i = 0; i < 3; ++i) colorArray.push(color[0], color[1], color[2]);
+    for (let i = 0; i < 3; ++i) colorArray.push(color[0] * 255, color[1] * 255, color[2] * 255);
   }
 }
 
@@ -417,7 +417,7 @@ function addQuad(layers, a, b, c, d, verticesArray, uvArray, colorArray, color)
   uvArray.push(uvs[2][0], uvs[2][1]);
   uvArray.push(uvs[3][0], uvs[3][1]);
   if (colorArray && color) {
-    for (let i = 0; i < 6; ++i) colorArray.push(color[0], color[1], color[2]);
+    for (let i = 0; i < 6; ++i) colorArray.push(color[0] * 255, color[1] * 255, color[2] * 255);
   }
 }
 

package/Rendering/Core/VectorText.js

@@ -258,7 +258,7 @@ function vtkVectorText(publicAPI, model) {
     let letterIndex = 0;
     model.shapes.forEach(shape => {
       let color = null;
-      if (typeof model.perLetterFaceColors === 'function') {
+      if (model.perLetterFaceColors) {
         color = model.perLetterFaceColors(letterIndex) || [1, 1, 1];
       }
       addShape(shape, offsetSize, color);
@@ -285,12 +285,12 @@ function vtkVectorText(publicAPI, model) {
     polyData.setPolys(cells);
 
     // Set points (vertices)
-    polyData.getPoints().setData(new Float32Array(model.verticesArray), 3);
+    polyData.getPoints().setData(Float32Array.from(model.verticesArray), 3);
 
     // Set texture coordinates
     const da = vtkDataArray.newInstance({
       numberOfComponents: 2,
-      values: new Float32Array(model.uvArray),
+      values: Float32Array.from(model.uvArray),
       name: 'TEXCOORD_0'
     });
     pointData.addArray(da);
@@ -300,7 +300,7 @@ function vtkVectorText(publicAPI, model) {
     if (model.colorArray && model.colorArray.length) {
       const ca = vtkDataArray.newInstance({
         numberOfComponents: 3,
-        values: new Float32Array(model.colorArray),
+        values: Uint8Array.from(model.colorArray),
         name: 'Colors'
       });
       pointData.addArray(ca);

package/Rendering/OpenGL/Glyph3DMapper.js

@@ -5,7 +5,9 @@ import vtkHardwareSelector from './HardwareSelector.js';
 import vtkProperty from '../Core/Property.js';
 import vtkOpenGLPolyDataMapper from './PolyDataMapper.js';
 import vtkShaderProgram from './ShaderProgram.js';
+import { computeCoordShiftAndScale } from './CellArrayBufferObject/helpers.js';
 import { registerOverride } from './ViewNodeFactory.js';
+import { primTypes } from './Helper.js';
 
 const {
   vtkErrorMacro
@@ -25,6 +27,17 @@ const StartEvent = {
 const EndEvent = {
   type: 'EndEvent'
 };
+const MAT4_BYTE_SIZE = 64;
+const MAT4_ELEMENT_COUNT = 16;
+function applyShiftScaleToMat(mat, shift, scale) {
+  // the translation component of a 4x4 column-major matrix
+  mat[12] = (mat[12] - shift[0]) * scale[0];
+  mat[13] = (mat[13] - shift[1]) * scale[1];
+  mat[14] = (mat[14] - shift[2]) * scale[2];
+  mat[0] *= scale[0];
+  mat[5] *= scale[1];
+  mat[10] *= scale[2];
+}
 
 // ----------------------------------------------------------------------------
 // vtkOpenGLSphereMapper methods
@@ -389,9 +402,15 @@ function vtkOpenGLGlyph3DMapper(publicAPI, model) {
     return false;
   };
   publicAPI.buildBufferObjects = (ren, actor) => {
+    const garray = model.renderable.getMatrixArray();
+    const pts = model.renderable.getInputData(0).getPoints();
+    const {
+      useShiftAndScale,
+      coordShift,
+      coordScale
+    } = computeCoordShiftAndScale(pts);
     if (model.hardwareSupport) {
       // update the buffer objects if needed
-      const garray = model.renderable.getMatrixArray();
       const narray = model.renderable.getNormalArray();
       const carray = model.renderable.getColorArray();
       if (!model.matrixBuffer) {
@@ -404,6 +423,13 @@ function vtkOpenGLGlyph3DMapper(publicAPI, model) {
         model.pickBuffer = vtkBufferObject.newInstance();
         model.pickBuffer.setOpenGLRenderWindow(model._openGLRenderWindow);
       }
+      if (useShiftAndScale) {
+        const buf = garray.buffer;
+        for (let ptIdx = 0; ptIdx < garray.byteLength; ptIdx += MAT4_BYTE_SIZE) {
+          const mat = new Float32Array(buf, ptIdx, MAT4_ELEMENT_COUNT);
+          applyShiftScaleToMat(mat, coordShift, coordScale);
+        }
+      }
       if (model.renderable.getBuildTime().getMTime() > model.glyphBOBuildTime.getMTime()) {
         model.matrixBuffer.upload(garray, ObjectType.ARRAY_BUFFER);
         model.normalBuffer.upload(narray, ObjectType.ARRAY_BUFFER);
@@ -430,7 +456,15 @@ function vtkOpenGLGlyph3DMapper(publicAPI, model) {
         model.glyphBOBuildTime.modified();
       }
     }
-    return superClass.buildBufferObjects(ren, actor);
+    superClass.buildBufferObjects(ren, actor);
+
+    // apply shift + scale to primitives AFTER vtkOpenGLPolyDataMapper.buildBufferObjects
+    // so that the Glyph3DMapper gets the last say in the shift + scale
+    if (useShiftAndScale) {
+      for (let i = primTypes.Start; i < primTypes.End; i++) {
+        model.primitives[i].getCABO().setCoordShiftAndScale(coordShift, coordScale);
+      }
+    }
   };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitware/vtk.js",
-  "version": "34.8.0",
+  "version": "34.8.1",
   "description": "Visualization Toolkit for the Web",
   "keywords": [
     "3d",
@@ -30,7 +30,7 @@
   "main": "./index.js",
   "module": "./index.js",
   "dependencies": {
-    "@babel/runtime": "7.22.11",
+    "@babel/runtime": "^7.28.2",
     "@types/webxr": "^0.5.5",
     "commander": "9.2.0",
     "d3-scale": "4.0.2",
@@ -67,7 +67,7 @@
     "babel-loader": "8.2.5",
     "babel-plugin-istanbul": "6.1.1",
     "buffer": "6.0.3",
-    "commitizen": "4.2.5",
+    "commitizen": "^4.3.1",
     "concurrently": "7.1.0",
     "copy-webpack-plugin": "10.2.4",
     "cross-env": "7.0.3",
@@ -125,7 +125,7 @@
     "webpack-bundle-analyzer": "4.5.0",
     "webpack-cli": "4.9.2",
     "webpack-dashboard": "3.3.7",
-    "webpack-dev-server": "4.9.0",
+    "webpack-dev-server": "^5.2.2",
     "webpack-merge": "5.8.0",
     "webpack-notifier": "1.15.0",
     "wslink": "1.12.4",