@idetik/core 0.35.5 → 0.36.0

package/dist/index.d.ts

@@ -638,7 +638,7 @@ interface LayerProps {
  */
 declare abstract class Layer {
     abstract readonly type: string;
-    private objects_;
+    private readonly coverageGroups_;
     private state_;
     private attached_;
     private readonly callbacks_;
@@ -653,14 +653,12 @@ declare abstract class Layer {
     onDetached(context: IdetikContext): void;
     protected attach(_context: IdetikContext): void;
     protected detach(_context: IdetikContext): void;
-    get objects(): RenderableObject[];
+    get coverageGroups(): ReadonlyMap<number | null, readonly RenderableObject[]>;
     get state(): LayerState;
     addStateChangeCallback(callback: StateChangeCallback): void;
     removeStateChangeCallback(callback: StateChangeCallback): void;
-    hasMultipleLODs(): boolean;
     protected setState(newState: LayerState): void;
-    protected addObject(object: RenderableObject): void;
-    protected removeObject(object: RenderableObject): void;
+    protected addObject(object: RenderableObject, coverageGroup?: number | null): void;
     protected clearObjects(): void;
     /**
      * Get uniforms for shader program. Override in derived classes that need custom uniforms.
@@ -675,7 +673,7 @@ declare abstract class Renderer {
     private height_;
     protected renderedObjects_: number;
     protected abstract resize(width: number, height: number): void;
-    protected abstract renderObject(layer: Layer, objectIndex: number, camera: Camera): void;
+    protected abstract renderObject(layer: Layer, object: RenderableObject, camera: Camera): void;
     protected abstract clear(): void;
     constructor(canvas: HTMLCanvasElement);
     beginFrame(): void;
@@ -1527,6 +1525,7 @@ declare class ImageLayer extends Layer implements ChannelsEnabled {
     private orientation_;
     private readonly onPickValue_?;
     private readonly visibleChunks_;
+    private orderedChunks_;
     private readonly pool_;
     private readonly initialChannelProps_?;
     private readonly channelChangeCallbacks_;
@@ -1551,7 +1550,7 @@ declare class ImageLayer extends Layer implements ChannelsEnabled {
      */
     setOrientation(orientation: SliceOrientation): void;
     private updateChunks;
-    hasMultipleLODs(): boolean;
+    private rebuildRenderGroups;
     get lastPresentationTimeCoord(): number | undefined;
     private isPresentationStale;
     onEvent(event: EventContext): void;
@@ -1622,6 +1621,7 @@ declare class VolumeLayer extends Layer implements ChannelsEnabled {
     private updateVolumeTransform;
     private releaseAndRemoveVolume;
     update(viewport?: Viewport): void;
+    private rebuildObjects;
     getUniforms(): Record<string, unknown>;
 }
 
@@ -1704,7 +1704,6 @@ declare class LabelLayer extends Layer {
      */
     setOrientation(orientation: SliceOrientation): void;
     private updateChunks;
-    hasMultipleLODs(): boolean;
     private isPresentationStale;
     onEvent(event: EventContext): void;
     private pickAtRay;

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) {
@@ -11872,7 +11886,7 @@ class OA {
   }
 }
 class KI {
-  objects_ = [];
+  coverageGroups_ = /* @__PURE__ */ new Map();
   state_ = "initialized";
   attached_ = !1;
   callbacks_ = [];
@@ -11906,8 +11920,8 @@ class KI {
   }
   detach(A) {
   }
-  get objects() {
-    return this.objects_;
+  get coverageGroups() {
+    return this.coverageGroups_;
   }
   get state() {
     return this.state_;
@@ -11921,22 +11935,16 @@ class KI {
       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.
@@ -12453,6 +12461,7 @@ class eC extends KI {
   orientation_;
   onPickValue_;
   visibleChunks_ = /* @__PURE__ */ new Map();
+  orderedChunks_ = [];
   pool_ = new pg();
   initialChannelProps_;
   channelChangeCallbacks_ = [];
@@ -12480,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;
@@ -12515,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_
@@ -12533,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_;
@@ -12658,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();
     });
   }
@@ -12950,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;
@@ -12959,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;
     }
@@ -12995,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 {
@@ -13215,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_;
   }