refactor(VolumeMapper): minor refactor

Kitware · Mar 6, 2024 · 50314fd · 50314fd
1 parent 4d490f9
commit 50314fd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 23 deletions.
diff --git a/Sources/Rendering/OpenGL/VolumeMapper/Constants.js b/Sources/Rendering/OpenGL/VolumeMapper/Constants.js
@@ -4,7 +4,7 @@ export const ApiSpecificPresets = {
   [ColorMixPreset.ADDITING]: `
   float opacity0 = goFactor.x * pwfValue0;
   float opacity1 = goFactor.y * pwfValue1;
-  float opacitySum = opacity0 + opacity1;
+  float opacitySum = clamp(opacity0 + opacity1, 0.0, 1.0);
   if (opacitySum == 0.0) {
     return vec4(0.0);
   }

diff --git a/Sources/Rendering/OpenGL/VolumeMapper/index.js b/Sources/Rendering/OpenGL/VolumeMapper/index.js
@@ -1,4 +1,5 @@
 import * as macro from 'vtk.js/Sources/macros';
+import DeepEqual from 'fast-deep-equal';
 import { vec3, mat3, mat4 } from 'gl-matrix';
 // import vtkBoundingBox       from 'vtk.js/Sources/Common/DataModel/BoundingBox';
 import vtkDataArray from 'vtk.js/Sources/Common/Core/DataArray';
@@ -33,26 +34,6 @@ const { vtkWarningMacro, vtkErrorMacro } = macro;
 // ----------------------------------------------------------------------------
 // helper methods
 // ----------------------------------------------------------------------------
-// TODO: Do we want this in some shared utility? Shouldwe just use lodash.isEqual
-function arrayEquals(a, b) {
-  if (a.length !== b.length) {
-    return false;
-  }
-  for (let i = 0; i < a.length; ++i) {
-    if (a[i] !== b[i]) {
-      return false;
-    }
-  }
-  return true;
-}
-
-// TODO: Do we want this in some shared utility? Shouldwe just use lodash.isEqual
-function deepEqual(a, b) {
-  return (
-    typeof a === typeof b &&
-    (typeof a !== 'object' || arrayEquals(Object.entries(a), Object.entries(b)))
-  );
-}
 
 function computeFnToString(property, pwfun, numberOfComponents) {
   if (pwfun) {
@@ -525,7 +506,7 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
 
     // We only need to rebuild the shader if one of these variables has changed,
     // since they are used in the shader template replacement step.
-    if (!model.previousState || !deepEqual(model.previousState, state)) {
+    if (!model.previousState || !DeepEqual(model.previousState, state)) {
       model.previousState = state;
 
       return true;

diff --git a/Sources/Rendering/OpenGL/glsl/vtkVolumeFS.glsl b/Sources/Rendering/OpenGL/glsl/vtkVolumeFS.glsl
@@ -1207,7 +1207,7 @@ vec4 getColorForValue(vec4 tValue, vec3 posIS, vec3 tstep)
       return vec4(tColor, alpha);
     #else
       /*
-       * Mix the color informations from all the independent components to get a single rgba output
+       * Mix the color information from all the independent components to get a single rgba output
        *
        * goFactor is computed if vtkGradientOpacityOn
        * it is not computed for proportional components