@solidrt/2d 0.0.67 → 0.0.68

package/src/views.ts

@@ -25,6 +25,7 @@ import { spriteDispatch } from "./dispatch.ts"
 import type { PointerFeed } from "@solidrt/core"
 import type { LayerPointerListener, Sprite, LayerHandlers } from "./layer.ts"
 import { checkOversample, thrashSentinel } from "./oversample.ts"
+import { atlasBindings } from "./shaders.ts"
 
 export type ViewOptions = {
   /** View pixels: the viewport its camera maps the world onto. */
@@ -52,9 +53,9 @@ export type ViewHandle = {
   /** Element handlers wiring the view's pointer events (sprites, groups
    * and the root listeners); see handlersFor. */
   handlers: LayerHandlers
-  /** View pixels, as created or last set by setSize. */
-  readonly width: number
-  readonly height: number
+  /** View pixels, as created or last set by setSize (a fresh object per
+   * call) - @solidrt/3d's view.size(), what a camera control reads. */
+  size(): { width: number; height: number }
   setSize(width: number, height: number): void
   /**
    * Listen at the root of the event walk. Every down, move, up, wheel and
@@ -89,6 +90,10 @@ export type ViewHandle = {
   /** View pixels -> world (layer) pixels, the inverse: what pointer
    * dispatch applies to every event. */
   unproject(x: number, y: number): [number, number]
+  /** The layer's pick through this view: the view pixel unprojected, the
+   * sprites' screen-size floors measured at this camera's zoom - what
+   * the pointer walk hits. */
+  pick(x: number, y: number): Sprite[]
   /**
    * handlers for a leaf whose LAYOUT size differs from the view size
    * (events scale by view/layout; a leaf laid out AT view size just uses
@@ -100,13 +105,15 @@ export type ViewHandle = {
 }
 
 // What a layer hands its views: the pipeline and quad every entry draws
-// with, the atlas, the key order one entry declares, and live reads of
+// with, the atlases, the key order one entry declares, and live reads of
 // the state the layer fans out.
 export type ViewDeps = {
   label: string
   pipeline: RenderPipelineId
   quad: BufferId
-  atlas: TextureId
+  /** The layer's atlas textures in sampler order (the pipeline was
+   * compiled for exactly this many). */
+  atlases: readonly TextureId[]
   /** 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). */
@@ -114,7 +121,8 @@ export type ViewDeps = {
   /** The instance count as last published. */
   count: () => number
   tint: () => [number, number, number, number]
-  pick: (x: number, y: number) => Sprite[]
+  /** The layer's pick, `zoom` the camera zoom its floors are measured at. */
+  pick: (x: number, y: number, zoom: number) => Sprite[]
   /** The layer's key order (`orderBy`), declared by ONE live entry. */
   order?: InstanceOrder
 }
@@ -173,7 +181,7 @@ export function createViews(deps: ViewDeps): Views {
         width * oversample,
         height * oversample,
         { uViewport: [width, height], ...cameraParams(cam), uTint: deps.tint() },
-        { textures: { uAtlas: deps.atlas }, clearColor: opts.clearColor ?? [0, 0, 0, 0], label, autoFree: false },
+        { textures: atlasBindings(deps.atlases), clearColor: opts.clearColor ?? [0, 0, 0, 0], label, autoFree: false },
       )
       let order = ordered === null ? deps.order : undefined
       let entry = entryFor(texture, order)
@@ -200,12 +208,7 @@ export function createViews(deps: ViewDeps): Views {
       let view: ViewHandle = {
         texture,
         handlers: undefined as unknown as LayerHandlers,
-        get width() {
-          return width
-        },
-        get height() {
-          return height
-        },
+        size: () => ({ width, height }),
         setSize(w, h) {
           if (disposed || (w === width && h === height)) return
           checkOversample("setSize", oversample, w, h)
@@ -245,6 +248,10 @@ export function createViews(deps: ViewDeps): Views {
         unproject(x, y) {
           return unprojectCamera(cam, x, y)
         },
+        pick(x, y) {
+          let [wx, wy] = unprojectCamera(cam, x, y)
+          return deps.pick(wx, wy, cam.zoom)
+        },
         handlersFor(layout) {
           return dispatch(layout)
         },