@vitessce/scatterplot-gating 3.6.18 → 3.7.0

package/dist/{deflate-X_zVM_Qy.js → deflate-WkvPtv5P.js}

@@ -1,5 +1,5 @@
 import { i as inflate_1 } from "./pako.esm-SxljTded.js";
-import { B as BaseDecoder } from "./index-DxIbmbec.js";
+import { B as BaseDecoder } from "./index-wrQf0yLB.js";
 class DeflateDecoder extends BaseDecoder {
   decodeBlock(buffer) {
     return inflate_1(new Uint8Array(buffer)).buffer;

package/dist/{index-DxIbmbec.js → index-wrQf0yLB.js}

@@ -122031,6 +122031,8 @@ const PIXELATED_TEXTURE_PARAMETERS = {
   [GL$1.TEXTURE_WRAP_T]: GL$1.CLAMP_TO_EDGE
 };
 const GLSL_COLORMAPS = [
+  // NOTE: the ordering of these is important,
+  // as the shader code in bitmask-layer-beta-shaders hardcodes their indices.
   "plasma",
   "viridis",
   "jet",
@@ -123124,22 +123126,22 @@ function addDecoder(cases, importFn) {
   }
   cases.forEach((c2) => registry$1.set(c2, importFn));
 }
-addDecoder([void 0, 1], () => import("./raw-Cpi81EiU.js").then((m2) => m2.default));
-addDecoder(5, () => import("./lzw-ByCiT6yw.js").then((m2) => m2.default));
+addDecoder([void 0, 1], () => import("./raw-g5V-yVQZ.js").then((m2) => m2.default));
+addDecoder(5, () => import("./lzw-BPz0RIPM.js").then((m2) => m2.default));
 addDecoder(6, () => {
   throw new Error("old style JPEG compression is not supported.");
 });
-addDecoder(7, () => import("./jpeg-uWYr3prx.js").then((m2) => m2.default));
-addDecoder([8, 32946], () => import("./deflate-X_zVM_Qy.js").then((m2) => m2.default));
-addDecoder(32773, () => import("./packbits-BfbBkUze.js").then((m2) => m2.default));
+addDecoder(7, () => import("./jpeg-Di23zXFS.js").then((m2) => m2.default));
+addDecoder([8, 32946], () => import("./deflate-WkvPtv5P.js").then((m2) => m2.default));
+addDecoder(32773, () => import("./packbits-4y-CZhCi.js").then((m2) => m2.default));
 addDecoder(
   34887,
-  () => import("./lerc-SWg2S-02.js").then(async (m2) => {
+  () => import("./lerc-BxU7w-lS.js").then(async (m2) => {
     await m2.zstd.init();
     return m2;
   }).then((m2) => m2.default)
 );
-addDecoder(50001, () => import("./webimage-DDFe5y5S.js").then((m2) => m2.default));
+addDecoder(50001, () => import("./webimage-PnoeEp0u.js").then((m2) => m2.default));
 function decodeRowAcc(row, stride) {
   let length2 = row.length - stride;
   let offset2 = 0;
@@ -132922,7 +132924,7 @@ uniform float channelOpacities[7];
 uniform bool channelIsStaticColorMode[7]; // TODO: should this be a single float?
 uniform bool channelIsSetColorMode[7]; // TODO: should this be a single float?
 
-// TODO: can array of tuples/vec2 be used?
+uniform int channelColormapFuncIndices[7];
 uniform float channelColormapRangeStarts[7];
 uniform float channelColormapRangeEnds[7];
 
@@ -132988,7 +132990,30 @@ vec3 sampleAndGetData(sampler2D dataTex, vec2 coord, bool isFilled, float stroke
   return vec3(clampedSampledData * float(isOn), sampledData, float(isEdge));
 }
 
-vec4 dataToColor(vec3 sampledDataAndIsEdge, bool isStaticColorMode, vec3 channelColor, float channelOpacity, float valueOffset, float rangeStart, float rangeEnd, bool isSetColorMode, float setColorOffset) {
+vec3 colormapFunc(float clampedScaledExpressionValue, int colormapIndex) {
+  // Map indices of GLSL_COLORMAPS array to their function calls.
+  // GLSL_COLORMAPS is defined in ./constants.js and needs to stay manually synced.
+  // 0: 'plasma',
+  // 1: 'viridis',
+  // 2: 'jet',
+  // 3: 'greys',
+
+  if (colormapIndex <= 0) {
+    // This should also match -1, to account for a failed Array.indexOf lookup.
+    return plasma(clampedScaledExpressionValue).rgb;
+  }
+  if (colormapIndex == 1) {
+    return viridis(clampedScaledExpressionValue).rgb;
+  }
+  if (colormapIndex == 2) {
+    return jet(clampedScaledExpressionValue).rgb;
+  }
+  if (colormapIndex == 3) {
+    return greys(clampedScaledExpressionValue).rgb;
+  }
+}
+
+vec4 dataToColor(vec3 sampledDataAndIsEdge, bool isStaticColorMode, vec3 channelColor, float channelOpacity, float valueOffset, int colormapFuncIndex, float rangeStart, float rangeEnd, bool isSetColorMode, float setColorOffset) {
   float clampedSampledDataAndIsOn = sampledDataAndIsEdge.x;
   float sampledData = sampledDataAndIsEdge.y;
   float isEdge = sampledDataAndIsEdge.z;
@@ -133032,7 +133057,7 @@ vec4 dataToColor(vec3 sampledDataAndIsEdge, bool isStaticColorMode, vec3 channel
   }
 
   
-  vec4 sampledColor = (1. - (float(isStaticColorMode) + float(isSetColorMode))) * vec4(COLORMAP_FUNC(clamp(scaledExpressionValue, 0.0, 1.0)).rgb, channelOpacity) + float(isStaticColorMode) * vec4(channelColor.rgb, channelOpacity) + float(isSetColorMode) * vec4(setColor, channelOpacity);
+  vec4 sampledColor = (1. - (float(isStaticColorMode) + float(isSetColorMode))) * vec4(colormapFunc(clamp(scaledExpressionValue, 0.0, 1.0), colormapFuncIndex).rgb, channelOpacity) + float(isStaticColorMode) * vec4(channelColor.rgb, channelOpacity) + float(isSetColorMode) * vec4(setColor, channelOpacity);
   // Only return a color if the data is non-zero.
   
   return clampedSampledDataAndIsOn * isEdge * sampledColor;
@@ -133048,15 +133073,15 @@ void main() {
   vec3 dat4 = sampleAndGetData(channel4, vTexCoord, channelsFilled[4], channelStrokeWidths[4], channelsVisible[4]);
   vec3 dat5 = sampleAndGetData(channel5, vTexCoord, channelsFilled[5], channelStrokeWidths[5], channelsVisible[5]);
   vec3 dat6 = sampleAndGetData(channel6, vTexCoord, channelsFilled[6], channelStrokeWidths[6], channelsVisible[6]);
-  
-  vec4 val0 = dataToColor(dat0, channelIsStaticColorMode[0], color0, channelOpacities[0], valueTexOffsets[0], channelColormapRangeStarts[0], channelColormapRangeEnds[0], channelIsSetColorMode[0], colorTexOffsets[0]);
-  vec4 val1 = dataToColor(dat1, channelIsStaticColorMode[1], color1, channelOpacities[1], valueTexOffsets[1], channelColormapRangeStarts[1], channelColormapRangeEnds[1], channelIsSetColorMode[1], colorTexOffsets[1]);
-  vec4 val2 = dataToColor(dat2, channelIsStaticColorMode[2], color2, channelOpacities[2], valueTexOffsets[2], channelColormapRangeStarts[2], channelColormapRangeEnds[2], channelIsSetColorMode[2], colorTexOffsets[2]);
-  vec4 val3 = dataToColor(dat3, channelIsStaticColorMode[3], color3, channelOpacities[3], valueTexOffsets[3], channelColormapRangeStarts[3], channelColormapRangeEnds[3], channelIsSetColorMode[3], colorTexOffsets[3]);
-  vec4 val4 = dataToColor(dat4, channelIsStaticColorMode[4], color4, channelOpacities[4], valueTexOffsets[4], channelColormapRangeStarts[4], channelColormapRangeEnds[4], channelIsSetColorMode[4], colorTexOffsets[4]);
-  vec4 val5 = dataToColor(dat5, channelIsStaticColorMode[5], color5, channelOpacities[5], valueTexOffsets[5], channelColormapRangeStarts[5], channelColormapRangeEnds[5], channelIsSetColorMode[5], colorTexOffsets[5]);
-  vec4 val6 = dataToColor(dat6, channelIsStaticColorMode[6], color6, channelOpacities[6], valueTexOffsets[6], channelColormapRangeStarts[6], channelColormapRangeEnds[6], channelIsSetColorMode[6], colorTexOffsets[6]);
-  
+
+  vec4 val0 = dataToColor(dat0, channelIsStaticColorMode[0], color0, channelOpacities[0], valueTexOffsets[0], channelColormapFuncIndices[0], channelColormapRangeStarts[0], channelColormapRangeEnds[0], channelIsSetColorMode[0], colorTexOffsets[0]);
+  vec4 val1 = dataToColor(dat1, channelIsStaticColorMode[1], color1, channelOpacities[1], valueTexOffsets[1], channelColormapFuncIndices[1], channelColormapRangeStarts[1], channelColormapRangeEnds[1], channelIsSetColorMode[1], colorTexOffsets[1]);
+  vec4 val2 = dataToColor(dat2, channelIsStaticColorMode[2], color2, channelOpacities[2], valueTexOffsets[2], channelColormapFuncIndices[2], channelColormapRangeStarts[2], channelColormapRangeEnds[2], channelIsSetColorMode[2], colorTexOffsets[2]);
+  vec4 val3 = dataToColor(dat3, channelIsStaticColorMode[3], color3, channelOpacities[3], valueTexOffsets[3], channelColormapFuncIndices[3], channelColormapRangeStarts[3], channelColormapRangeEnds[3], channelIsSetColorMode[3], colorTexOffsets[3]);
+  vec4 val4 = dataToColor(dat4, channelIsStaticColorMode[4], color4, channelOpacities[4], valueTexOffsets[4], channelColormapFuncIndices[4], channelColormapRangeStarts[4], channelColormapRangeEnds[4], channelIsSetColorMode[4], colorTexOffsets[4]);
+  vec4 val5 = dataToColor(dat5, channelIsStaticColorMode[5], color5, channelOpacities[5], valueTexOffsets[5], channelColormapFuncIndices[5], channelColormapRangeStarts[5], channelColormapRangeEnds[5], channelIsSetColorMode[5], colorTexOffsets[5]);
+  vec4 val6 = dataToColor(dat6, channelIsStaticColorMode[6], color6, channelOpacities[6], valueTexOffsets[6], channelColormapFuncIndices[6], channelColormapRangeStarts[6], channelColormapRangeEnds[6], channelIsSetColorMode[6], colorTexOffsets[6]);
+
   // If all of the channels are "empty", then discard this pixel so that it is not considered during picking.
   float emptyDat = 0.;
   if(dat0.x == emptyDat && dat1.x == emptyDat && dat2.x == emptyDat && dat3.x == emptyDat && dat4.x == emptyDat && dat5.x == emptyDat && dat6.x == emptyDat) {
@@ -133212,14 +133237,10 @@ const defaultProps$2 = {
 class BitmaskLayer2 extends XRLayer {
   // eslint-disable-next-line class-methods-use-this
   getShaders() {
-    const { colormap } = this.props;
     return {
       fs,
       vs,
-      modules: [project32, picking],
-      defines: {
-        [COLORMAP_SHADER_PLACEHOLDER]: GLSL_COLORMAPS.includes(colormap) ? colormap : GLSL_COLORMAP_DEFAULT
-      }
+      modules: [project32, picking]
     };
   }
   /**
@@ -133278,8 +133299,6 @@ class BitmaskLayer2 extends XRLayer {
       channelOpacities,
       channelColors,
       channelsVisible,
-      // TODO: use `channelFeatureValueColormaps` in shader,
-      // figure out how to call multiple GLSL colormap functions
       channelFeatureValueColormaps,
       channelFeatureValueColormapRanges,
       channelIsStaticColorMode,
@@ -133340,6 +133359,12 @@ class BitmaskLayer2 extends XRLayer {
           // There are six texture entries on the shaders
           MAX_CHANNELS - channelStrokeWidths.length
         ),
+        channelColormapFuncIndices: padWithDefault(
+          channelFeatureValueColormaps.map((d) => GLSL_COLORMAPS.indexOf(d)),
+          0,
+          // There are six texture entries on the shaders
+          MAX_CHANNELS - channelFeatureValueColormaps.length
+        ),
         channelColormapRangeStarts: padWithDefault(
           channelFeatureValueColormapRanges.map((r2) => (r2 == null ? void 0 : r2[0]) || 0),
           0,

package/dist/index.js

@@ -1,4 +1,4 @@
-import { G } from "./index-DxIbmbec.js";
+import { G } from "./index-wrQf0yLB.js";
 export {
   G as GatingSubscriber
 };

package/dist/{jpeg-uWYr3prx.js → jpeg-Di23zXFS.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-DxIbmbec.js";
+import { B as BaseDecoder } from "./index-wrQf0yLB.js";
 const dctZigZag = new Int32Array([
   0,
   1,

package/dist/{lerc-SWg2S-02.js → lerc-BxU7w-lS.js}

@@ -1,5 +1,5 @@
 import { i as inflate_1 } from "./pako.esm-SxljTded.js";
-import { g as getDefaultExportFromCjs, B as BaseDecoder } from "./index-DxIbmbec.js";
+import { g as getDefaultExportFromCjs, B as BaseDecoder } from "./index-wrQf0yLB.js";
 const LercParameters = {
   AddCompression: 1
 };

package/dist/{lzw-ByCiT6yw.js → lzw-BPz0RIPM.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-DxIbmbec.js";
+import { B as BaseDecoder } from "./index-wrQf0yLB.js";
 const MIN_BITS = 9;
 const CLEAR_CODE = 256;
 const EOI_CODE = 257;

package/dist/{packbits-BfbBkUze.js → packbits-4y-CZhCi.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-DxIbmbec.js";
+import { B as BaseDecoder } from "./index-wrQf0yLB.js";
 class PackbitsDecoder extends BaseDecoder {
   decodeBlock(buffer) {
     const dataView = new DataView(buffer);

package/dist/{raw-Cpi81EiU.js → raw-g5V-yVQZ.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-DxIbmbec.js";
+import { B as BaseDecoder } from "./index-wrQf0yLB.js";
 class RawDecoder extends BaseDecoder {
   decodeBlock(buffer) {
     return buffer;

package/dist/{webimage-DDFe5y5S.js → webimage-PnoeEp0u.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-DxIbmbec.js";
+import { B as BaseDecoder } from "./index-wrQf0yLB.js";
 class WebImageDecoder extends BaseDecoder {
   constructor() {
     super();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitessce/scatterplot-gating",
-  "version": "3.6.18",
+  "version": "3.7.0",
   "author": "HIDIVE Lab at HMS",
   "homepage": "http://vitessce.io",
   "repository": {
@@ -19,24 +19,24 @@
     "d3-array": "^2.4.0",
     "lodash-es": "^4.17.21",
     "react-aria": "^3.28.0",
-    "@vitessce/styles": "3.6.18",
-    "@vitessce/constants-internal": "3.6.18",
-    "@vitessce/scatterplot": "3.6.18",
-    "@vitessce/sets-utils": "3.6.18",
-    "@vitessce/utils": "3.6.18",
-    "@vitessce/vit-s": "3.6.18"
+    "@vitessce/styles": "3.7.0",
+    "@vitessce/constants-internal": "3.7.0",
+    "@vitessce/scatterplot": "3.7.0",
+    "@vitessce/sets-utils": "3.7.0",
+    "@vitessce/utils": "3.7.0",
+    "@vitessce/vit-s": "3.7.0"
   },
   "devDependencies": {
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
-    "vite": "^6.3.5",
+    "vite": "^7.0.0",
     "vitest": "^3.1.4"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
   },
   "scripts": {
-    "bundle": "pnpm exec vite build -c ../../../scripts/vite.config.js",
+    "bundle": "pnpm exec vite build -c ../../../scripts/vite.config.mjs",
     "test": "pnpm exec vitest --run"
   },
   "module": "dist/index.js",