@kitware/vtk.js 29.11.1 → 29.11.2

package/Rendering/OpenGL/ImageCPRMapper.js

@@ -487,7 +487,7 @@ function vtkOpenGLImageCPRMapper(publicAPI, model) {
     // weighting shift and scale
     `uniform float pwfshift0;`, `uniform float pwfscale0;`];
     if (useProjection) {
-      tcoordFSDec.push('uniform vec3 spacing;', 'uniform int projectionSlabNumberOfSamples;', 'uniform float projectionConstantOffset;', 'uniform float projectionStepLength;');
+      tcoordFSDec.push('uniform vec3 volumeSizeMC;', 'uniform int projectionSlabNumberOfSamples;', 'uniform float projectionConstantOffset;', 'uniform float projectionStepLength;');
     }
     if (isDirectionUniform) {
       tcoordFSDec.push('in vec3 samplingDirVSOutput;');
@@ -571,7 +571,7 @@ function vtkOpenGLImageCPRMapper(publicAPI, model) {
       }
 
       // Loop on all the samples of the projection
-      tcoordFSImpl.push('vec3 projectionScaledDirection = projectionDirection / spacing;', 'vec3 projectionStep = projectionStepLength * projectionScaledDirection;', 'vec3 projectionStartPosition = volumePosTC + projectionConstantOffset * projectionScaledDirection;', 'vec4 tvalue = initialProjectionTextureValue;', 'for (int projectionSampleIdx = 0; projectionSampleIdx < projectionSlabNumberOfSamples; ++projectionSampleIdx) {', '  vec3 projectionSamplePosition = projectionStartPosition + float(projectionSampleIdx) * projectionStep;', '  vec4 sampledTextureValue = texture(volumeTexture, projectionSamplePosition);');
+      tcoordFSImpl.push('vec3 projectionScaledDirection = projectionDirection / volumeSizeMC;', 'vec3 projectionStep = projectionStepLength * projectionScaledDirection;', 'vec3 projectionStartPosition = volumePosTC + projectionConstantOffset * projectionScaledDirection;', 'vec4 tvalue = initialProjectionTextureValue;', 'for (int projectionSampleIdx = 0; projectionSampleIdx < projectionSlabNumberOfSamples; ++projectionSampleIdx) {', '  vec3 projectionSamplePosition = projectionStartPosition + float(projectionSampleIdx) * projectionStep;', '  vec4 sampledTextureValue = texture(volumeTexture, projectionSamplePosition);');
       switch (projectionMode) {
         case ProjectionMode.MAX:
           tcoordFSImpl.push('  tvalue = max(tvalue, sampledTextureValue);');
@@ -706,9 +706,11 @@ function vtkOpenGLImageCPRMapper(publicAPI, model) {
     if (model.renderable.isProjectionEnabled()) {
       const image = model.currentImageDataInput;
       const spacing = image.getSpacing();
+      const dimensions = image.getDimensions();
       const projectionSlabThickness = model.renderable.getProjectionSlabThickness();
       const projectionSlabNumberOfSamples = model.renderable.getProjectionSlabNumberOfSamples();
-      program.setUniform3fArray('spacing', spacing);
+      const volumeSize = vec3.mul([], spacing, dimensions);
+      program.setUniform3fArray('volumeSizeMC', volumeSize);
       program.setUniformi('projectionSlabNumberOfSamples', projectionSlabNumberOfSamples);
       const constantOffset = -0.5 * projectionSlabThickness;
       program.setUniformf('projectionConstantOffset', constantOffset);

package/package.json

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