@vitessce/spatial-accelerated 3.9.3 → 3.9.5

package/dist/index.js

@@ -46770,14 +46770,14 @@ reconciler.injectIntoDevTools({
   rendererPackageName: "@react-three/fiber",
   version: React.version
 });
-function _extends$3() {
-  return _extends$3 = Object.assign ? Object.assign.bind() : function(n) {
+function _extends$2() {
+  return _extends$2 = Object.assign ? Object.assign.bind() : function(n) {
     for (var e = 1; e < arguments.length; e++) {
       var t = arguments[e];
       for (var r2 in t) ({}).hasOwnProperty.call(t, r2) && (n[r2] = t[r2]);
     }
     return n;
-  }, _extends$3.apply(null, arguments);
+  }, _extends$2.apply(null, arguments);
 }
 var debounce_1;
 var hasRequiredDebounce;
@@ -47258,7 +47258,7 @@ const CanvasImpl = /* @__PURE__ */ React.forwardRef(function Canvas({
     if (canvas) return () => unmountComponentAtNode(canvas);
   }, []);
   const pointerEvents = eventSource ? "none" : "auto";
-  return /* @__PURE__ */ React.createElement("div", _extends$3({
+  return /* @__PURE__ */ React.createElement("div", _extends$2({
     ref: divRef,
     style: {
       position: "relative",
@@ -47282,7 +47282,7 @@ const CanvasImpl = /* @__PURE__ */ React.forwardRef(function Canvas({
   }, fallback)));
 });
 const Canvas2 = /* @__PURE__ */ React.forwardRef(function CanvasWrapper(props, ref) {
-  return /* @__PURE__ */ React.createElement(FiberProvider, null, /* @__PURE__ */ React.createElement(CanvasImpl, _extends$3({}, props, {
+  return /* @__PURE__ */ React.createElement(FiberProvider, null, /* @__PURE__ */ React.createElement(CanvasImpl, _extends$2({}, props, {
     ref
   })));
 });
@@ -48165,7 +48165,7 @@ const OrbitControls2 = /* @__PURE__ */ React.forwardRef(({
       });
     }
   }, [makeDefault, controls]);
-  return /* @__PURE__ */ React.createElement("primitive", _extends$3({
+  return /* @__PURE__ */ React.createElement("primitive", _extends$2({
     ref,
     object: controls,
     enableDamping
@@ -50021,14 +50021,14 @@ var createCache = function createCache2(options) {
   cache.sheet.hydrate(nodesToHydrate);
   return cache;
 };
-function _extends$2() {
-  return _extends$2 = Object.assign ? Object.assign.bind() : function(n) {
+function _extends$1() {
+  return _extends$1 = Object.assign ? Object.assign.bind() : function(n) {
     for (var e = 1; e < arguments.length; e++) {
       var t = arguments[e];
       for (var r2 in t) ({}).hasOwnProperty.call(t, r2) && (n[r2] = t[r2]);
     }
     return n;
-  }, _extends$2.apply(null, arguments);
+  }, _extends$1.apply(null, arguments);
 }
 var isBrowser$1 = true;
 function getRegisteredStyles(registered, registeredStyles, classNames) {
@@ -51171,7 +51171,7 @@ var createStyled$1 = function createStyled(tag, options) {
       }
     });
     Styled.withComponent = function(nextTag, nextOptions) {
-      var newStyled2 = createStyled(nextTag, _extends$2({}, options, nextOptions, {
+      var newStyled2 = createStyled(nextTag, _extends$1({}, options, nextOptions, {
         shouldForwardProp: composeShouldForwardProps(Styled, nextOptions, true)
       }));
       return newStyled2.apply(void 0, styles);
@@ -55843,6 +55843,18 @@ function useForkRef$1(...refs) {
     };
   }, refs);
 }
+function _setPrototypeOf(t, e) {
+  return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function(t2, e2) {
+    return t2.__proto__ = e2, t2;
+  }, _setPrototypeOf(t, e);
+}
+function _inheritsLoose(t, o) {
+  t.prototype = Object.create(o.prototype), t.prototype.constructor = t, _setPrototypeOf(t, o);
+}
+function _assertThisInitialized(e) {
+  if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+  return e;
+}
 function hasCorrectMainProperty(obj) {
   return typeof obj.main === "string";
 }
@@ -56437,7 +56449,7 @@ var defineProperty = function(obj, key, value) {
   }
   return obj;
 };
-var _extends$1 = Object.assign || function(target) {
+var _extends = Object.assign || function(target) {
   for (var i2 = 1; i2 < arguments.length; i2++) {
     var source = arguments[i2];
     for (var key in source) {
@@ -56449,7 +56461,7 @@ var _extends$1 = Object.assign || function(target) {
   return target;
 };
 function getClientRect(offsets) {
-  return _extends$1({}, offsets, {
+  return _extends({}, offsets, {
     right: offsets.left + offsets.width,
     bottom: offsets.top + offsets.height
   });
@@ -56633,7 +56645,7 @@ function computeAutoPlacement(placement, refRect, popper, reference, boundariesE
     }
   };
   var sortedAreas = Object.keys(rects).map(function(key) {
-    return _extends$1({
+    return _extends({
       key
     }, rects[key], {
       area: getArea(rects[key])
@@ -56941,9 +56953,9 @@ function computeStyle(data, options) {
   var attributes = {
     "x-placement": data.placement
   };
-  data.attributes = _extends$1({}, attributes, data.attributes);
-  data.styles = _extends$1({}, styles, data.styles);
-  data.arrowStyles = _extends$1({}, data.offsets.arrow, data.arrowStyles);
+  data.attributes = _extends({}, attributes, data.attributes);
+  data.styles = _extends({}, styles, data.styles);
+  data.arrowStyles = _extends({}, data.offsets.arrow, data.arrowStyles);
   return data;
 }
 function isModifierRequired(modifiers2, requestingName, requestedName) {
@@ -57078,7 +57090,7 @@ function flip(data, options) {
         variation = getOppositeVariation(variation);
       }
       data.placement = placement + (variation ? "-" + variation : "");
-      data.offsets.popper = _extends$1({}, data.offsets.popper, getPopperOffsets(data.instance.popper, data.offsets.reference, data.placement));
+      data.offsets.popper = _extends({}, data.offsets.popper, getPopperOffsets(data.instance.popper, data.offsets.reference, data.placement));
       data = runModifiers(data.instance.modifiers, data, "flip");
     }
   });
@@ -57237,7 +57249,7 @@ function preventOverflow(data, options) {
   };
   order.forEach(function(placement) {
     var side = ["left", "top"].indexOf(placement) !== -1 ? "primary" : "secondary";
-    popper = _extends$1({}, popper, check[side](placement));
+    popper = _extends({}, popper, check[side](placement));
   });
   data.offsets.popper = popper;
   return data;
@@ -57255,7 +57267,7 @@ function shift(data) {
       start: defineProperty({}, side, reference[side]),
       end: defineProperty({}, side, reference[side] + reference[measurement] - popper[measurement])
     };
-    data.offsets.popper = _extends$1({}, popper, shiftOffsets[shiftvariation]);
+    data.offsets.popper = _extends({}, popper, shiftOffsets[shiftvariation]);
   }
   return data;
 }
@@ -57658,7 +57670,7 @@ var Popper = function() {
       return requestAnimationFrame(_this.update);
     };
     this.update = debounce(this.update.bind(this));
-    this.options = _extends$1({}, Popper2.Defaults, options);
+    this.options = _extends({}, Popper2.Defaults, options);
     this.state = {
       isDestroyed: false,
       isCreated: false,
@@ -57667,11 +57679,11 @@ var Popper = function() {
     this.reference = reference && reference.jquery ? reference[0] : reference;
     this.popper = popper && popper.jquery ? popper[0] : popper;
     this.options.modifiers = {};
-    Object.keys(_extends$1({}, Popper2.Defaults.modifiers, options.modifiers)).forEach(function(name) {
-      _this.options.modifiers[name] = _extends$1({}, Popper2.Defaults.modifiers[name] || {}, options.modifiers ? options.modifiers[name] : {});
+    Object.keys(_extends({}, Popper2.Defaults.modifiers, options.modifiers)).forEach(function(name) {
+      _this.options.modifiers[name] = _extends({}, Popper2.Defaults.modifiers[name] || {}, options.modifiers ? options.modifiers[name] : {});
     });
     this.modifiers = Object.keys(this.options.modifiers).map(function(name) {
-      return _extends$1({
+      return _extends({
         name
       }, _this.options.modifiers[name]);
     }).sort(function(a, b) {
@@ -57901,38 +57913,6 @@ React.forwardRef((props, ref) => {
     ...style2
   }, children: typeof children === "function" ? children(childProps) : children }) });
 });
-function _extends() {
-  _extends = Object.assign ? Object.assign.bind() : function(target) {
-    for (var i2 = 1; i2 < arguments.length; i2++) {
-      var source = arguments[i2];
-      for (var key in source) {
-        if (Object.prototype.hasOwnProperty.call(source, key)) {
-          target[key] = source[key];
-        }
-      }
-    }
-    return target;
-  };
-  return _extends.apply(this, arguments);
-}
-function _assertThisInitialized(self2) {
-  if (self2 === void 0) {
-    throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
-  }
-  return self2;
-}
-function _setPrototypeOf(o, p) {
-  _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf2(o2, p2) {
-    o2.__proto__ = p2;
-    return o2;
-  };
-  return _setPrototypeOf(o, p);
-}
-function _inheritsLoose(subClass, superClass) {
-  subClass.prototype = Object.create(superClass.prototype);
-  subClass.prototype.constructor = subClass;
-  _setPrototypeOf(subClass, superClass);
-}
 var safeIsNaN = Number.isNaN || function ponyfill(value) {
   return typeof value === "number" && value !== value;
 };
@@ -58300,7 +58280,7 @@ function createListComponent(_ref) {
         className,
         onScroll,
         ref: this._outerRefSetter,
-        style: _extends({
+        style: _extends$2({
           position: "relative",
           height: height2,
           width: width2,
@@ -59488,9 +59468,17 @@ function _ptToZarr(ptx, pty, ptz, ptInfo) {
     z
   };
 }
-function _requestBufferToRequestObjects(buffer, k) {
+const DEFAULT_SIGMA_NORMALIZED = 0.25;
+function _requestBufferToRequestObjects(buffer, k, optsForWeighting) {
   const counts = /* @__PURE__ */ new Map();
-  for (let i2 = 0; i2 < buffer.length; i2 += 4) {
+  const { width: width2, height: height2, sigmaNormalized } = optsForWeighting;
+  const useWeighting = Number.isInteger(width2) && Number.isInteger(height2) && width2 > 0 && height2 > 0 && typeof sigmaNormalized === "number";
+  if (!useWeighting) {
+    log.warn("_requestBufferToRequestObjects: proceeding without weighting");
+  }
+  const maxPixels = Math.floor(buffer.length / 4);
+  for (let pix = 0; pix < maxPixels; pix += 1) {
+    const i2 = pix * 4;
     const r2 = buffer[i2];
     const g = buffer[i2 + 1];
     const b = buffer[i2 + 2];
@@ -59499,7 +59487,17 @@ function _requestBufferToRequestObjects(buffer, k) {
       continue;
     }
     const packed = (r2 << 24 | g << 16 | b << 8 | a) >>> 0;
-    counts.set(packed, (counts.get(packed) || 0) + 1);
+    let weight = 1;
+    if (useWeighting) {
+      const x = pix % width2;
+      const y = Math.floor(pix / width2);
+      const dx = x - width2 / 2;
+      const dy = y - height2 / 2;
+      const nd = Math.sqrt(dx * dx / (width2 * width2) + dy * dy / (height2 * height2));
+      const norm = nd / sigmaNormalized;
+      weight = Math.exp(-0.5 * norm * norm);
+    }
+    counts.set(packed, (counts.get(packed) || 0) + weight);
   }
   const requests = [...counts.entries()].sort((a, b) => b[1] - a[1]).slice(0, k).map(([packed]) => ({
     x: packed >> 22 & 1023,
@@ -60160,7 +60158,19 @@ class VolumeDataManager {
     }
     return chunkEntry.data;
   }
-  async processRequestData(buffer) {
+  /**
+   * Process the buffer of brick requests from the shader, turning them into
+   * actual Promises for Zarr chunks on the JS side.
+   * @param {Uint8Array} buffer The bufRequest (of length width*height*4)
+   * containing the brick requests from the shader.
+   * @param {object} optsForWeighting
+   * @param {number} optsForWeighting.width The width of the render target.
+   * @param {number} optsForWeighting.height The height of the render target.
+   * @param {number} optsForWeighting.sigmaNormalized The normalized sigma value
+   * to use for weighting the brick requests based on their distance from
+   * the center of the render target.
+   */
+  async processRequestData(buffer, optsForWeighting) {
     if (this.isBusy) {
       log.debug("processRequestData: already busy, skipping");
       return;
@@ -60175,7 +60185,7 @@ class VolumeDataManager {
     }
     this.isBusy = true;
     this.triggerRequest = false;
-    const { requests, origRequestCount } = _requestBufferToRequestObjects(buffer, this.k);
+    const { requests, origRequestCount } = _requestBufferToRequestObjects(buffer, this.k, optsForWeighting);
     if (requests.length === 0) {
       this.noNewRequests = true;
     }
@@ -62922,7 +62932,14 @@ function handleRequests(_gl, { frameRef, dataManager, mrtRef, bufRequest, bufUsa
       ctx.UNSIGNED_BYTE,
       bufRequest.current
     );
-    dataManager.processRequestData(bufRequest.current);
+    dataManager.processRequestData(bufRequest.current, {
+      // If width/height are not yet available,
+      // processRequestData will proceed without weighting.
+      width: mrtRef?.current?.width,
+      height: mrtRef?.current?.height,
+      // Default sigmaNormalized = 0.25; can be tuned
+      sigmaNormalized: DEFAULT_SIGMA_NORMALIZED
+    });
   } else if (dataManager.triggerUsage === true && dataManager.noNewRequests === false) {
     ctx.bindFramebuffer(ctx.READ_FRAMEBUFFER, framebufferFor(_gl, mrtRef.current));
     ctx.readBuffer(ctx.COLOR_ATTACHMENT2);

package/dist-tsc/VolumeDataManager.d.ts

@@ -27,7 +27,7 @@ export function _ptToZarr(ptx: any, pty: any, ptz: any, ptInfo: any): {
     y: number;
     z: number;
 };
-export function _requestBufferToRequestObjects(buffer: any, k: any): {
+export function _requestBufferToRequestObjects(buffer: any, k: any, optsForWeighting: any): {
     requests: {
         x: number;
         y: number;
@@ -41,6 +41,7 @@ export namespace INIT_STATUS {
     let COMPLETE: string;
     let FAILED: string;
 }
+export const DEFAULT_SIGMA_NORMALIZED: 0.25;
 export class VolumeDataManager {
     constructor(glParam: any);
     gl: any;
@@ -198,7 +199,23 @@ export class VolumeDataManager {
      * @returns {Promise<Uint8Array>} 32x32x32 chunk data
      */
     loadZarrChunk(t: number | undefined, c: number | undefined, z: number, y: number, x: number, resolution: number): Promise<Uint8Array>;
-    processRequestData(buffer: any): Promise<void>;
+    /**
+     * Process the buffer of brick requests from the shader, turning them into
+     * actual Promises for Zarr chunks on the JS side.
+     * @param {Uint8Array} buffer The bufRequest (of length width*height*4)
+     * containing the brick requests from the shader.
+     * @param {object} optsForWeighting
+     * @param {number} optsForWeighting.width The width of the render target.
+     * @param {number} optsForWeighting.height The height of the render target.
+     * @param {number} optsForWeighting.sigmaNormalized The normalized sigma value
+     * to use for weighting the brick requests based on their distance from
+     * the center of the render target.
+     */
+    processRequestData(buffer: Uint8Array, optsForWeighting: {
+        width: number;
+        height: number;
+        sigmaNormalized: number;
+    }): Promise<void>;
     processUsageData(buffer: any): Promise<void>;
     _evictBrick(bcIndex: any): void;
     _purgeChannel(ptChannelIndex: any): void;

package/dist-tsc/VolumeDataManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VolumeDataManager.d.ts","sourceRoot":"","sources":["../src/VolumeDataManager.js"],"names":[],"mappings":"AA8DA,yEAaC;AACD,8EAeC;AAED;;;;GAIG;AACH,kDAHW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,8BAC1B,MAAM;;;;;;;;;;;;;EAyHhB;AAMD,kFAaC;AAqBD;;;;;;EA2DC;AAED;;;;;;;EA0BC;;;;;;;AAID;IACE,0BAgLC;IAjKG,QAAyB;IAa3B,cAAwB;IAyBxB,sBAA+B;IAC/B,wBAA2B;IAC3B,iCAAmC;IAenC;;;;;MAKC;IAED;;;;;;;;;;;;MAcC;IAED,8BAAmB;IACnB,8BAAmB;IAEnB;;;;;;MAMC;IAED;;;;;;;;;MAiBC;IAQD,2BAAiC;IAYjC,gBAAmB;IAGnB,oBAAuD;IACvD,gBAAwD;IACxD,gBAAmB;IACnB,sBAAsB;IAGtB,aAAmD;IAGnD,gBAAkB;IAElB,sBAAwB;IACxB,wBAA2B;IAC3B,kBAAkB;IAClB,UAAW;IACX,uBAA0B;IAC1B,yBAA4B;IAE5B,sBAAyB;IAGzB,mBAAyC;IACzC,eAAqB;IAGrB;;;;;;;;;;aAA8B;IAG9B,4BAA4B;IAC5B,6BAA6B;IAK/B;;;OAGG;IACH,sBAFa,MAAM,CAiBlB;IAED;;OAEG;IACH,oBAQC;IAED;;OAEG;IACH,uBASC;IAED;;OAEG;IACH,qCAeC;IAED;;OAEG;IACH,yCAqCC;IAED;;OAEG;IACH,qBAMC;IAED;;OAEG;IACH,uCAIC;IAED,qDAIC;IAFC,YAAoB;IACpB,sBAAwC;IAG1C;;;;;OAKG;IACH,mBAFa,OAAO,CAAC,MAAM,CAAC,CA8S3B;IAjQG,kBAAmD;IAmQvD;;;;;;;;OAQG;IACH,mBAkBC;IAGD,6BAMC;IAED,wCAqHC;IAED;;;;;OAKG;IAqBH;;;OAGG;IACH,kCAQC;IAED;;;OAGG;IACH,uBAFa,MAAM,CAUlB;IAED,+BAQC;IAED,kCASC;IAED,gCASC;IAED;;;;;;;;;OASG;IACH,iBARW,MAAM,iBACN,MAAM,iBACN,MAAM,KACN,MAAM,KACN,MAAM,cACN,MAAM,GACJ,OAAO,CAAC,UAAU,CAAC,CA+B/B;IAED,+CAgCC;IAGD,6CA0DC;IAGD,gCAcC;IAED,yCAmDC;IAGD,+DAqBC;IAKD;;;;OAIG;IACH,oBAHW,MAAM,GACJ;QAAE,OAAO,MAAC;QAAC,CAAC,MAAC;QAAC,CAAC,MAAC;QAAC,CAAC,MAAA;KAAE,EAAE,CAyClC;IAKD,uDA6LC;IAKD,oDAwDC;IAKD,kBAWC;CACF;8BAttDM,OAAO"}
+{"version":3,"file":"VolumeDataManager.d.ts","sourceRoot":"","sources":["../src/VolumeDataManager.js"],"names":[],"mappings":"AA8DA,yEAaC;AACD,8EAeC;AAED;;;;GAIG;AACH,kDAHW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,8BAC1B,MAAM;;;;;;;;;;;;;EAyHhB;AAMD,kFAaC;AAqBD;;;;;;EA2DC;AAKD;;;;;;;EAuDC;;;;;;;AAzDD,4CAA6C;AA6D7C;IACE,0BAgLC;IAjKG,QAAyB;IAa3B,cAAwB;IAyBxB,sBAA+B;IAC/B,wBAA2B;IAC3B,iCAAmC;IAenC;;;;;MAKC;IAED;;;;;;;;;;;;MAcC;IAED,8BAAmB;IACnB,8BAAmB;IAEnB;;;;;;MAMC;IAED;;;;;;;;;MAiBC;IAQD,2BAAiC;IAYjC,gBAAmB;IAGnB,oBAAuD;IACvD,gBAAwD;IACxD,gBAAmB;IACnB,sBAAsB;IAGtB,aAAmD;IAGnD,gBAAkB;IAElB,sBAAwB;IACxB,wBAA2B;IAC3B,kBAAkB;IAClB,UAAW;IACX,uBAA0B;IAC1B,yBAA4B;IAE5B,sBAAyB;IAGzB,mBAAyC;IACzC,eAAqB;IAGrB;;;;;;;;;;aAA8B;IAG9B,4BAA4B;IAC5B,6BAA6B;IAK/B;;;OAGG;IACH,sBAFa,MAAM,CAiBlB;IAED;;OAEG;IACH,oBAQC;IAED;;OAEG;IACH,uBASC;IAED;;OAEG;IACH,qCAeC;IAED;;OAEG;IACH,yCAqCC;IAED;;OAEG;IACH,qBAMC;IAED;;OAEG;IACH,uCAIC;IAED,qDAIC;IAFC,YAAoB;IACpB,sBAAwC;IAG1C;;;;;OAKG;IACH,mBAFa,OAAO,CAAC,MAAM,CAAC,CA8S3B;IAjQG,kBAAmD;IAmQvD;;;;;;;;OAQG;IACH,mBAkBC;IAGD,6BAMC;IAED,wCAqHC;IAED;;;;;OAKG;IAqBH;;;OAGG;IACH,kCAQC;IAED;;;OAGG;IACH,uBAFa,MAAM,CAUlB;IAED,+BAQC;IAED,kCASC;IAED,gCASC;IAED;;;;;;;;;OASG;IACH,iBARW,MAAM,iBACN,MAAM,iBACN,MAAM,KACN,MAAM,KACN,MAAM,cACN,MAAM,GACJ,OAAO,CAAC,UAAU,CAAC,CA+B/B;IAED;;;;;;;;;;;OAWG;IACH,2BATW,UAAU,oBAGlB;QAAiC,KAAK,EAA9B,MAAM;QACmB,MAAM,EAA/B,MAAM;QACmB,eAAe,EAAxC,MAAM;KAGhB,iBAiCA;IAGD,6CA0DC;IAGD,gCAcC;IAED,yCAmDC;IAGD,+DAqBC;IAKD;;;;OAIG;IACH,oBAHW,MAAM,GACJ;QAAE,OAAO,MAAC;QAAC,CAAC,MAAC;QAAC,CAAC,MAAC;QAAC,CAAC,MAAA;KAAE,EAAE,CAyClC;IAKD,uDA6LC;IAKD,oDAwDC;IAKD,kBAWC;CACF;8BAlwDM,OAAO"}

package/dist-tsc/VolumeDataManager.js

@@ -268,9 +268,21 @@ export function _ptToZarr(ptx, pty, ptz, ptInfo) {
         z,
     };
 }
-export function _requestBufferToRequestObjects(buffer, k) {
+// sigmaNormalized: fraction of half-dimension that determines Gaussian spread
+export const DEFAULT_SIGMA_NORMALIZED = 0.25;
+export function _requestBufferToRequestObjects(buffer, k, optsForWeighting) {
     const counts = new Map();
-    for (let i = 0; i < buffer.length; i += 4) {
+    const { width, height, sigmaNormalized } = optsForWeighting;
+    const useWeighting = (Number.isInteger(width) && Number.isInteger(height)
+        && width > 0 && height > 0
+        && typeof sigmaNormalized === 'number');
+    if (!useWeighting) {
+        log.warn('_requestBufferToRequestObjects: proceeding without weighting');
+    }
+    // Number of pixels present in buffer
+    const maxPixels = Math.floor(buffer.length / 4);
+    for (let pix = 0; pix < maxPixels; pix += 1) {
+        const i = pix * 4;
         const r = buffer[i];
         const g = buffer[i + 1];
         const b = buffer[i + 2];
@@ -280,11 +292,20 @@ export function _requestBufferToRequestObjects(buffer, k) {
             continue;
         }
         const packed = ((r << 24) | (g << 16) | (b << 8) | a) >>> 0;
-        counts.set(packed, (counts.get(packed) || 0) + 1);
+        let weight = 1.0;
+        if (useWeighting) {
+            const x = pix % width;
+            const y = Math.floor(pix / width);
+            const dx = x - (width / 2);
+            const dy = y - (height / 2);
+            // normalized distance relative to full width/height to be resolution-independent
+            const nd = Math.sqrt((dx * dx) / (width * width) + (dy * dy) / (height * height));
+            const norm = nd / sigmaNormalized;
+            weight = Math.exp(-0.5 * norm * norm);
+        }
+        counts.set(packed, (counts.get(packed) || 0) + weight);
     }
-    // log.debug('counts', counts);
-    // log.debug('this.k', this.k);
-    // Get the top K (potentially fewer than K) page table requests.
+    // Get the top K (potentially fewer than K) page table requests by weighted count.
     const requests = [...counts.entries()]
         .sort((a, b) => b[1] - a[1])
         .slice(0, k)
@@ -1074,7 +1095,19 @@ export class VolumeDataManager {
         }
         return chunkEntry.data;
     }
-    async processRequestData(buffer) {
+    /**
+     * Process the buffer of brick requests from the shader, turning them into
+     * actual Promises for Zarr chunks on the JS side.
+     * @param {Uint8Array} buffer The bufRequest (of length width*height*4)
+     * containing the brick requests from the shader.
+     * @param {object} optsForWeighting
+     * @param {number} optsForWeighting.width The width of the render target.
+     * @param {number} optsForWeighting.height The height of the render target.
+     * @param {number} optsForWeighting.sigmaNormalized The normalized sigma value
+     * to use for weighting the brick requests based on their distance from
+     * the center of the render target.
+     */
+    async processRequestData(buffer, optsForWeighting) {
         if (this.isBusy) {
             log.debug('processRequestData: already busy, skipping');
             return;
@@ -1091,7 +1124,7 @@ export class VolumeDataManager {
         }
         this.isBusy = true;
         this.triggerRequest = false;
-        const { requests, origRequestCount } = _requestBufferToRequestObjects(buffer, this.k);
+        const { requests, origRequestCount } = _requestBufferToRequestObjects(buffer, this.k, optsForWeighting);
         if (requests.length === 0) {
             this.noNewRequests = true;
         }

package/dist-tsc/VolumeDataManager.test.js

@@ -147,7 +147,7 @@ describe('spatial-accelerated data utils', () => {
         });
     });
     describe('_requestBufferToRequestObjects', () => {
-        it('correctly converts a buffer to request objects', () => {
+        it('correctly converts a buffer to request objects without optsForWeighting', () => {
             const buffer = new Uint8Array([
                 0, 0, 0, 0,
                 0, 0, 0, 0,
@@ -155,7 +155,28 @@ describe('spatial-accelerated data utils', () => {
                 0, 0, 0, 0,
             ]);
             const k = 40;
-            const { requests: result } = _requestBufferToRequestObjects(buffer, k);
+            const { requests: result } = _requestBufferToRequestObjects(buffer, k, {
+                width: undefined,
+                height: undefined,
+                sigmaNormalized: undefined,
+            });
+            expect(result).toEqual([
+                { x: 2, y: 1, z: 13 },
+            ]);
+        });
+        it('correctly converts a buffer to request objects with optsForWeighting', () => {
+            const buffer = new Uint8Array([
+                0, 0, 0, 0,
+                0, 0, 0, 0,
+                0, 128, 16, 13,
+                0, 0, 0, 0,
+            ]);
+            const k = 40;
+            const { requests: result } = _requestBufferToRequestObjects(buffer, k, {
+                width: 1,
+                height: 1,
+                sigmaNormalized: 0.25,
+            });
             expect(result).toEqual([
                 { x: 2, y: 1, z: 13 },
             ]);

package/dist-tsc/VolumeView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VolumeView.d.ts","sourceRoot":"","sources":["../src/VolumeView.js"],"names":[],"mappings":"AAuLA,2DA6gBC"}
+{"version":3,"file":"VolumeView.d.ts","sourceRoot":"","sources":["../src/VolumeView.js"],"names":[],"mappings":"AAkMA,2DA6gBC"}

package/dist-tsc/VolumeView.js

@@ -13,7 +13,7 @@ import * as THREE from 'three';
 import { WebGLMultipleRenderTargets } from 'three';
 import { log, atLeastLogLevel, LogLevel } from '@vitessce/globals';
 import { useEventCallback } from '@vitessce/styles';
-import { VolumeDataManager, INIT_STATUS } from './VolumeDataManager.js';
+import { VolumeDataManager, INIT_STATUS, DEFAULT_SIGMA_NORMALIZED, } from './VolumeDataManager.js';
 import { VolumeRenderManager } from './VolumeRenderManager.js';
 import { gaussianVertexShader } from './shaders/GaussianVertexShader.js';
 import { gaussianFragmentShader } from './shaders/GaussianFragmentShader.js';
@@ -57,8 +57,15 @@ function handleRequests(_gl, { frameRef, dataManager, mrtRef, bufRequest, bufUsa
         ctx.readPixels(0, 0, mrtRef.current.width, mrtRef.current.height, ctx.RGBA, ctx.UNSIGNED_BYTE, bufRequest.current);
         // Based on the request buffer contents, process the requests
         // (e.g., start loading the brick data and upload to the brick cache).
-        // Finally, it will set triggerUsage to true.
-        dataManager.processRequestData(bufRequest.current);
+        // Pass width/height so the data manager can compute Gaussian weighting.
+        dataManager.processRequestData(bufRequest.current, {
+            // If width/height are not yet available,
+            // processRequestData will proceed without weighting.
+            width: mrtRef?.current?.width,
+            height: mrtRef?.current?.height,
+            // Default sigmaNormalized = 0.25; can be tuned
+            sigmaNormalized: DEFAULT_SIGMA_NORMALIZED,
+        });
     }
     else if (dataManager.triggerUsage === true && dataManager.noNewRequests === false) {
         // Read the pixels of the usage buffer into the width*height*RGBA bufUsage.current array.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitessce/spatial-accelerated",
-  "version": "3.9.3",
+  "version": "3.9.5",
   "author": "HIDIVE Lab at HMS",
   "homepage": "http://vitessce.io",
   "repository": {
@@ -28,16 +28,16 @@
     "short-number": "^1.0.6",
     "three": "^0.154.0",
     "zarrita": "0.6.1",
-    "@vitessce/constants-internal": "3.9.3",
-    "@vitessce/legend": "3.9.3",
-    "@vitessce/sets-utils": "3.9.3",
-    "@vitessce/spatial-utils": "3.9.3",
-    "@vitessce/gl": "3.9.3",
-    "@vitessce/utils": "3.9.3",
-    "@vitessce/vit-s": "3.9.3",
-    "@vitessce/styles": "3.9.3",
-    "@vitessce/tooltip": "3.9.3",
-    "@vitessce/globals": "3.9.3"
+    "@vitessce/constants-internal": "3.9.5",
+    "@vitessce/gl": "3.9.5",
+    "@vitessce/legend": "3.9.5",
+    "@vitessce/tooltip": "3.9.5",
+    "@vitessce/spatial-utils": "3.9.5",
+    "@vitessce/sets-utils": "3.9.5",
+    "@vitessce/styles": "3.9.5",
+    "@vitessce/utils": "3.9.5",
+    "@vitessce/vit-s": "3.9.5",
+    "@vitessce/globals": "3.9.5"
   },
   "devDependencies": {
     "@types/three": "^0.154.0",

package/src/VolumeDataManager.js

@@ -316,9 +316,28 @@ export function _ptToZarr(ptx, pty, ptz, ptInfo) {
   };
 }
 
-export function _requestBufferToRequestObjects(buffer, k) {
+// sigmaNormalized: fraction of half-dimension that determines Gaussian spread
+export const DEFAULT_SIGMA_NORMALIZED = 0.25;
+
+export function _requestBufferToRequestObjects(buffer, k, optsForWeighting) {
   const counts = new Map();
-  for (let i = 0; i < buffer.length; i += 4) {
+
+  const { width, height, sigmaNormalized } = optsForWeighting;
+
+  const useWeighting = (
+    Number.isInteger(width) && Number.isInteger(height)
+    && width > 0 && height > 0
+    && typeof sigmaNormalized === 'number'
+  );
+  if (!useWeighting) {
+    log.warn('_requestBufferToRequestObjects: proceeding without weighting');
+  }
+
+  // Number of pixels present in buffer
+  const maxPixels = Math.floor(buffer.length / 4);
+
+  for (let pix = 0; pix < maxPixels; pix += 1) {
+    const i = pix * 4;
     const r = buffer[i];
     const g = buffer[i + 1];
     const b = buffer[i + 2];
@@ -328,11 +347,23 @@ export function _requestBufferToRequestObjects(buffer, k) {
       continue;
     }
     const packed = ((r << 24) | (g << 16) | (b << 8) | a) >>> 0;
-    counts.set(packed, (counts.get(packed) || 0) + 1);
+
+    let weight = 1.0;
+    if (useWeighting) {
+      const x = pix % width;
+      const y = Math.floor(pix / width);
+      const dx = x - (width / 2);
+      const dy = y - (height / 2);
+      // normalized distance relative to full width/height to be resolution-independent
+      const nd = Math.sqrt((dx * dx) / (width * width) + (dy * dy) / (height * height));
+      const norm = nd / sigmaNormalized;
+      weight = Math.exp(-0.5 * norm * norm);
+    }
+
+    counts.set(packed, (counts.get(packed) || 0) + weight);
   }
-  // log.debug('counts', counts);
-  // log.debug('this.k', this.k);
-  // Get the top K (potentially fewer than K) page table requests.
+
+  // Get the top K (potentially fewer than K) page table requests by weighted count.
   const requests = [...counts.entries()]
     .sort((a, b) => b[1] - a[1])
     .slice(0, k)
@@ -341,6 +372,7 @@ export function _requestBufferToRequestObjects(buffer, k) {
       y: (packed >> 12) & 0x3FF,
       z: packed & 0xFFF,
     }));
+
   return { requests, origRequestCount: counts.size };
 }
 
@@ -1253,7 +1285,19 @@ export class VolumeDataManager {
     return chunkEntry.data;
   }
 
-  async processRequestData(buffer) {
+  /**
+   * Process the buffer of brick requests from the shader, turning them into
+   * actual Promises for Zarr chunks on the JS side.
+   * @param {Uint8Array} buffer The bufRequest (of length width*height*4)
+   * containing the brick requests from the shader.
+   * @param {object} optsForWeighting
+   * @param {number} optsForWeighting.width The width of the render target.
+   * @param {number} optsForWeighting.height The height of the render target.
+   * @param {number} optsForWeighting.sigmaNormalized The normalized sigma value
+   * to use for weighting the brick requests based on their distance from
+   * the center of the render target.
+   */
+  async processRequestData(buffer, optsForWeighting) {
     if (this.isBusy) {
       log.debug('processRequestData: already busy, skipping');
       return;
@@ -1274,7 +1318,7 @@ export class VolumeDataManager {
     this.isBusy = true;
     this.triggerRequest = false;
 
-    const { requests, origRequestCount } = _requestBufferToRequestObjects(buffer, this.k);
+    const { requests, origRequestCount } = _requestBufferToRequestObjects(buffer, this.k, optsForWeighting);
 
     if (requests.length === 0) {
       this.noNewRequests = true;

package/src/VolumeDataManager.test.js

@@ -163,7 +163,7 @@ describe('spatial-accelerated data utils', () => {
     });
   });
   describe('_requestBufferToRequestObjects', () => {
-    it('correctly converts a buffer to request objects', () => {
+    it('correctly converts a buffer to request objects without optsForWeighting', () => {
       const buffer = new Uint8Array([
         0, 0, 0, 0,
         0, 0, 0, 0,
@@ -171,7 +171,28 @@ describe('spatial-accelerated data utils', () => {
         0, 0, 0, 0,
       ]);
       const k = 40;
-      const { requests: result } = _requestBufferToRequestObjects(buffer, k);
+      const { requests: result } = _requestBufferToRequestObjects(buffer, k, {
+        width: undefined,
+        height: undefined,
+        sigmaNormalized: undefined,
+      });
+      expect(result).toEqual([
+        { x: 2, y: 1, z: 13 },
+      ]);
+    });
+    it('correctly converts a buffer to request objects with optsForWeighting', () => {
+      const buffer = new Uint8Array([
+        0, 0, 0, 0,
+        0, 0, 0, 0,
+        0, 128, 16, 13,
+        0, 0, 0, 0,
+      ]);
+      const k = 40;
+      const { requests: result } = _requestBufferToRequestObjects(buffer, k, {
+        width: 1,
+        height: 1,
+        sigmaNormalized: 0.25,
+      });
       expect(result).toEqual([
         { x: 2, y: 1, z: 13 },
       ]);

package/src/VolumeView.js

@@ -14,7 +14,11 @@ import { WebGLMultipleRenderTargets } from 'three';
 import { log, atLeastLogLevel, LogLevel } from '@vitessce/globals';
 import { useEventCallback } from '@vitessce/styles';
 
-import { VolumeDataManager, INIT_STATUS } from './VolumeDataManager.js';
+import {
+  VolumeDataManager,
+  INIT_STATUS,
+  DEFAULT_SIGMA_NORMALIZED,
+} from './VolumeDataManager.js';
 import { VolumeRenderManager } from './VolumeRenderManager.js';
 
 import { gaussianVertexShader } from './shaders/GaussianVertexShader.js';
@@ -69,8 +73,15 @@ function handleRequests(_gl, { frameRef, dataManager, mrtRef, bufRequest, bufUsa
       ctx.RGBA, ctx.UNSIGNED_BYTE, bufRequest.current);
     // Based on the request buffer contents, process the requests
     // (e.g., start loading the brick data and upload to the brick cache).
-    // Finally, it will set triggerUsage to true.
-    dataManager.processRequestData(bufRequest.current);
+    // Pass width/height so the data manager can compute Gaussian weighting.
+    dataManager.processRequestData(bufRequest.current, {
+      // If width/height are not yet available,
+      // processRequestData will proceed without weighting.
+      width: mrtRef?.current?.width,
+      height: mrtRef?.current?.height,
+      // Default sigmaNormalized = 0.25; can be tuned
+      sigmaNormalized: DEFAULT_SIGMA_NORMALIZED,
+    });
   } else if (dataManager.triggerUsage === true && dataManager.noNewRequests === false) {
     // Read the pixels of the usage buffer into the width*height*RGBA bufUsage.current array.
     ctx.bindFramebuffer(ctx.READ_FRAMEBUFFER, framebufferFor(_gl, mrtRef.current));