@idetik/core 0.26.0 → 0.27.1

package/dist/index.d.ts

@@ -386,6 +386,7 @@ declare abstract class Layer {
     abstract readonly type: string;
     private objects_;
     private state_;
+    private attached_;
     private readonly callbacks_;
     private opacity_;
     blendMode: BlendMode;
@@ -394,8 +395,10 @@ declare abstract class Layer {
     set opacity(value: number);
     abstract update(context?: RenderContext): void;
     onEvent(_: EventContext): void;
-    onAttached(_context: IdetikContext): void;
-    onDetached(_context: IdetikContext): void;
+    onAttached(context: IdetikContext): void;
+    onDetached(context: IdetikContext): void;
+    protected attach(_context: IdetikContext): void;
+    protected detach(_context: IdetikContext): void;
     get objects(): RenderableObject[];
     get state(): LayerState;
     addStateChangeCallback(callback: StateChangeCallback): void;
@@ -563,6 +566,8 @@ declare abstract class Renderer {
     get renderedObjects(): number;
     abstract get gpuTextureBytes(): number;
     abstract get gpuTextureCount(): number;
+    abstract uploadTexture(texture: Texture): void;
+    abstract disposeTexture(texture: Texture): void;
     set backgroundColor(color: ColorLike);
 }
 
@@ -1365,8 +1370,8 @@ declare class ImageLayer extends Layer implements ChannelsEnabled {
     private lastPresentationTimeCoord_?;
     private readonly wireframeColors_;
     constructor({ source, sliceCoords, policy, channelProps, onPickValue, ...layerOptions }: ImageLayerProps);
-    onAttached(context: IdetikContext): void;
-    onDetached(_context: IdetikContext): void;
+    protected attach(context: IdetikContext): void;
+    protected detach(_context: IdetikContext): void;
     update(context?: RenderContext): void;
     private updateChunks;
     hasMultipleLODs(): boolean;
@@ -1432,8 +1437,8 @@ declare class VolumeLayer extends Layer implements ChannelsEnabled {
     removeChannelChangeCallback(callback: () => void): void;
     constructor({ source, sliceCoords, policy, channelProps }: VolumeLayerProps);
     private getOrCreateVolume;
-    onAttached(context: IdetikContext): void;
-    onDetached(_context: IdetikContext): void;
+    protected attach(context: IdetikContext): void;
+    protected detach(_context: IdetikContext): void;
     private updateChunks;
     private updateVolumeTransform;
     private releaseAndRemoveVolume;
@@ -1476,8 +1481,8 @@ declare class LabelLayer extends Layer {
     private lastPresentationTimeStamp_?;
     private lastPresentationTimeCoord_?;
     constructor({ source, sliceCoords, policy, colorMap, onPickValue, outlineSelected, ...layerOptions }: LabelLayerProps);
-    onAttached(context: IdetikContext): void;
-    onDetached(_context: IdetikContext): void;
+    protected attach(context: IdetikContext): void;
+    protected detach(_context: IdetikContext): void;
     update(context?: RenderContext): void;
     private updateChunks;
     private isPresentationStale;

package/dist/index.js

@@ -1267,13 +1267,8 @@ class ti {
       throw new Error(
         `Texture index ${I} must be in [0, ${this.maxTextureUnits_ - 1}]`
       );
-    this.gl_.activeTexture(this.gl_.TEXTURE0 + I);
-    const g = this.getTextureType(A), B = this.getDataFormatInfo(A.dataFormat, A.dataType);
-    this.textures_.has(A) || this.generateTexture(A, B, g);
-    const Q = this.textures_.get(A);
-    if (!Q)
-      throw new Error("Failed to retrieve texture ID");
-    this.gl_.bindTexture(g, Q), A.needsUpdate && A.data !== null && (this.configureTextureParameters(A, g), this.uploadTextureData(A, B, g), A.needsUpdate = !1), this.currentTexture_ = A;
+    const g = this.textures_.get(A);
+    g && !A.needsUpdate ? (this.gl_.activeTexture(this.gl_.TEXTURE0 + I), this.gl_.bindTexture(this.getTextureType(A), g)) : this.uploadTexture(A, I), this.currentTexture_ = A;
   }
   readTexel(A, I, g, B) {
     const Q = this.gl_, E = this.textures_.get(A);
@@ -1312,7 +1307,18 @@ class ti {
         return { format: I.RGBA, type: I.FLOAT, out: new Float32Array(4) };
     }
   }
-  disposeTexture(A) {
+  uploadTexture(A, I = 0) {
+    if (this.textures_.has(A) && !A.needsUpdate) return;
+    if (A.data === null)
+      throw new Error("Cannot upload a texture that has no CPU data");
+    const g = this.getTextureType(A), B = this.getDataFormatInfo(A.dataFormat, A.dataType);
+    this.gl_.activeTexture(this.gl_.TEXTURE0 + I), this.textures_.has(A) || this.generateTexture(A, B, g);
+    const Q = this.textures_.get(A);
+    if (!Q)
+      throw new Error("Failed to retrieve texture ID");
+    this.gl_.bindTexture(g, Q), this.configureTextureParameters(A, g), this.uploadTextureData(A, B, g), A.needsUpdate = !1;
+  }
+  dispose(A) {
     const I = this.textures_.get(A);
     if (I) {
       this.gl_.deleteTexture(I), this.textures_.delete(A), A.readTexel = void 0, this.currentTexture_ === A && (this.currentTexture_ = null);
@@ -1322,7 +1328,7 @@ class ti {
   }
   disposeAll() {
     for (const A of Array.from(this.textures_.keys()))
-      this.disposeTexture(A);
+      this.dispose(A);
     this.gpuTextureBytes_ = 0, this.textureCount_ = 0;
   }
   alreadyActive(A) {
@@ -1740,7 +1746,7 @@ class eC extends cQ {
   renderObject(A, I, g) {
     const B = A.objects[I];
     if (B.popStaleTextures().forEach((E) => {
-      this.textures_.disposeTexture(E);
+      this.textures_.dispose(E);
     }), !B.programName) return;
     this.state_.setCullFaceMode(B.cullFaceMode), this.state_.setDepthTesting(B.depthTest), this.state_.setDepthMask(B.depthTest), this.bindings_.bindGeometry(B.geometry), B.textures.forEach((E, i) => {
       this.textures_.bindTexture(E, i);
@@ -1810,6 +1816,12 @@ class eC extends cQ {
     const n = this.glGetPrimitive(A.primitive), D = A.indexData;
     D.length ? this.gl_.drawElements(n, D.length, this.gl_.UNSIGNED_INT, 0) : this.gl_.drawArrays(n, 0, A.vertexCount);
   }
+  uploadTexture(A) {
+    this.textures_.uploadTexture(A);
+  }
+  disposeTexture(A) {
+    this.textures_.dispose(A);
+  }
   glGetPrimitive(A) {
     switch (A) {
       case "points":
@@ -2160,16 +2172,20 @@ class ki {
     this.device_ = A, this.textures_ = [];
   }
   get(A) {
-    const I = this.textures_.find((B) => B.entry === A);
-    if (I)
-      return A.needsUpdate && this.upload(A, I.texture), I.texture;
-    const g = this.device_.createTexture({
-      size: nC(A),
-      dimension: A instanceof TA ? "3d" : "2d",
-      format: di(A),
-      usage: GPUTextureUsage.TEXTURE_BINDING | GPUTextureUsage.COPY_DST | GPUTextureUsage.COPY_SRC
-    });
-    return this.upload(A, g), this.textures_.push({ entry: A, texture: g }), A.readTexel = (B, Q, E) => this.readTexel(g, A.dataType, B, Q, E), g;
+    let I = this.textures_.find((g) => g.entry === A);
+    if (I && !A.needsUpdate) return I.texture;
+    if (A.data === null)
+      throw new Error("Cannot upload a texture that has no CPU data");
+    if (!I) {
+      const g = this.device_.createTexture({
+        size: nC(A),
+        dimension: A instanceof TA ? "3d" : "2d",
+        format: di(A),
+        usage: GPUTextureUsage.TEXTURE_BINDING | GPUTextureUsage.COPY_DST | GPUTextureUsage.COPY_SRC
+      });
+      this.textures_.push({ entry: A, texture: g }), I = this.textures_[this.textures_.length - 1];
+    }
+    return this.upload(A, I.texture), A.readTexel = (g, B, Q) => this.readTexel(I.texture, A.dataType, g, B, Q), I.texture;
   }
   async readTexel(A, I, g, B, Q) {
     const E = this.device_.createBuffer({
@@ -8582,6 +8598,12 @@ class Mo extends cQ {
   }
   clear() {
   }
+  uploadTexture(A) {
+    this.texturePool_.get(A);
+  }
+  disposeTexture(A) {
+    this.texturePool_.dispose(A);
+  }
   setUniformsForObject(A, I, g) {
     _A(
       this.currentModelView_,
@@ -9439,7 +9461,7 @@ class Oo {
     return this.layers_;
   }
   addLayer(A) {
-    this.layers_.push(A), A.onAttached(this.context_);
+    A.onAttached(this.context_), this.layers_.push(A);
   }
   removeLayer(A) {
     const I = this.layers_.indexOf(A);
@@ -18455,6 +18477,7 @@ class MI {
 class Jg {
   objects_ = [];
   state_ = "initialized";
+  attached_ = !1;
   callbacks_ = [];
   opacity_;
   blendMode;
@@ -18473,8 +18496,18 @@ class Jg {
   onEvent(A) {
   }
   onAttached(A) {
+    if (this.attached_)
+      throw new Error(
+        `${this.type} cannot be attached to multiple viewports simultaneously.`
+      );
+    this.attach(A), this.attached_ = !0;
   }
   onDetached(A) {
+    this.attached_ && (this.detach(A), this.attached_ = !1);
+  }
+  attach(A) {
+  }
+  detach(A) {
   }
   get objects() {
     return this.objects_;
@@ -18953,11 +18986,7 @@ class DE extends Jg {
   }) {
     super(E), this.setState("initialized"), this.source_ = A, this.policy_ = g, this.sliceCoords_ = I, this.channelProps_ = B, this.initialChannelProps_ = B, this.onPickValue_ = Q;
   }
-  onAttached(A) {
-    if (this.chunkStoreView_)
-      throw new Error(
-        "ImageLayer cannot be attached to multiple viewports simultaneously."
-      );
+  attach(A) {
     this.chunkStoreView_ = A.chunkManager.addView(
       this.source_,
       this.policy_
@@ -18968,8 +18997,8 @@ class DE extends Jg {
         `ImageLayer requires exactly one channel in sliceCoords.c for multi-channel sources (found ${I} channels). Use one layer per channel.`
       );
   }
-  onDetached(A) {
-    this.chunkStoreView_ && (this.releaseAndRemoveChunks(this.visibleChunks_.keys()), this.clearObjects(), this.chunkStoreView_.dispose(), this.chunkStoreView_ = void 0);
+  detach(A) {
+    this.releaseAndRemoveChunks(this.visibleChunks_.keys()), this.clearObjects(), this.chunkStoreView_?.dispose(), this.chunkStoreView_ = void 0;
   }
   update(A) {
     if (!(!A || !this.chunkStoreView_)) {
@@ -19377,11 +19406,7 @@ class Ua extends Jg {
     for (const E of I) Q.updateVolumeWithChunk(E);
     return this.updateVolumeTransform(Q, I[0]), Q;
   }
-  onAttached(A) {
-    if (this.chunkStoreView_)
-      throw new Error(
-        "VolumeLayer cannot be attached to multiple viewports simultaneously."
-      );
+  attach(A) {
     this.chunkStoreView_ = A.chunkManager.addView(
       this.source_,
       this.sourcePolicy_
@@ -19390,12 +19415,10 @@ class Ua extends Jg {
       this.chunkStoreView_.channelCount
     );
   }
-  onDetached(A) {
-    if (this.chunkStoreView_) {
-      for (const I of this.currentVolumes_.values())
-        this.releaseAndRemoveVolume(I);
-      this.clearObjects(), this.chunkStoreView_.dispose(), this.chunkStoreView_ = void 0;
-    }
+  detach(A) {
+    for (const I of this.currentVolumes_.values())
+      this.releaseAndRemoveVolume(I);
+    this.clearObjects(), this.chunkStoreView_?.dispose(), this.chunkStoreView_ = void 0;
   }
   updateChunks() {
     if (!this.chunkStoreView_) return;
@@ -19633,11 +19656,7 @@ class hE extends Jg {
   }) {
     super(i), this.setState("initialized"), this.source_ = A, this.policy_ = g, this.sliceCoords_ = I, this.colorMap_ = new aQ(B), this.onPickValue_ = Q, this.outlineSelected_ = E;
   }
-  onAttached(A) {
-    if (this.chunkStoreView_)
-      throw new Error(
-        "LabelLayer cannot be attached to multiple viewports simultaneously."
-      );
+  attach(A) {
     if (this.chunkStoreView_ = A.chunkManager.addView(
       this.source_,
       this.policy_
@@ -19646,8 +19665,8 @@ class hE extends Jg {
         `LabelLayer does not support multi-channel sources (found ${this.chunkStoreView_.channelCount} channels). Label data must be single-channel.`
       );
   }
-  onDetached(A) {
-    this.chunkStoreView_ && (this.releaseAndRemoveChunks(this.visibleChunks_.keys()), this.clearObjects(), this.chunkStoreView_.dispose(), this.chunkStoreView_ = void 0);
+  detach(A) {
+    this.releaseAndRemoveChunks(this.visibleChunks_.keys()), this.clearObjects(), this.chunkStoreView_?.dispose(), this.chunkStoreView_ = void 0;
   }
   update(A) {
     if (!(!A || !this.chunkStoreView_)) {