Merge branch 'master' into volumeShadowExample

Author: martinken

Sources/Rendering/Core/VolumeMapper/index.js

@@ -72,6 +72,27 @@ function vtkVolumeMapper(publicAPI, model) {
   publicAPI.setFilterModeToRaw = () => {
     publicAPI.setFilterMode(FilterMode.RAW);
   };
+
+  publicAPI.setGlobalIlluminationReach = (gl) => {
+    model.globalIlluminationReach = vtkMath.clampValue(gl, 0.0, 1.0);
+    publicAPI.modified();
+  };
+
+  publicAPI.setVolumetricScatteringBlending = (vsb) => {
+    model.volumetricScatteringBlending = vtkMath.clampValue(vsb, 0.0, 1.0);
+
+    publicAPI.modified();
+  };
+
+  publicAPI.setVlumeShadowSamplingDistFactor = (vsdf) => {
+    model.volumeShadowSamplingDistFactor = vsdf >= 1.0 ? vsdf : 1.0;
+    publicAPI.modified();
+  };
+
+  publicAPI.setAnisotropy = (at) => {
+    model.anisotropy = vtkMath.clampValue(at, -0.99, 0.99);
+    publicAPI.modified();
+  };
 }
 
 // ----------------------------------------------------------------------------
@@ -90,6 +111,11 @@ const DEFAULT_VALUES = {
   filterMode: FilterMode.OFF, // ignored by WebGL so no behavior change
   preferSizeOverAccuracy: false, // Whether to use halfFloat representation of float, when it is inaccurate
   computeNormalFromOpacity: false,
+  // volume shadow parameters
+  globalIlluminationReach: 0.0,
+  volumetricScatteringBlending: 0.0,
+  volumeShadowSamplingDistFactor: 5.0,
+  anisotropy: 0.0,
 };
 
 // ----------------------------------------------------------------------------
@@ -108,6 +134,10 @@ export function extend(publicAPI, model, initialValues = {}) {
     'filterMode',
     'preferSizeOverAccuracy',
     'computeNormalFromOpacity',
+    'globalIlluminationReach',
+    'volumetricScatteringBlending',
+    'volumeShadowSamplingDistFactor',
+    'anisotropy',
   ]);
 
   macro.setGetArray(publicAPI, model, ['ipScalarRange'], 2);

Sources/Rendering/OpenGL/VolumeMapper/index.js

@@ -191,6 +191,24 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
       `#define vtkLightComplexity ${model.lastLightComplexity}`
     ).result;
 
+    // set shadow blending flag
+    if (model.lastLightComplexity > 0) {
+      if (model.renderable.getVolumetricScatteringBlending() > 0.0) {
+        FSSource = vtkShaderProgram.substitute(
+          FSSource,
+          '//VTK::VolumeShadowOn',
+          `#define VolumeShadowOn`
+        ).result;
+      }
+      if (model.renderable.getVolumetricScatteringBlending() < 1.0) {
+        FSSource = vtkShaderProgram.substitute(
+          FSSource,
+          '//VTK::SurfaceShadowOn',
+          `#define SurfaceShadowOn`
+        ).result;
+      }
+    }
+
     // if using gradient opacity define that
     model.gopacity = actor.getProperty().getUseGradientOpacity(0);
     for (let nc = 1; iComps && !model.gopacity && nc < numComp; ++nc) {
@@ -290,6 +308,22 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
         false
       ).result;
     }
+
+    if (model.renderable.getVolumetricScatteringBlending() > 0.0) {
+      FSSource = vtkShaderProgram.substitute(
+        FSSource,
+        '//VTK::VolumeShadow::Dec',
+        [
+          `uniform float volumetricScatteringBlending;`,
+          `uniform float giReach;`,
+          `uniform float volumeShadowSamplingDistFactor;`,
+          `uniform float anisotropy;`,
+          `uniform float anisotropy2;`,
+        ],
+        false
+      ).result;
+    }
+
     shaders.Fragment = FSSource;
   };
 
@@ -738,26 +772,26 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
       // specify the planes in view coordinates
       program.setUniform3f(`vPlaneNormal${i}`, normal[0], normal[1], normal[2]);
       program.setUniformf(`vPlaneDistance${i}`, dist);
+    }
 
-      if (actor.getProperty().getUseLabelOutline()) {
-        const image = model.currentInput;
-        const worldToIndex = image.getWorldToIndex();
+    if (actor.getProperty().getUseLabelOutline()) {
+      const image = model.currentInput;
+      const worldToIndex = image.getWorldToIndex();
 
-        program.setUniformMatrix('vWCtoIDX', worldToIndex);
+      program.setUniformMatrix('vWCtoIDX', worldToIndex);
 
-        // Get the projection coordinate to world coordinate transformation matrix.
-        mat4.invert(model.projectionToWorld, keyMats.wcpc);
-        program.setUniformMatrix('PCWCMatrix', model.projectionToWorld);
+      // Get the projection coordinate to world coordinate transformation matrix.
+      mat4.invert(model.projectionToWorld, keyMats.wcpc);
+      program.setUniformMatrix('PCWCMatrix', model.projectionToWorld);
 
-        const size = publicAPI.getRenderTargetSize();
+      const size = publicAPI.getRenderTargetSize();
 
-        program.setUniformf('vpWidth', size[0]);
-        program.setUniformf('vpHeight', size[1]);
+      program.setUniformf('vpWidth', size[0]);
+      program.setUniformf('vpHeight', size[1]);
 
-        const offset = publicAPI.getRenderTargetOffset();
-        program.setUniformf('vpOffsetX', offset[0] / size[0]);
-        program.setUniformf('vpOffsetY', offset[1] / size[1]);
-      }
+      const offset = publicAPI.getRenderTargetOffset();
+      program.setUniformf('vpOffsetX', offset[0] / size[0]);
+      program.setUniformf('vpOffsetY', offset[1] / size[1]);
     }
 
     mat4.invert(model.projectionToView, keyMats.vcpc);
@@ -830,6 +864,25 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
       program.setUniformfv('lightExponent', lightExponent);
       program.setUniformiv('lightPositional', lightPositional);
     }
+    if (model.renderable.getVolumetricScatteringBlending() > 0.0) {
+      program.setUniformf(
+        'giReach',
+        model.renderable.getGlobalIlluminationReach()
+      );
+      program.setUniformf(
+        'volumetricScatteringBlending',
+        model.renderable.getVolumetricScatteringBlending()
+      );
+      program.setUniformf(
+        'volumeShadowSamplingDistFactor',
+        model.renderable.getVolumeShadowSamplingDistFactor()
+      );
+      program.setUniformf('anisotropy', model.renderable.getAnisotropy());
+      program.setUniformf(
+        'anisotropy2',
+        model.renderable.getAnisotropy() ** 2.0
+      );
+    }
   };
 
   publicAPI.setPropertyShaderParameters = (cellBO, ren, actor) => {