@kitware/vtk.js 34.16.1 → 34.16.2

package/Rendering/OpenGL/CellArrayBufferObject/helpers.js

@@ -1,3 +1,5 @@
+import { vec3, mat4, quat } from 'gl-matrix';
+
 function computeCoordShiftAndScale(points) {
   // Find out if shift scale should be used
   // Compute squares of diagonal size and distance from the origin
@@ -38,8 +40,16 @@ function computeCoordShiftAndScale(points) {
     coordScale: new Float32Array([1, 1, 1])
   };
 }
+function computeInverseShiftAndScaleMatrix(coordShift, coordScale) {
+  const inverseScale = new Float64Array(3);
+  vec3.inverse(inverseScale, coordScale);
+  const matrix = new Float64Array(16);
+  mat4.fromRotationTranslationScale(matrix, quat.create(), coordShift, inverseScale);
+  return matrix;
+}
 var helpers = {
-  computeCoordShiftAndScale
+  computeCoordShiftAndScale,
+  computeInverseShiftAndScaleMatrix
 };
 
-export { computeCoordShiftAndScale, helpers as default };
+export { computeCoordShiftAndScale, computeInverseShiftAndScaleMatrix, helpers as default };

package/Rendering/OpenGL/CellArrayBufferObject.js

@@ -1,9 +1,9 @@
-import { vec3, mat4, quat } from 'gl-matrix';
+import { vec3 } from 'gl-matrix';
 import { m as macro } from '../../macros2.js';
 import vtkBufferObject from './BufferObject.js';
 import { ObjectType } from './BufferObject/Constants.js';
 import { Representation } from '../Core/Property/Constants.js';
-import { computeCoordShiftAndScale } from './CellArrayBufferObject/helpers.js';
+import { computeCoordShiftAndScale, computeInverseShiftAndScaleMatrix } from './CellArrayBufferObject/helpers.js';
 
 const {
   vtkErrorMacro
@@ -13,13 +13,6 @@ const {
 // Static functions
 // ----------------------------------------------------------------------------
 
-function computeInverseShiftAndScaleMatrix(coordShift, coordScale) {
-  const inverseScale = new Float64Array(3);
-  vec3.inverse(inverseScale, coordScale);
-  const matrix = new Float64Array(16);
-  mat4.fromRotationTranslationScale(matrix, quat.create(), coordShift, inverseScale);
-  return matrix;
-}
 function shouldApplyCoordShiftAndScale(coordShift, coordScale) {
   if (coordShift === null || coordScale === null) {
     return false;

package/Rendering/OpenGL/Glyph3DMapper.js

@@ -5,7 +5,7 @@ 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 { computeCoordShiftAndScale, computeInverseShiftAndScaleMatrix } from './CellArrayBufferObject/helpers.js';
 import { registerOverride } from './ViewNodeFactory.js';
 import { primTypes } from './Helper.js';
 
@@ -29,15 +29,6 @@ const 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
@@ -441,9 +432,11 @@ function vtkOpenGLGlyph3DMapper(publicAPI, model) {
       }
       if (useShiftAndScale) {
         const buf = garray.buffer;
+        const shiftScaleMat = computeInverseShiftAndScaleMatrix(coordShift, coordScale);
+        mat4.invert(shiftScaleMat, shiftScaleMat);
         for (let ptIdx = 0; ptIdx < garray.byteLength; ptIdx += MAT4_BYTE_SIZE) {
           const mat = new Float32Array(buf, ptIdx, MAT4_ELEMENT_COUNT);
-          applyShiftScaleToMat(mat, coordShift, coordScale);
+          mat4.multiply(mat, shiftScaleMat, mat);
         }
       }
       if (model.renderable.getBuildTime().getMTime() > model.glyphBOBuildTime.getMTime()) {

package/package.json

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