@idetik/core 0.35.4 → 0.36.0

package/dist/index.js

@@ -1600,6 +1600,9 @@ class eQ {
   currentViewport_ = null;
   currentScissor_ = null;
   currentCullingMode_ = null;
+  stencilFunc_ = null;
+  stencilRef_ = null;
+  stencilFuncMask_ = null;
   constructor(A) {
     this.gl_ = A, this.gl_.frontFace(this.gl_.CW);
   }
@@ -1689,6 +1692,9 @@ class eQ {
   setStencilTest(A) {
     A ? this.enable(this.gl_.STENCIL_TEST) : this.disable(this.gl_.STENCIL_TEST);
   }
+  setStencilFunc(A, I, B) {
+    (this.stencilFunc_ !== A || this.stencilRef_ !== I || this.stencilFuncMask_ !== B) && (this.gl_.stencilFunc(A, I, B), this.stencilFunc_ = A, this.stencilRef_ = I, this.stencilFuncMask_ = B);
+  }
 }
 const nQ = PB($(), [1, -1, 1]);
 class GQ extends RC {
@@ -1698,6 +1704,7 @@ class GQ extends RC {
   textures_;
   state_;
   renderedObjectsPerFrame_ = 0;
+  stencilRef_ = 0;
   currentViewportSize_ = [0, 0];
   constructor(A) {
     super(A);
@@ -1720,7 +1727,7 @@ class GQ extends RC {
     return this.textures_.textureCount;
   }
   render(A) {
-    this.renderedObjects_ = 0, this.renderedObjectsPerFrame_ = 0;
+    this.renderedObjects_ = 0, this.renderedObjectsPerFrame_ = 0, this.stencilRef_ = 0;
     const I = [], B = [];
     for (const D of A.layers)
       (D.blendMode === "none" ? I : B).push(D);
@@ -1755,33 +1762,38 @@ class GQ extends RC {
     this.renderedObjects_ = this.renderedObjectsPerFrame_;
   }
   initStencil() {
-    this.gl_.clearStencil(0), this.gl_.stencilMask(255), this.gl_.stencilFunc(this.gl_.EQUAL, 0, 255), this.gl_.stencilOp(this.gl_.KEEP, this.gl_.KEEP, this.gl_.INCR);
+    this.gl_.clearStencil(0), this.gl_.stencilMask(255), this.gl_.stencilOp(this.gl_.KEEP, this.gl_.KEEP, this.gl_.REPLACE);
+  }
+  setCoverageStencil(A) {
+    this.state_.setStencilTest(A !== null), A !== null && (this.stencilRef_ += 1, this.stencilRef_ > 255 && k.warn(
+      "WebGLRenderer",
+      "Exceeded 255 stencil coverage groups in one frame; dedup may be incorrect"
+    ), this.state_.setStencilFunc(this.gl_.NOTEQUAL, this.stencilRef_, 255));
   }
   renderLayer(A, I, B) {
-    if (A.objects.length === 0) return;
     this.state_.setBlendingMode(A.blendMode);
-    const C = A.hasMultipleLODs();
-    this.state_.setStencilTest(C), C && this.gl_.clear(this.gl_.STENCIL_BUFFER_BIT), A.objects.forEach((Q, E) => {
-      B.intersectsWithBox3(Q.boundingBox) && (this.renderObject(A, E, I), this.renderedObjectsPerFrame_ += 1);
-    });
+    for (const [C, Q] of A.coverageGroups) {
+      this.setCoverageStencil(C);
+      for (const E of Q)
+        B.intersectsWithBox3(E.boundingBox) && (this.renderObject(A, E, I), this.renderedObjectsPerFrame_ += 1);
+    }
   }
   renderObject(A, I, B) {
-    const C = A.objects[I];
-    if (C.popStaleTextures().forEach((E) => {
-      this.textures_.dispose(E);
-    }), !C.programName) return;
-    this.state_.setCullFaceMode(C.cullFaceMode), this.state_.setDepthTesting(C.depthTest), this.state_.setDepthMask(C.depthTest), this.bindings_.bindGeometry(C.geometry), C.textures.forEach((E, i) => {
-      this.textures_.bindTexture(E, i);
+    if (I.popStaleTextures().forEach((Q) => {
+      this.textures_.dispose(Q);
+    }), !I.programName) return;
+    this.state_.setCullFaceMode(I.cullFaceMode), this.state_.setDepthTesting(I.depthTest), this.bindings_.bindGeometry(I.geometry), I.textures.forEach((Q, E) => {
+      this.textures_.bindTexture(Q, E);
     });
-    const Q = this.programs_.use(C.programName);
-    if (this.drawGeometry(C.geometry, C, A, Q, B), C.wireframeEnabled) {
-      this.bindings_.bindGeometry(C.wireframeGeometry);
-      const E = this.programs_.use("wireframe");
-      E.setUniform("u_color", C.wireframeColor.rgb), this.drawGeometry(
-        C.wireframeGeometry,
-        C,
+    const C = this.programs_.use(I.programName);
+    if (this.drawGeometry(I.geometry, I, A, C, B), I.wireframeEnabled) {
+      this.bindings_.bindGeometry(I.wireframeGeometry);
+      const Q = this.programs_.use("wireframe");
+      Q.setUniform("u_color", I.wireframeColor.rgb), this.drawGeometry(
+        I.wireframeGeometry,
+        I,
         A,
-        E,
+        Q,
         B
       );
     }
@@ -1869,7 +1881,9 @@ class GQ extends RC {
     this.state_.setViewport(B);
   }
   clear() {
-    this.gl_.clearColor(0, 0, 0, 0), this.gl_.clear(this.gl_.COLOR_BUFFER_BIT | this.gl_.DEPTH_BUFFER_BIT), this.state_.setDepthTesting(!0), this.gl_.depthFunc(this.gl_.LEQUAL);
+    this.gl_.clearColor(0, 0, 0, 0), this.gl_.clear(
+      this.gl_.COLOR_BUFFER_BIT | this.gl_.DEPTH_BUFFER_BIT | this.gl_.STENCIL_BUFFER_BIT
+    ), this.state_.setDepthTesting(!0), this.gl_.depthFunc(this.gl_.LEQUAL);
   }
 }
 function ZA(g, A) {
@@ -2733,6 +2747,12 @@ class dQ {
   addEventListener(A) {
     this.listeners_.push(A);
   }
+  removeEventListener(A) {
+    const I = this.listeners_.indexOf(A);
+    if (I === -1)
+      throw new Error(`Listener to remove could not be found: ${A}`);
+    this.listeners_.splice(I, 1);
+  }
   connect() {
     if (this.isConnected_) {
       k.warn(
@@ -3081,11 +3101,7 @@ class ho {
     return this.viewports_.find((I) => I.id === A);
   }
   addViewport(A) {
-    const [I] = _g(
-      [A],
-      this.canvas,
-      this.context_
-    );
+    const [I] = _g([A], this.canvas, this.context_);
     return jB(I, this.viewports_), this.viewports_.push(I), this.running && (I.events.connect(), I.element !== this.canvas && this.sizeObserver_.observe(I.element)), k.info("Idetik", `Added viewport "${I.id}"`), I;
   }
   removeViewport(A) {
@@ -11870,7 +11886,7 @@ class OA {
   }
 }
 class KI {
-  objects_ = [];
+  coverageGroups_ = /* @__PURE__ */ new Map();
   state_ = "initialized";
   attached_ = !1;
   callbacks_ = [];
@@ -11904,8 +11920,8 @@ class KI {
   }
   detach(A) {
   }
-  get objects() {
-    return this.objects_;
+  get coverageGroups() {
+    return this.coverageGroups_;
   }
   get state() {
     return this.state_;
@@ -11915,26 +11931,20 @@ class KI {
   }
   removeStateChangeCallback(A) {
     const I = this.callbacks_.indexOf(A);
-    if (I === void 0)
+    if (I === -1)
       throw new Error(`Callback to remove could not be found: ${A}`);
     this.callbacks_.splice(I, 1);
   }
-  hasMultipleLODs() {
-    return !1;
-  }
   setState(A) {
     const I = this.state_;
     this.state_ = A, this.callbacks_.forEach((B) => B(A, I));
   }
-  addObject(A) {
-    this.objects_.push(A);
-  }
-  removeObject(A) {
-    const I = this.objects_.indexOf(A);
-    I !== -1 && this.objects_.splice(I, 1);
+  addObject(A, I = null) {
+    const B = this.coverageGroups_.get(I);
+    B ? B.push(A) : this.coverageGroups_.set(I, [A]);
   }
   clearObjects() {
-    this.objects_ = [];
+    this.coverageGroups_.clear();
   }
   /**
    * Get uniforms for shader program. Override in derived classes that need custom uniforms.
@@ -12210,7 +12220,7 @@ class Hi extends xA {
     super(), this.geometry = A, this.color_ = x.from(I), this.width_ = B, this.programName = "projectedLine";
   }
   get type() {
-    return "ProjectedLine";
+    return "ProjectedLineRenderable";
   }
   get color() {
     return this.color_;
@@ -12451,6 +12461,7 @@ class eC extends KI {
   orientation_;
   onPickValue_;
   visibleChunks_ = /* @__PURE__ */ new Map();
+  orderedChunks_ = [];
   pool_ = new pg();
   initialChannelProps_;
   channelChangeCallbacks_ = [];
@@ -12478,22 +12489,20 @@ class eC extends KI {
     onPickValue: E,
     ...i
   }) {
-    super(i), this.setState("initialized"), this.source_ = A, this.policy_ = B, this.sliceCoords_ = I, this.orientation_ = C ?? "XY", this.axes_ = MA(this.orientation_), this.planeRotation_ = dA(this.axes_), this.channelProps_ = Q, this.initialChannelProps_ = Q, this.onPickValue_ = E;
+    super({ blendMode: "additive", ...i }), this.setState("initialized"), this.source_ = A, this.policy_ = B, this.sliceCoords_ = I, this.orientation_ = C ?? "XY", this.axes_ = MA(this.orientation_), this.planeRotation_ = dA(this.axes_), this.channelProps_ = Q, this.initialChannelProps_ = Q, this.onPickValue_ = E;
   }
   attach(A) {
     this.context_ = A, this.chunkStoreView_ = A.chunkManager.addView(
       this.source_,
       this.policy_,
       this.axes_
+    ), hC(
+      this.channelProps_,
+      this.chunkStoreView_.channelCount
     );
-    const I = this.chunkStoreView_.channelCount;
-    if (hC(this.channelProps_, I), I > 1 && this.sliceCoords_.c !== void 0 && this.sliceCoords_.c.length > 1)
-      throw new Error(
-        `ImageLayer requires exactly one channel in sliceCoords.c for multi-channel sources (found ${I} channels). Use one layer per channel.`
-      );
   }
   detach(A) {
-    this.releaseAndRemoveChunks(this.visibleChunks_.keys()), this.clearObjects(), this.chunkStoreView_?.dispose(), this.chunkStoreView_ = void 0, this.context_ = void 0;
+    this.releaseAndRemoveChunks(this.visibleChunks_.keys()), this.orderedChunks_ = [], this.clearObjects(), this.chunkStoreView_?.dispose(), this.chunkStoreView_ = void 0, this.context_ = void 0;
   }
   update(A) {
     if (!A || !this.chunkStoreView_) return;
@@ -12513,7 +12522,7 @@ class eC extends KI {
    * for the new plane, chunks already resident in the shared cache are reused.
    */
   setOrientation(A) {
-    A !== this.orientation_ && (this.releaseAndRemoveChunks(this.visibleChunks_.keys()), this.clearObjects(), this.chunkStoreView_?.dispose(), this.lastPresentationTimeStamp_ = void 0, this.lastPresentationTimeCoord_ = void 0, this.orientation_ = A, this.axes_ = MA(A), this.planeRotation_ = dA(this.axes_), this.context_ && (this.chunkStoreView_ = this.context_.chunkManager.addView(
+    A !== this.orientation_ && (this.releaseAndRemoveChunks(this.visibleChunks_.keys()), this.orderedChunks_ = [], this.clearObjects(), this.chunkStoreView_?.dispose(), this.lastPresentationTimeStamp_ = void 0, this.lastPresentationTimeCoord_ = void 0, this.orientation_ = A, this.axes_ = MA(A), this.planeRotation_ = dA(this.axes_), this.context_ && (this.chunkStoreView_ = this.context_.chunkManager.addView(
       this.source_,
       this.policy_,
       this.axes_
@@ -12531,14 +12540,20 @@ class eC extends KI {
     const I = this.chunkStoreView_.getChunksToRender(), B = new Set(I), C = Array.from(this.visibleChunks_.keys()).filter(
       (Q) => !B.has(Q)
     );
-    this.releaseAndRemoveChunks(C), this.clearObjects();
-    for (const Q of I) {
-      const E = this.getImageForChunk(Q, Q.texture);
-      this.visibleChunks_.set(Q, E), this.addObject(E);
-    }
+    this.releaseAndRemoveChunks(C);
+    for (const Q of I)
+      this.visibleChunks_.set(
+        Q,
+        this.getImageForChunk(Q, Q.texture)
+      );
+    this.orderedChunks_ = I, this.rebuildRenderGroups();
   }
-  hasMultipleLODs() {
-    return this.chunkStoreView_ ? this.chunkStoreView_.lodCount > 1 : !1;
+  rebuildRenderGroups() {
+    this.clearObjects();
+    for (const A of this.orderedChunks_) {
+      const I = this.visibleChunks_.get(A), B = A.chunkIndex.c;
+      I === void 0 || this.channelProps_?.[B]?.visible === !1 || this.addObject(I, B);
+    }
   }
   get lastPresentationTimeCoord() {
     return this.lastPresentationTimeCoord_;
@@ -12656,7 +12671,7 @@ class eC extends KI {
   setChannelProps(A) {
     this.channelProps_ = A, this.visibleChunks_.forEach((I, B) => {
       I.setChannelProps(this.getChannelPropsForChunk(B));
-    }), this.channelChangeCallbacks_.forEach((I) => {
+    }), this.rebuildRenderGroups(), this.channelChangeCallbacks_.forEach((I) => {
       I();
     });
   }
@@ -12871,7 +12886,7 @@ class Fo extends KI {
   pool_ = new pg();
   initialChannelProps_;
   channelChangeCallbacks_ = [];
-  sourcePolicy_;
+  policy_;
   chunkStoreView_;
   channelProps_;
   lastLoadedTime_ = void 0;
@@ -12893,8 +12908,8 @@ class Fo extends KI {
       this.debugShowWireframes_ = A;
     }
   }
-  set sourcePolicy(A) {
-    this.sourcePolicy_ !== A && (this.sourcePolicy_ = A, this.chunkStoreView_ && this.chunkStoreView_.setImageSourcePolicy(
+  set imageSourcePolicy(A) {
+    this.policy_ !== A && (this.policy_ = A, this.chunkStoreView_ && this.chunkStoreView_.setImageSourcePolicy(
       A,
       YI
     ));
@@ -12918,12 +12933,12 @@ class Fo extends KI {
   }
   removeChannelChangeCallback(A) {
     const I = this.channelChangeCallbacks_.indexOf(A);
-    if (I === void 0)
+    if (I === -1)
       throw new Error(`Callback to remove could not be found: ${A}`);
     this.channelChangeCallbacks_.splice(I, 1);
   }
   constructor({ source: A, sliceCoords: I, policy: B, channelProps: C }) {
-    super({ blendMode: "premultiplied" }), this.source_ = A, this.sliceCoords_ = I, this.sourcePolicy_ = B, this.initialChannelProps_ = C, this.channelProps_ = C, this.setState("initialized");
+    super({ blendMode: "premultiplied" }), this.source_ = A, this.sliceCoords_ = I, this.policy_ = B, this.initialChannelProps_ = C, this.channelProps_ = C, this.setState("initialized");
   }
   getOrCreateVolume(A, I) {
     const B = this.currentVolumes_.get(A);
@@ -12939,7 +12954,7 @@ class Fo extends KI {
   attach(A) {
     this.chunkStoreView_ = A.chunkManager.addView(
       this.source_,
-      this.sourcePolicy_
+      this.policy_
     ), hC(
       this.channelProps_,
       this.chunkStoreView_.channelCount
@@ -12948,7 +12963,7 @@ class Fo extends KI {
   detach(A) {
     for (const I of this.currentVolumes_.values())
       this.releaseAndRemoveVolume(I);
-    this.clearObjects(), this.chunkStoreView_?.dispose(), this.chunkStoreView_ = void 0;
+    this.currentVolumes_.clear(), this.clearObjects(), this.chunkStoreView_?.dispose(), this.chunkStoreView_ = void 0;
   }
   updateChunks() {
     if (!this.chunkStoreView_) return;
@@ -12957,10 +12972,9 @@ class Fo extends KI {
     if (this.lastLoadedTime_ !== I || B.size !== this.currentVolumes_.size || this.lastNumRenderedChannelChunks_ !== A.length) {
       for (const [Q, E] of this.currentVolumes_)
         B.has(Q) || (this.releaseAndRemoveVolume(E), this.currentVolumes_.delete(Q));
-      this.clearObjects();
       for (const [Q, E] of B) {
         const i = this.getOrCreateVolume(Q, E);
-        i.wireframeEnabled = this.debugShowWireframes, this.currentVolumes_.set(Q, i), this.addObject(i);
+        i.wireframeEnabled = this.debugShowWireframes, this.currentVolumes_.set(Q, i);
       }
       this.lastLoadedTime_ = I, this.lastNumRenderedChannelChunks_ = A.length;
     }
@@ -12993,7 +13007,13 @@ class Fo extends KI {
       A.camera.getViewProjection()
     );
     const I = A.cameraControls?.isMoving ?? !1;
-    this.interactiveStepSizeScale_ = I ? xi : 1, this.updateChunks(), Ti(this.objects, A.camera);
+    this.interactiveStepSizeScale_ = I ? xi : 1, this.updateChunks(), this.rebuildObjects(A.camera);
+  }
+  rebuildObjects(A) {
+    const I = Array.from(this.currentVolumes_.values());
+    Ti(I, A), this.clearObjects();
+    for (const B of I)
+      this.addObject(B);
   }
   getUniforms() {
     return {
@@ -13040,37 +13060,63 @@ class lB extends Fg {
     return this.height_;
   }
 }
-const nC = /* @__PURE__ */ new Set(["byte", "short", "int"]), Pi = /* @__PURE__ */ new Set([
+const Pi = [
+  [1, 0.5, 0.5],
+  [0.5, 1, 0.5],
+  [0.5, 0.5, 1],
+  [0.5, 1, 1],
+  [1, 0.5, 1],
+  [1, 1, 0.5]
+];
+function Oi(g) {
+  return g = g ?? /* @__PURE__ */ new Map(), new Map(
+    Array.from(g.entries()).map(([A, I]) => [
+      A,
+      x.from(I)
+    ])
+  );
+}
+function Vi(g) {
+  return g = g ?? Pi, g.map(x.from);
+}
+class fB {
+  lookupTable;
+  cycle;
+  constructor(A = {}) {
+    this.lookupTable = Oi(A.lookupTable), this.cycle = Vi(A.cycle);
+  }
+}
+const nC = /* @__PURE__ */ new Set(["byte", "short", "int"]), vi = /* @__PURE__ */ new Set([
   "unsigned_byte",
   "unsigned_short",
   "unsigned_int"
 ]);
-function Oi(g) {
+function Xi(g) {
   if (g.dataFormat !== "scalar")
     throw new Error(
       `Image data format must be scalar, instead found: ${g.dataFormat}`
     );
-  if (!nC.has(g.dataType) && !Pi.has(g.dataType))
+  if (!nC.has(g.dataType) && !vi.has(g.dataType))
     throw new Error(
       `Image data type must be an integer, instead found: ${g.dataType}`
     );
   return g;
 }
-function Vi(g) {
+function ji(g) {
   return nC.has(g.dataType) ? "intLabelImage" : "labelImage";
 }
-class vi extends xA {
+class zi extends xA {
   outlineSelected_;
   selectedValue_;
   worldToTexCoord = $();
   constructor(A) {
-    super(), this.geometry = new tC(A.width, A.height, 1, 1), this.setTexture(0, Oi(A.imageData));
+    super(), this.geometry = new tC(A.width, A.height, 1, 1), this.setTexture(0, Xi(A.imageData));
     const I = this.makeColorCycleTexture(A.colorMap.cycle);
     this.setTexture(1, I);
     const B = this.makeColorLookupTableTexture(
       A.colorMap.lookupTable
     );
-    this.setTexture(2, B), this.outlineSelected_ = A.outlineSelected ?? !1, this.selectedValue_ = A.selectedValue ?? null, this.programName = Vi(A.imageData);
+    this.setTexture(2, B), this.outlineSelected_ = A.outlineSelected ?? !1, this.selectedValue_ = A.selectedValue ?? null, this.programName = ji(A.imageData);
   }
   get type() {
     return "LabelImageRenderable";
@@ -13103,32 +13149,6 @@ class vi extends xA {
     return Q.set(I, 0), Q.set(B, C), new lB(Q, C, 2);
   }
 }
-const Xi = [
-  [1, 0.5, 0.5],
-  [0.5, 1, 0.5],
-  [0.5, 0.5, 1],
-  [0.5, 1, 1],
-  [1, 0.5, 1],
-  [1, 1, 0.5]
-];
-function ji(g) {
-  return g = g ?? /* @__PURE__ */ new Map(), new Map(
-    Array.from(g.entries()).map(([A, I]) => [
-      A,
-      x.from(I)
-    ])
-  );
-}
-function zi(g) {
-  return g = g ?? Xi, g.map(x.from);
-}
-class fB {
-  lookupTable;
-  cycle;
-  constructor(A = {}) {
-    this.lookupTable = ji(A.lookupTable), this.cycle = zi(A.cycle);
-  }
-}
 class GC extends KI {
   type = "LabelLayer";
   source_;
@@ -13213,12 +13233,9 @@ class GC extends KI {
     this.releaseAndRemoveChunks(C), this.clearObjects();
     for (const Q of I) {
       const E = this.getLabelForChunk(Q, Q.texture);
-      this.visibleChunks_.set(Q, E), this.addObject(E);
+      this.visibleChunks_.set(Q, E), this.addObject(E, 0);
     }
   }
-  hasMultipleLODs() {
-    return this.chunkStoreView_ ? this.chunkStoreView_.lodCount > 1 : !1;
-  }
   isPresentationStale() {
     return this.lastPresentationTimeStamp_ === void 0 ? !1 : performance.now() - this.lastPresentationTimeStamp_ > GC.STALE_PRESENTATION_MS_;
   }
@@ -13309,7 +13326,7 @@ class GC extends KI {
     return C ? (C.setTexture(0, I), C.setColorMap(this.colorMap_), C.setSelectedValue(this.selectedValue_), this.updateLabelChunk(C, A), C) : this.createLabel(A, I);
   }
   createLabel(A, I) {
-    const B = new vi({
+    const B = new zi({
       width: A.shape[this.axes_.u],
       height: A.shape[this.axes_.v],
       imageData: I,
@@ -13402,7 +13419,7 @@ class ro extends xA {
     }), this.geometry = B, this.setTexture(0, $i());
   }
   get type() {
-    return "Points";
+    return "PointsRenderable";
   }
 }
 let PI;
@@ -13913,7 +13930,7 @@ export {
   eC as ImageLayer,
   li as ImageRenderable,
   fB as LabelColorMap,
-  vi as LabelImageRenderable,
+  zi as LabelImageRenderable,
   GC as LabelLayer,
   KI as Layer,
   OA as OmeZarrImageSource,
@@ -13921,8 +13938,8 @@ export {
   Ro as OrthographicCamera,
   No as PanZoomControls,
   co as PerspectiveCamera,
-  ro as Points,
-  Hi as ProjectedLine,
+  ro as PointsRenderable,
+  Hi as ProjectedLineRenderable,
   Fo as VolumeLayer,
   mi as VolumeRenderable,
   Uo as createExplorationPolicy,