@kitware/vtk.js 26.9.13 → 27.0.0

package/Rendering/OpenGL/PolyDataMapper.js

@@ -109,88 +109,10 @@ function vtkOpenGLPolyDataMapper(publicAPI, model) {
     publicAPI.renderPiece(ren, actor);
   };
 
-  publicAPI.buildShaders = function (shaders, ren, actor) {
-    publicAPI.getShaderTemplate(shaders, ren, actor);
-    model.lastRenderPassShaderReplacement = model.currentRenderPass ? model.currentRenderPass.getShaderReplacement() : null; // apply any renderPassReplacements
-
-    if (model.lastRenderPassShaderReplacement) {
-      model.lastRenderPassShaderReplacement(shaders);
-    } // user specified pre replacements
-
-
-    var openGLSpec = model.renderable.getViewSpecificProperties().OpenGL;
-    var shaderReplacements = null;
-
-    if (openGLSpec) {
-      shaderReplacements = openGLSpec.ShaderReplacements;
-    }
-
-    if (shaderReplacements) {
-      for (var i = 0; i < shaderReplacements.length; i++) {
-        var currReplacement = shaderReplacements[i];
-
-        if (currReplacement.replaceFirst) {
-          var shaderType = currReplacement.shaderType;
-          var ssrc = shaders[shaderType];
-          var substituteRes = vtkShaderProgram.substitute(ssrc, currReplacement.originalValue, currReplacement.replacementValue, currReplacement.replaceAll);
-          shaders[shaderType] = substituteRes.result;
-        }
-      }
-    }
-
-    publicAPI.replaceShaderValues(shaders, ren, actor); // user specified post replacements
-
-    if (shaderReplacements) {
-      for (var _i = 0; _i < shaderReplacements.length; _i++) {
-        var _currReplacement = shaderReplacements[_i];
-
-        if (!_currReplacement.replaceFirst) {
-          var _shaderType = _currReplacement.shaderType;
-          var _ssrc = shaders[_shaderType];
-
-          var _substituteRes = vtkShaderProgram.substitute(_ssrc, _currReplacement.originalValue, _currReplacement.replacementValue, _currReplacement.replaceAll);
-
-          shaders[_shaderType] = _substituteRes.result;
-        }
-      }
-    }
-  };
-
   publicAPI.getShaderTemplate = function (shaders, ren, actor) {
-    var openGLSpecProp = model.renderable.getViewSpecificProperties().OpenGL;
-    var vertexShaderCode = vtkPolyDataVS;
-
-    if (openGLSpecProp) {
-      var vertexSpecProp = openGLSpecProp.VertexShaderCode;
-
-      if (vertexSpecProp !== undefined && vertexSpecProp !== '') {
-        vertexShaderCode = vertexSpecProp;
-      }
-    }
-
-    shaders.Vertex = vertexShaderCode;
-    var fragmentShaderCode = vtkPolyDataFS;
-
-    if (openGLSpecProp) {
-      var fragmentSpecProp = openGLSpecProp.FragmentShaderCode;
-
-      if (fragmentSpecProp !== undefined && fragmentSpecProp !== '') {
-        fragmentShaderCode = fragmentSpecProp;
-      }
-    }
-
-    shaders.Fragment = fragmentShaderCode;
-    var geometryShaderCode = '';
-
-    if (openGLSpecProp) {
-      var geometrySpecProp = openGLSpecProp.GeometryShaderCode;
-
-      if (geometrySpecProp !== undefined) {
-        geometryShaderCode = geometrySpecProp;
-      }
-    }
-
-    shaders.Geometry = geometryShaderCode;
+    shaders.Vertex = vtkPolyDataVS;
+    shaders.Fragment = vtkPolyDataFS;
+    shaders.Geometry = '';
   };
 
   publicAPI.replaceShaderColor = function (shaders, ren, actor) {
@@ -1353,6 +1275,7 @@ function extend(publicAPI, model) {
 
   vtkViewNode.extend(publicAPI, model, initialValues);
   vtkReplacementShaderMapper.implementReplaceShaderCoincidentOffset(publicAPI, model, initialValues);
+  vtkReplacementShaderMapper.implementBuildShadersWithReplacements(publicAPI, model, initialValues);
   model.primitives = [];
   model.primTypes = primTypes;
   model.tmpMat3 = mat3.identity(new Float64Array(9));

package/Rendering/OpenGL/PolyDataMapper2D.js

@@ -45,40 +45,9 @@ function vtkOpenGLPolyDataMapper2D(publicAPI, model) {
   };
 
   publicAPI.getShaderTemplate = function (shaders, ren, actor) {
-    var openGLSpecProp = model.renderable.getViewSpecificProperties().OpenGL;
-    var vertexShaderCode = vtkPolyData2DVS;
-
-    if (openGLSpecProp) {
-      var vertexSpecProp = openGLSpecProp.VertexShaderCode;
-
-      if (vertexSpecProp !== undefined && vertexSpecProp !== '') {
-        vertexShaderCode = vertexSpecProp;
-      }
-    }
-
-    shaders.Vertex = vertexShaderCode;
-    var fragmentShaderCode = vtkPolyData2DFS;
-
-    if (openGLSpecProp) {
-      var fragmentSpecProp = openGLSpecProp.FragmentShaderCode;
-
-      if (fragmentSpecProp !== undefined && fragmentSpecProp !== '') {
-        fragmentShaderCode = fragmentSpecProp;
-      }
-    }
-
-    shaders.Fragment = fragmentShaderCode;
-    var geometryShaderCode = '';
-
-    if (openGLSpecProp) {
-      var geometrySpecProp = openGLSpecProp.GeometryShaderCode;
-
-      if (geometrySpecProp !== undefined) {
-        geometryShaderCode = geometrySpecProp;
-      }
-    }
-
-    shaders.Geometry = geometryShaderCode;
+    shaders.Vertex = vtkPolyData2DVS;
+    shaders.Fragment = vtkPolyData2DFS;
+    shaders.Geometry = '';
   };
 
   publicAPI.render = function () {
@@ -265,47 +234,6 @@ function vtkOpenGLPolyDataMapper2D(publicAPI, model) {
     }
   };
 
-  publicAPI.buildShaders = function (shaders, ren, actor) {
-    publicAPI.getShaderTemplate(shaders, ren, actor); // user specified pre replacements
-
-    var openGLSpec = model.renderable.getViewSpecificProperties().OpenGL;
-    var shaderReplacements = null;
-
-    if (openGLSpec) {
-      shaderReplacements = openGLSpec.ShaderReplacements;
-    }
-
-    if (shaderReplacements) {
-      for (var i = 0; i < shaderReplacements.length; i++) {
-        var currReplacement = shaderReplacements[i];
-
-        if (currReplacement.replaceFirst) {
-          var shaderType = currReplacement.shaderType;
-          var ssrc = shaders[shaderType];
-          var substituteRes = vtkShaderProgram.substitute(ssrc, currReplacement.originalValue, currReplacement.replacementValue, currReplacement.replaceAll);
-          shaders[shaderType] = substituteRes.result;
-        }
-      }
-    }
-
-    publicAPI.replaceShaderValues(shaders, ren, actor); // user specified post replacements
-
-    if (shaderReplacements) {
-      for (var _i = 0; _i < shaderReplacements.length; _i++) {
-        var _currReplacement = shaderReplacements[_i];
-
-        if (!_currReplacement.replaceFirst) {
-          var _shaderType = _currReplacement.shaderType;
-          var _ssrc = shaders[_shaderType];
-
-          var _substituteRes = vtkShaderProgram.substitute(_ssrc, _currReplacement.originalValue, _currReplacement.replacementValue, _currReplacement.replaceAll);
-
-          shaders[_shaderType] = _substituteRes.result;
-        }
-      }
-    }
-  };
-
   publicAPI.replaceShaderValues = function (shaders, ren, actor) {
     publicAPI.replaceShaderColor(shaders, ren, actor);
     publicAPI.replaceShaderTCoord(shaders, ren, actor);
@@ -559,6 +487,7 @@ function extend(publicAPI, model) {
 
   vtkViewNode.extend(publicAPI, model, initialValues);
   vtkReplacementShaderMapper.implementReplaceShaderCoincidentOffset(publicAPI, model, initialValues);
+  vtkReplacementShaderMapper.implementBuildShadersWithReplacements(publicAPI, model, initialValues);
   model.primitives = [];
   model.primTypes = primTypes;
   model.tmpMat4 = mat4.identity(new Float64Array(16));

package/Rendering/OpenGL/Profiles/All.js

@@ -9,6 +9,7 @@ import '../ScalarBarActor.js';
 import '../Skybox.js';
 import '../Texture.js';
 import '../Glyph3DMapper.js';
+import '../ImageResliceMapper.js';
 import '../ImageMapper.js';
 import '../ImageSlice.js';
 import '../Volume.js';

package/Rendering/OpenGL/Profiles/Volume.js

@@ -1,5 +1,6 @@
 import '../Camera.js';
 import '../Renderer.js';
+import '../ImageResliceMapper.js';
 import '../ImageMapper.js';
 import '../ImageSlice.js';
 import '../Volume.js';

package/Rendering/OpenGL/ReplacementShaderMapper.js

@@ -36,8 +36,87 @@ function implementReplaceShaderCoincidentOffset(publicAPI, model) {
   };
 }
 
+function implementBuildShadersWithReplacements(publicAPI, model) {
+
+  publicAPI.applyShaderReplacements = function (shaders, viewSpec, pre) {
+    var shaderReplacements = null;
+
+    if (viewSpec) {
+      shaderReplacements = viewSpec.ShaderReplacements;
+    }
+
+    if (shaderReplacements) {
+      for (var i = 0; i < shaderReplacements.length; i++) {
+        var currReplacement = shaderReplacements[i];
+
+        if (pre && currReplacement.replaceFirst || !pre && !currReplacement.replaceFirst) {
+          var shaderType = currReplacement.shaderType;
+          var ssrc = shaders[shaderType];
+          var substituteRes = vtkShaderProgram.substitute(ssrc, currReplacement.originalValue, currReplacement.replacementValue, currReplacement.replaceAll);
+          shaders[shaderType] = substituteRes.result;
+        }
+      }
+    }
+  };
+
+  publicAPI.buildShaders = function (shaders, ren, actor) {
+    publicAPI.getReplacedShaderTemplate(shaders, ren, actor);
+    model.lastRenderPassShaderReplacement = model.currentRenderPass ? model.currentRenderPass.getShaderReplacement() : null; // apply any renderPassReplacements
+
+    if (model.lastRenderPassShaderReplacement) {
+      model.lastRenderPassShaderReplacement(shaders);
+    }
+
+    var openGLSpec = model.renderable.getViewSpecificProperties().OpenGL; // user specified pre replacements
+
+    publicAPI.applyShaderReplacements(shaders, openGLSpec, true);
+    publicAPI.replaceShaderValues(shaders, ren, actor); // user specified post replacements
+
+    publicAPI.applyShaderReplacements(shaders, openGLSpec);
+  };
+
+  publicAPI.getReplacedShaderTemplate = function (shaders, ren, actor) {
+    var openGLSpecProp = model.renderable.getViewSpecificProperties().OpenGL;
+    publicAPI.getShaderTemplate(shaders, ren, actor);
+    var vertexShaderCode = shaders.Vertex;
+
+    if (openGLSpecProp) {
+      var vertexSpecProp = openGLSpecProp.VertexShaderCode;
+
+      if (vertexSpecProp !== undefined && vertexSpecProp !== '') {
+        vertexShaderCode = vertexSpecProp;
+      }
+    }
+
+    shaders.Vertex = vertexShaderCode;
+    var fragmentShaderCode = shaders.Fragment;
+
+    if (openGLSpecProp) {
+      var fragmentSpecProp = openGLSpecProp.FragmentShaderCode;
+
+      if (fragmentSpecProp !== undefined && fragmentSpecProp !== '') {
+        fragmentShaderCode = fragmentSpecProp;
+      }
+    }
+
+    shaders.Fragment = fragmentShaderCode;
+    var geometryShaderCode = shaders.Geometry;
+
+    if (openGLSpecProp) {
+      var geometrySpecProp = openGLSpecProp.GeometryShaderCode;
+
+      if (geometrySpecProp !== undefined) {
+        geometryShaderCode = geometrySpecProp;
+      }
+    }
+
+    shaders.Geometry = geometryShaderCode;
+  };
+}
+
 var vtkReplacementShaderMapper = {
-  implementReplaceShaderCoincidentOffset: implementReplaceShaderCoincidentOffset
+  implementReplaceShaderCoincidentOffset: implementReplaceShaderCoincidentOffset,
+  implementBuildShadersWithReplacements: implementBuildShadersWithReplacements
 };
 
 export { vtkReplacementShaderMapper as default };

package/Rendering/OpenGL/ShaderProgram.js

@@ -100,7 +100,7 @@ function vtkShaderProgram(publicAPI, model) {
   };
 
   publicAPI.link = function () {
-    if (model.inked) {
+    if (model.linked) {
       return true;
     }
 

package/Rendering/OpenGL/Texture.js

@@ -1106,8 +1106,8 @@ function vtkOpenGLTexture(publicAPI, model) {
     var pixData = updateArrayDataType(dataType, dataArray, is3DArray);
     var scaledData = scaleTextureToHighestPowerOfTwo(pixData); // Source texture data from the PBO.
     // model.context.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, true);
-    // model.context.pixelStorei(model.context.UNPACK_ALIGNMENT, 1);
-    // openGLDataType
+
+    model.context.pixelStorei(model.context.UNPACK_ALIGNMENT, 1); // openGLDataType
 
     if (useTexStorage(dataType)) {
       model.context.texStorage3D(model.target, 1, model.internalFormat, model.width, model.height, model.depth);

package/Rendering/OpenGL/glsl/vtkImageResliceMapperFS.glsl.js

@@ -0,0 +1,3 @@
+var vtkImageResliceMapperFS = "//VTK::System::Dec\n\n/*=========================================================================\n\n  Program:   Visualization Toolkit\n  Module:    vtkImageResliceMapperFS.glsl\n\n  Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen\n  All rights reserved.\n  See Copyright.txt or http://www.kitware.com/Copyright.htm for details.\n\n     This software is distributed WITHOUT ANY WARRANTY; without even\n     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR\n     PURPOSE.  See the above copyright notice for more information.\n\n=========================================================================*/\n// Template for the gpu image mapper fragment shader\n\n// VC position of this fragment\n//VTK::PositionVC::Dec\n\n// Texture coordinates\n//VTK::TCoord::Dec\n\n// picking support\n//VTK::Picking::Dec\n\n// handle coincident offsets\n//VTK::Coincident::Dec\n\n//VTK::ZBuffer::Dec\n\n// the output of this shader\n//VTK::Output::Dec\n\nvoid main()\n{\n  // VC position of this fragment. This should not branch/return/discard.\n  //VTK::PositionVC::Impl\n\n  // Place any calls that require uniform flow (e.g. dFdx) here.\n  //VTK::UniformFlow::Impl\n\n  // Set gl_FragDepth here (gl_FragCoord.z by default)\n  //VTK::Depth::Impl\n\n  // Early depth peeling abort:\n  //VTK::DepthPeeling::PreColor\n\n  //VTK::TCoord::Impl\n\n  if (gl_FragData[0].a <= 0.0)\n    {\n    discard;\n    }\n\n  //VTK::DepthPeeling::Impl\n\n  //VTK::Picking::Impl\n\n  // handle coincident offsets\n  //VTK::Coincident::Impl\n\n  //VTK::ZBuffer::Impl\n\n  //VTK::RenderPassFragmentShader::Impl\n}\n";
+
+export { vtkImageResliceMapperFS as v };

package/Rendering/OpenGL/glsl/vtkImageResliceMapperVS.glsl.js

@@ -0,0 +1,3 @@
+var vtkImageResliceMapperVS = "//VTK::System::Dec\n\n/*=========================================================================\n\n  Program:   Visualization Toolkit\n  Module:    vtkImageResliceMapperVS.glsl\n\n  Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen\n  All rights reserved.\n  See Copyright.txt or http://www.kitware.com/Copyright.htm for details.\n\n     This software is distributed WITHOUT ANY WARRANTY; without even\n     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR\n     PURPOSE.  See the above copyright notice for more information.\n\n=========================================================================*/\n\n// all variables that represent positions or directions have a suffix\n// indicating the coordinate system they are in. The possible values are\n// MC - Model coordinates\n// WC - World coordinates\n// VC - View coordinates\n// DC - Display coordinates\n// TC - Texture coordinates\n\n// frag position in VC\n//VTK::PositionVC::Dec\n\n// Texture coordinates\n//VTK::TCoord::Dec\n\n// picking support\n//VTK::Picking::Dec\n\n// camera and actor matrix values\n//VTK::Camera::Dec\n\nvoid main()\n{\n  //VTK::PositionVC::Impl\n\n  //VTK::TCoord::Impl\n\n  //VTK::Picking::Impl\n}\n";
+
+export { vtkImageResliceMapperVS as v };

package/Rendering/OpenGL.js

@@ -17,6 +17,7 @@ import vtkOpenGLPolyDataMapper from './OpenGL/PolyDataMapper.js';
 import vtkPolyDataMapper2D from './OpenGL/PolyDataMapper2D.js';
 import vtkRenderer from './OpenGL/Renderer.js';
 import vtkRenderWindow from './OpenGL/RenderWindow.js';
+import vtkImageResliceMapper from './OpenGL/ImageResliceMapper.js';
 import './OpenGL/ScalarBarActor.js';
 import vtkShader from './OpenGL/Shader.js';
 import vtkShaderCache from './OpenGL/ShaderCache.js';
@@ -48,8 +49,9 @@ var OpenGL = {
   vtkPixelSpaceCallbackMapper: vtkPixelSpaceCallbackMapper,
   vtkPolyDataMapper: vtkOpenGLPolyDataMapper,
   vtkPolyDataMapper2D: vtkPolyDataMapper2D,
-  vtkRenderer: vtkRenderer,
   vtkRenderWindow: vtkRenderWindow,
+  vtkRenderer: vtkRenderer,
+  vtkImageResliceMapper: vtkImageResliceMapper,
   vtkShader: vtkShader,
   vtkShaderCache: vtkShaderCache,
   vtkShaderProgram: vtkShaderProgram,

package/Rendering/Profiles/All.js

@@ -9,6 +9,7 @@ import '../OpenGL/ScalarBarActor.js';
 import '../OpenGL/Skybox.js';
 import '../OpenGL/Texture.js';
 import '../OpenGL/Glyph3DMapper.js';
+import '../OpenGL/ImageResliceMapper.js';
 import '../OpenGL/ImageMapper.js';
 import '../OpenGL/ImageSlice.js';
 import '../OpenGL/Volume.js';

package/Rendering/Profiles/Volume.js

@@ -1,5 +1,6 @@
 import '../OpenGL/Camera.js';
 import '../OpenGL/Renderer.js';
+import '../OpenGL/ImageResliceMapper.js';
 import '../OpenGL/ImageMapper.js';
 import '../OpenGL/ImageSlice.js';
 import '../OpenGL/Volume.js';

package/index.d.ts

@@ -117,7 +117,9 @@
 /// <reference path="./Interaction/Manipulators/MouseCameraTrackballZoomManipulator.d.ts" />
 /// <reference path="./Interaction/Manipulators/MouseCameraTrackballZoomToMouseManipulator.d.ts" />
 /// <reference path="./Interaction/Manipulators/MouseRangeManipulator.d.ts" />
+/// <reference path="./Interaction/Style/InteractorStyleImage.d.ts" />
 /// <reference path="./Interaction/Style/InteractorStyleManipulator.d.ts" />
+/// <reference path="./Interaction/Style/InteractorStyleTrackballCamera.d.ts" />
 /// <reference path="./Interaction/Widgets/OrientationMarkerWidget/Constants.d.ts" />
 /// <reference path="./Interaction/Widgets/OrientationMarkerWidget.d.ts" />
 /// <reference path="./Proxy/Core/AbstractRepresentationProxy.d.ts" />
@@ -153,6 +155,8 @@
 /// <reference path="./Rendering/Core/ImageMapper.d.ts" />
 /// <reference path="./Rendering/Core/ImageProperty/Constants.d.ts" />
 /// <reference path="./Rendering/Core/ImageProperty.d.ts" />
+/// <reference path="./Rendering/Core/ImageResliceMapper/Constants.d.ts" />
+/// <reference path="./Rendering/Core/ImageResliceMapper.d.ts" />
 /// <reference path="./Rendering/Core/ImageSlice.d.ts" />
 /// <reference path="./Rendering/Core/InteractorObserver.d.ts" />
 /// <reference path="./Rendering/Core/InteractorStyle/Constants.d.ts" />

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitware/vtk.js",
-  "version": "26.9.13",
+  "version": "27.0.0",
   "description": "Visualization Toolkit for the Web",
   "keywords": [
     "3d",
@@ -118,7 +118,7 @@
     "style-loader": "3.3.1",
     "tape": "5.5.3",
     "tape-catch": "1.0.6",
-    "webpack": "5.72.1",
+    "webpack": "5.76.0",
     "webpack-bundle-analyzer": "4.5.0",
     "webpack-cli": "4.9.2",
     "webpack-dashboard": "3.3.7",
@@ -126,7 +126,7 @@
     "webpack-merge": "5.8.0",
     "webpack-notifier": "1.15.0",
     "wslink": "1.6.4",
-    "xml2js": "0.4.23"
+    "xml2js": "0.5.0"
   },
   "peerDependencies": {
     "@babel/preset-env": "^7.17.10",