@kitware/vtk.js 26.1.0 → 26.1.2

package/Rendering/OpenGL/Texture.js

@@ -755,7 +755,13 @@ function vtkOpenGLTexture(publicAPI, model) {
 
     model.context.pixelStorei(model.context.UNPACK_FLIP_Y_WEBGL, flip);
     model.context.pixelStorei(model.context.UNPACK_ALIGNMENT, 1);
-    model.context.texImage2D(model.target, 0, model.internalFormat, model.width, model.height, 0, model.format, model.openGLDataType, scaledData[0]);
+
+    if (model._openGLRenderWindow.getWebgl2()) {
+      model.context.texStorage2D(model.target, 1, model.internalFormat, model.width, model.height);
+      model.context.texSubImage2D(model.target, 0, 0, 0, model.width, model.height, model.format, model.openGLDataType, scaledData[0]);
+    } else {
+      model.context.texImage2D(model.target, 0, model.internalFormat, model.width, model.height, 0, model.format, model.openGLDataType, scaledData[0]);
+    }
 
     if (model.generateMipmap) {
       model.context.generateMipmap(model.target);
@@ -819,7 +825,12 @@ function vtkOpenGLTexture(publicAPI, model) {
     } // Source texture data from the PBO.
 
 
-    model.context.pixelStorei(model.context.UNPACK_ALIGNMENT, 1); // We get the 6 images
+    model.context.pixelStorei(model.context.UNPACK_ALIGNMENT, 1);
+
+    if (model._openGLRenderWindow.getWebgl2()) {
+      model.context.texStorage2D(model.target, 6, model.internalFormat, model.width, model.height);
+    } // We get the 6 images
+
 
     for (var _i3 = 0; _i3 < 6; _i3++) {
       // For each mipmap level
@@ -837,7 +848,12 @@ function vtkOpenGLTexture(publicAPI, model) {
           tempData = invertedData[6 * j + _i3];
         }
 
-        model.context.texImage2D(model.context.TEXTURE_CUBE_MAP_POSITIVE_X + _i3, j, model.internalFormat, w, h, 0, model.format, model.openGLDataType, tempData);
+        if (model._openGLRenderWindow.getWebgl2()) {
+          model.context.texSubImage2D(model.context.TEXTURE_CUBE_MAP_POSITIVE_X + _i3, j, 0, 0, w, h, model.format, model.openGLDataType, tempData);
+        } else {
+          model.context.texImage2D(model.context.TEXTURE_CUBE_MAP_POSITIVE_X + _i3, j, model.internalFormat, w, h, 0, model.format, model.openGLDataType, tempData);
+        }
+
         j++;
         w /= 2;
         h /= 2;
@@ -885,7 +901,13 @@ function vtkOpenGLTexture(publicAPI, model) {
     // model.context.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, true);
 
     model.context.pixelStorei(model.context.UNPACK_ALIGNMENT, 1);
-    model.context.texImage2D(model.target, 0, model.internalFormat, model.width, model.height, 0, model.format, model.openGLDataType, data);
+
+    if (model._openGLRenderWindow.getWebgl2()) {
+      model.context.texStorage2D(model.target, 1, model.internalFormat, model.width, model.height);
+      model.context.texSubImage2D(model.target, 0, 0, 0, model.width, model.height, model.format, model.openGLDataType, data);
+    } else {
+      model.context.texImage2D(model.target, 0, model.internalFormat, model.width, model.height, 0, model.format, model.openGLDataType, data);
+    }
 
     if (model.generateMipmap) {
       model.context.generateMipmap(model.target);
@@ -931,7 +953,13 @@ function vtkOpenGLTexture(publicAPI, model) {
     ctx.scale(1, -1);
     ctx.drawImage(image, 0, 0, image.width, image.height, 0, 0, canvas.width, canvas.height);
     var safeImage = canvas;
-    model.context.texImage2D(model.target, 0, model.internalFormat, model.format, model.openGLDataType, safeImage);
+
+    if (model._openGLRenderWindow.getWebgl2()) {
+      model.context.texStorage2D(model.target, 1, model.internalFormat, model.width, model.height);
+      model.context.texSubImage2D(model.target, 0, 0, 0, model.width, model.height, model.format, model.openGLDataType, safeImage);
+    } else {
+      model.context.texImage2D(model.target, 0, model.internalFormat, model.width, model.height, 0, model.format, model.openGLDataType, safeImage);
+    }
 
     if (model.generateMipmap) {
       model.context.generateMipmap(model.target);
@@ -1058,7 +1086,12 @@ function vtkOpenGLTexture(publicAPI, model) {
     // model.context.pixelStorei(model.context.UNPACK_ALIGNMENT, 1);
     // openGLDataType
 
-    model.context.texImage3D(model.target, 0, model.internalFormat, model.width, model.height, model.depth, 0, model.format, model.openGLDataType, scaledData[0]);
+    if (model._openGLRenderWindow.getWebgl2()) {
+      model.context.texStorage3D(model.target, 1, model.internalFormat, model.width, model.height, model.depth);
+      model.context.texSubImage3D(model.target, 0, 0, 0, 0, model.width, model.height, model.depth, model.format, model.openGLDataType, scaledData[0]);
+    } else {
+      model.context.texImage3D(model.target, 0, model.internalFormat, model.width, model.height, model.depth, 0, model.format, model.openGLDataType, scaledData[0]);
+    }
 
     if (model.generateMipmap) {
       model.context.generateMipmap(model.target);
@@ -1293,7 +1326,14 @@ function vtkOpenGLTexture(publicAPI, model) {
 
 
     model.context.pixelStorei(model.context.UNPACK_ALIGNMENT, 1);
-    model.context.texImage2D(model.target, 0, model.internalFormat, model.width, model.height, 0, model.format, model.openGLDataType, newArray);
+
+    if (model._openGLRenderWindow.getWebgl2()) {
+      model.context.texStorage2D(model.target, 1, model.internalFormat, model.width, model.height);
+      model.context.texSubImage2D(model.target, 0, 0, 0, model.width, model.height, model.format, model.openGLDataType, newArray);
+    } else {
+      model.context.texImage2D(model.target, 0, model.internalFormat, model.width, model.height, 0, model.format, model.openGLDataType, newArray);
+    }
+
     publicAPI.deactivate();
     return true;
   };

package/Rendering/OpenGL/VolumeMapper.js

@@ -1,3 +1,4 @@
+import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { newInstance as newInstance$1, obj, setGet, chain, vtkWarningMacro as vtkWarningMacro$1, vtkErrorMacro as vtkErrorMacro$1 } from '../../macros.js';
 import { mat4, mat3, vec3 } from 'gl-matrix';
@@ -534,9 +535,28 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
     if (actor.getProperty().getUseLabelOutline()) {
       var image = model.currentInput;
       var worldToIndex = image.getWorldToIndex();
-      program.setUniformMatrix('vWCtoIDX', worldToIndex); // Get the projection coordinate to world coordinate transformation matrix.
+      program.setUniformMatrix('vWCtoIDX', worldToIndex);
+      var camera = ren.getActiveCamera();
 
-      mat4.invert(model.projectionToWorld, keyMats.wcpc);
+      var _camera$getClippingRa = camera.getClippingRange(),
+          _camera$getClippingRa2 = _slicedToArray(_camera$getClippingRa, 2),
+          cRange0 = _camera$getClippingRa2[0],
+          cRange1 = _camera$getClippingRa2[1];
+
+      var distance = camera.getDistance(); // set the clipping range to be model.distance and model.distance + 0.1
+      // since we use the in the keyMats.wcpc (world to projection) matrix
+      // the projection matrix calculation relies on the clipping range to be
+      // set correctly. This is done inside the interactorStyleMPRSlice which
+      // limits use cases where the interactor style is not used.
+
+      camera.setClippingRange(distance, distance + 0.1);
+      var labelOutlineKeyMats = model.openGLCamera.getKeyMatrices(ren); // Get the projection coordinate to world coordinate transformation matrix.
+
+      mat4.invert(model.projectionToWorld, labelOutlineKeyMats.wcpc); // reset the clipping range since the keyMats are cached
+
+      camera.setClippingRange(cRange0, cRange1); // to re compute the matrices for the current camera and cache them
+
+      model.openGLCamera.getKeyMatrices(ren);
       program.setUniformMatrix('PCWCMatrix', model.projectionToWorld);
       var size = publicAPI.getRenderTargetSize();
       program.setUniformf('vpWidth', size[0]);

package/package.json

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