@solidrt/2d 0.0.58 → 0.0.60

package/src/views.ts

@@ -18,12 +18,12 @@
 // a sprite under a minimap gets its ordinary handlers, and the view's
 // listeners are the last stop.
 import { addDraw, createDrawTarget, destroyTexture, removeDraw, setDrawBuffers, setDrawRange, setTargetParams, setTargetSize } from "@solidrt/core/gpu"
-import type { BufferId, BufferUpdate, DrawId, InstanceOrder, RenderPipelineId, TextureId } from "@solidrt/core/gpu"
+import type { BufferId, DrawId, InstanceOrder, RenderPipelineId, TextureId } from "@solidrt/core/gpu"
 import { applyCamera, cameraParams, checkCamera, defaultCamera, projectCamera, unprojectCamera } from "./camera.ts"
 import type { CameraState, CameraUpdate } from "./camera.ts"
 import { spriteDispatch } from "./dispatch.ts"
 import type { PointerFeed } from "@solidrt/core"
-import type { LayerPointerListener, Sprite, SpriteHandlers } from "./layer.ts"
+import type { LayerPointerListener, Sprite, LayerHandlers } from "./layer.ts"
 import { checkOversample, thrashSentinel } from "./oversample.ts"
 
 export type ViewOptions = {
@@ -51,7 +51,7 @@ export type ViewHandle = {
   texture: TextureId
   /** Element handlers wiring the view's pointer events (sprites, groups
    * and the root listeners); see handlersFor. */
-  handlers: SpriteHandlers
+  handlers: LayerHandlers
   /** View pixels, as created or last set by setSize. */
   readonly width: number
   readonly height: number
@@ -95,7 +95,7 @@ export type ViewHandle = {
    * `handlers`). `layout` is read per event, so a resize-reactive layout
    * just works - @solidrt/3d's handlersFor, one dimension down.
    */
-  handlersFor(layout: () => { width: number; height: number }): SpriteHandlers
+  handlersFor(layout: () => { width: number; height: number }): LayerHandlers
   dispose(): void
 }
 
@@ -107,9 +107,10 @@ export type ViewDeps = {
   pipeline: RenderPipelineId
   quad: BufferId
   atlas: TextureId
-  /** The layer's current instance binding, in the entry's own spelling
-   * (`instanceBuffers` on the node layer, `instanceBuffer` on records). */
-  buffers: () => BufferUpdate
+  /** The layer's current instance buffers, in the pipeline's layout order
+   * after the quad (the pose and style pair on the node layer, the one
+   * record buffer on records). */
+  buffers: () => BufferId[]
   /** The instance count as last published. */
   count: () => number
   tint: () => [number, number, number, number]
@@ -123,7 +124,7 @@ export type Views = {
   create(opts: ViewOptions): ViewHandle
   /** The layer swapped its instance buffers (growth): every entry
    * follows. */
-  setBuffers(update: BufferUpdate): void
+  setBuffers(instanceBuffers: BufferId[]): void
   setCount(count: number): void
   setTint(tint: [number, number, number, number]): void
   dispose(): void
@@ -138,9 +139,8 @@ export function createViews(deps: ViewDeps): Views {
   let ordered: ViewRecord | null = null
   let entryFor = (texture: TextureId, order: InstanceOrder | undefined): DrawId =>
     addDraw(texture, deps.pipeline, null, {
-      buffer: deps.quad,
+      buffers: [deps.quad, ...deps.buffers()],
       vertexCount: 4,
-      ...deps.buffers(),
       instanceOrder: order,
       instanceCount: deps.count(),
     })
@@ -199,7 +199,7 @@ export function createViews(deps: ViewDeps): Views {
       if (order !== undefined) ordered = record
       let view: ViewHandle = {
         texture,
-        handlers: undefined as unknown as SpriteHandlers,
+        handlers: undefined as unknown as LayerHandlers,
         get width() {
           return width
         },
@@ -261,8 +261,8 @@ export function createViews(deps: ViewDeps): Views {
       views.add(record)
       return view
     },
-    setBuffers(update) {
-      for (let v of views) setDrawBuffers(v.texture, v.entry, update)
+    setBuffers(instanceBuffers) {
+      for (let v of views) setDrawBuffers(v.texture, v.entry, { buffers: [deps.quad, ...instanceBuffers] })
     },
     setCount(count) {
       for (let v of views) setDrawRange(v.texture, v.entry, { instanceCount: count })