@weasel-js/kernel3d 1.17.3 → 1.18.0

package/dist/index.d.ts

@@ -184,14 +184,14 @@ declare function rayThroughScreenPoint(point: {
 }, rect: ScreenBox, viewProjection: Mat4): Ray | null;
 /**
  * The screen rectangle a world-space box covers — the currency weasel's chrome
- * and `PoseDescriptor.getBounds` speak in. `null` when the box is entirely
- * behind the near plane.
+ * and `PoseDescriptor.getBounds` speak in. `null` when none of the box lies
+ * between the near and far planes, which is when the camera draws none of it.
  *
- * Each of the twelve edges is clipped against the near plane before it is
- * projected, rather than dropping the corners behind it. Dropping them reports
- * a box that is too small for anything straddling the near plane, and the error
- * grows as the camera moves in: a solid the pointer is inside of would outline
- * as a sliver, or as nothing.
+ * Each of the twelve edges is clipped against the near and far planes before
+ * it is projected, rather than dropping the corners behind the camera.
+ * Dropping them reports a box that is too small for anything straddling the
+ * near plane, and the error grows as the camera moves in: a solid the pointer
+ * is inside of would outline as a sliver, or as nothing.
  */
 declare function projectAabbToScreen(box: Aabb, viewProjection: Mat4, rect: ScreenBox): ScreenBox | null;
 
@@ -342,7 +342,7 @@ interface Footprint {
 /**
  * A drag becomes a footprint on the ground plane: its ends, or without them
  * its box's four corners, are cast onto the plane and the hit points give the
- * extent. What node that implies is the consumer's answer — the kernel does
+ * extent. One that misses the plane, past the horizon, declines the insert. What node that implies is the consumer's answer — the kernel does
  * not know what it is inserting. The depth the 2D contract cannot express
  * comes from the plane, not from the caller.
  */

package/dist/index.js

@@ -139,9 +139,10 @@ function rayThroughScreenPoint(point, rect, viewProjection) {
   if (unit.x === 0 && unit.y === 0 && unit.z === 0) return null;
   return { origin: near, direction };
 }
-function nearSide(p) {
-  return p[2] + p[3];
-}
+var CLIP_SIDES = [
+  (p) => p[2] + p[3],
+  (p) => p[3] - p[2]
+];
 function lerpClip(a, b, t) {
   return [
     a[0] + (b[0] - a[0]) * t,
@@ -178,15 +179,24 @@ function projectAabbToScreen(box, viewProjection, rect) {
   for (let i = 0; i < 8; i++) {
     for (const bit of EDGE_BITS) {
       if (i & bit) continue;
-      let a = corners[i];
-      let b = corners[i | bit];
-      const da = nearSide(a);
-      const db = nearSide(b);
-      if (da < 0 && db < 0) continue;
-      if (da < 0) a = lerpClip(a, b, da / (da - db));
-      else if (db < 0) b = lerpClip(b, a, db / (db - da));
-      extend(a);
-      extend(b);
+      const a = corners[i];
+      const b = corners[i | bit];
+      let t0 = 0;
+      let t1 = 1;
+      for (const side of CLIP_SIDES) {
+        const da = side(a);
+        const db = side(b);
+        if (da < 0 && db < 0) {
+          t0 = 1;
+          t1 = 0;
+          break;
+        }
+        if (da < 0) t0 = Math.max(t0, da / (da - db));
+        else if (db < 0) t1 = Math.min(t1, da / (da - db));
+      }
+      if (t0 > t1) continue;
+      extend(t0 === 0 ? a : lerpClip(a, b, t0));
+      extend(t1 === 1 ? b : lerpClip(a, b, t1));
     }
   }
   if (!any) return null;
@@ -272,10 +282,65 @@ function withDescendants(scene, ids) {
   }
   return out;
 }
+function boxIndexable({ min, max }) {
+  return Number.isFinite(min.x) && Number.isFinite(min.y) && Number.isFinite(min.z) && Number.isFinite(max.x) && Number.isFinite(max.y) && Number.isFinite(max.z) && min.x <= max.x && min.y <= max.y && min.z <= max.z;
+}
 function pointBox(p) {
   return { min: p, max: p };
 }
 
+// src/snap/boxIndex.ts
+var CACHE = /* @__PURE__ */ new WeakMap();
+function nodesOf(world) {
+  return world.scene.renderOrderNodes();
+}
+function build(world) {
+  const nodes = nodesOf(world);
+  const boxes = nodes.map(worldBoxes(world, "document"));
+  const entries = [];
+  const always = [];
+  boxes.forEach((box, i) => {
+    if (box === null) return;
+    const { min, max } = box;
+    if (boxIndexable(box)) entries.push([i, [min.x, min.y, min.z, max.x, max.y, max.z]]);
+    else always.push(i);
+  });
+  return { ids: nodes.map((n) => n.id), boxes, tree: createBvh(3, entries), always };
+}
+function current(world) {
+  let cache = CACHE.get(world);
+  if (cache === void 0) CACHE.set(world, cache = createSettledCache());
+  return cache.read([world.scene.getVersion(), world.bounds], () => build(world));
+}
+function padQuery(box) {
+  let m = 0;
+  for (const v of box) if (Number.isFinite(v)) m = Math.max(m, Math.abs(v));
+  const e = 1e-9 * (1 + m);
+  return [box[0] - e, box[1] - e, box[2] - e, box[3] + e, box[4] + e, box[5] + e];
+}
+function snapBoxes(world, exclude, near) {
+  const excluded = withDescendants(world.scene, exclude);
+  const index = near.every((b) => Array.prototype.every.call(b, (v) => !Number.isNaN(v))) ? current(world) : null;
+  if (index === null) {
+    const boxOf = worldBoxes(world, "document");
+    const out2 = [];
+    for (const node of nodesOf(world)) {
+      const box = excluded.has(node.id) ? null : boxOf(node);
+      if (box) out2.push(box);
+    }
+    return out2;
+  }
+  const found = new Set(index.always);
+  for (const box of near) index.tree.queryBox(box, (i) => {
+    found.add(i);
+  });
+  const out = [];
+  for (const i of [...found].sort((a, b) => a - b)) {
+    if (!excluded.has(index.ids[i])) out.push(index.boxes[i]);
+  }
+  return out;
+}
+
 // src/pickIndex.ts
 function screenBoxOf(world, id, viewport) {
   const node = world.scene.get(id);
@@ -283,9 +348,6 @@ function screenBoxOf(world, id, viewport) {
   const box = node && pose && boxAt(world, node, pose);
   return box ? projectAabbToScreen(box, viewProjectionOf(viewport), rectOf(viewport)) : null;
 }
-function boxValid({ min, max }) {
-  return Number.isFinite(min.x) && Number.isFinite(min.y) && Number.isFinite(min.z) && Number.isFinite(max.x) && Number.isFinite(max.y) && Number.isFinite(max.z) && min.x <= max.x && min.y <= max.y && min.z <= max.z;
-}
 var NDC_SLACK = 1e-9;
 function sidePlanes(vp, rect) {
   const m = viewProjectionOf(vp);
@@ -355,27 +417,15 @@ var BuiltIndex = class {
     return hits;
   }
 };
-var CACHE = /* @__PURE__ */ new WeakMap();
-function padded({ min, max }) {
-  const m = Math.max(
-    Math.abs(min.x),
-    Math.abs(min.y),
-    Math.abs(min.z),
-    Math.abs(max.x),
-    Math.abs(max.y),
-    Math.abs(max.z)
-  );
-  const e = 1e-9 * (1 + m);
-  return [min.x - e, min.y - e, min.z - e, max.x + e, max.y + e, max.z + e];
-}
-function build(world, order) {
+var CACHE2 = /* @__PURE__ */ new WeakMap();
+function build2(world, order) {
   const boxOf = worldBoxes(world, "shown");
   const boxes = order.map(boxOf);
   const entries = [];
   const always = [];
   boxes.forEach((b, i) => {
     if (b === null) return;
-    if (boxValid(b)) entries.push([i, padded(b)]);
+    if (boxIndexable(b)) entries.push([i, padQuery([b.min.x, b.min.y, b.min.z, b.max.x, b.max.y, b.max.z])]);
     else always.push(i);
   });
   return new BuiltIndex(order, boxes, createBvh(3, entries), always);
@@ -385,12 +435,12 @@ function worldPickIndex(world) {
   const version = scene.getVersion();
   const overrides = scene.overrides.getGeneration();
   const order = scene.renderOrderNodes();
-  const hit = CACHE.get(world);
+  const hit = CACHE2.get(world);
   if (hit && hit.version === version && hit.overrides === overrides && hit.bounds === world.bounds && hit.order === order) {
     return hit.index;
   }
-  const index = build(world, order);
-  CACHE.set(world, { version, overrides, bounds: world.bounds, order, index });
+  const index = build2(world, order);
+  CACHE2.set(world, { version, overrides, bounds: world.bounds, order, index });
   return index;
 }
 var ZERO = { x: 0, y: 0, z: 0 };
@@ -544,7 +594,7 @@ function candidatesOf(inputs, sources, probes, delta0, vp, origin, up) {
     gesture: req.gesture,
     probes: offered,
     delta0,
-    exclude: req.ids ?? [],
+    exclude: req.exclude ?? req.ids ?? [],
     ...req.ids ? { ids: req.ids } : {},
     ...req.parent !== void 0 ? { parent: req.parent } : {},
     ...origin ? { origin } : {},
@@ -760,7 +810,13 @@ function footprintPoints(bounds, ends, cast) {
     { x: bounds.x, y: bounds.y + bounds.height },
     { x: bounds.x + bounds.width, y: bounds.y + bounds.height }
   ];
-  return corners.map(cast).filter((h) => h !== null);
+  const hits = [];
+  for (const corner of corners) {
+    const hit = cast(corner);
+    if (!hit) return [];
+    hits.push(hit);
+  }
+  return hits;
 }
 function createInsert(opts) {
   const up = opts.up ?? DEFAULT_UP;
@@ -891,61 +947,6 @@ function aimSpace3d(viewport, viewId, opts = {}) {
 function cameraOfAim3d(aim) {
   return aim.viewport.camera;
 }
-var CACHE2 = /* @__PURE__ */ new WeakMap();
-function nodesOf(world) {
-  return world.scene.renderOrderNodes();
-}
-function boxValid2({ min, max }) {
-  return Number.isFinite(min.x) && Number.isFinite(min.y) && Number.isFinite(min.z) && Number.isFinite(max.x) && Number.isFinite(max.y) && Number.isFinite(max.z) && min.x <= max.x && min.y <= max.y && min.z <= max.z;
-}
-function build2(world) {
-  const nodes = nodesOf(world);
-  const boxes = nodes.map(worldBoxes(world, "document"));
-  const entries = [];
-  const always = [];
-  boxes.forEach((box, i) => {
-    if (box === null) return;
-    const { min, max } = box;
-    if (boxValid2(box)) entries.push([i, [min.x, min.y, min.z, max.x, max.y, max.z]]);
-    else always.push(i);
-  });
-  return { ids: nodes.map((n) => n.id), boxes, tree: createBvh(3, entries), always };
-}
-function current(world) {
-  let cache = CACHE2.get(world);
-  if (cache === void 0) CACHE2.set(world, cache = createSettledCache());
-  return cache.read([world.scene.getVersion(), world.bounds], () => build2(world));
-}
-function padQuery(box) {
-  let m = 0;
-  for (const v of box) if (Number.isFinite(v)) m = Math.max(m, Math.abs(v));
-  const e = 1e-9 * (1 + m);
-  return [box[0] - e, box[1] - e, box[2] - e, box[3] + e, box[4] + e, box[5] + e];
-}
-function snapBoxes(world, exclude, near) {
-  const excluded = withDescendants(world.scene, exclude);
-  const index = near.every((b) => Array.prototype.every.call(b, (v) => !Number.isNaN(v))) ? current(world) : null;
-  if (index === null) {
-    const boxOf = worldBoxes(world, "document");
-    const out2 = [];
-    for (const node of nodesOf(world)) {
-      const box = excluded.has(node.id) ? null : boxOf(node);
-      if (box) out2.push(box);
-    }
-    return out2;
-  }
-  const found = new Set(index.always);
-  for (const box of near) index.tree.queryBox(box, (i) => {
-    found.add(i);
-  });
-  const out = [];
-  for (const i of [...found].sort((a, b) => a - b)) {
-    if (!excluded.has(index.ids[i])) out.push(index.boxes[i]);
-  }
-  return out;
-}
-
-// src/snap/sources.ts
 var AXES = ["x", "y", "z"];
 var BITS = [1, 2, 4];
 var UNIT = { x: { x: 1, y: 0, z: 0 }, y: { x: 0, y: 1, z: 0 }, z: { x: 0, y: 0, z: 1 } };
@@ -1467,15 +1468,32 @@ var DOLLY_RATE = 15e-4;
 function screenDelta(move) {
   return move.drag?.screenDelta ?? move.drag?.delta;
 }
+function cameraStepper(dep, zero, relative, step) {
+  let origin = dep?.get();
+  let from = zero;
+  let reached = zero;
+  let written = origin;
+  let prior = origin;
+  return (at) => {
+    if (!dep || !origin) return;
+    const now = dep.get();
+    if (now !== written && now !== prior) {
+      origin = now;
+      from = reached;
+    }
+    prior = now;
+    written = step(origin, relative(at, from), dep);
+    reached = at;
+    dep.set(written);
+  };
+}
 function dragCamera(ctx, kind, step) {
-  const dep = ctx.deps.camera3d;
-  const origin = dep?.get();
+  const apply = cameraStepper(ctx.deps.camera3d, { x: 0, y: 0 }, (a, b) => ({ x: a.x - b.x, y: a.y - b.y }), step);
   return {
     kind,
     onMove(move) {
       const delta = screenDelta(move);
-      if (!dep || !origin || !delta) return;
-      dep.set(step(origin, delta, dep));
+      if (delta) apply(delta);
     }
   };
 }
@@ -1552,16 +1570,18 @@ var pinchDollyAction = {
     timing: "ongoing",
     start(ctx) {
       const dep = ctx.deps.camera3d;
-      const origin = dep?.get();
       const startSpread = ctx.multiTouch?.spread ?? 0;
       const at = ctx.multiTouch?.centroid;
+      const apply = cameraStepper(dep, 1, (a, b) => a / b, (origin, factor, d) => {
+        const pane = d.size();
+        return dollyToward(origin, factor, paneAnchor(at, d, pane), pane, d.limits?.());
+      });
       return {
         kind: "pinch",
         onMove(move) {
           const spread = move.multiTouch?.pinch?.currentSpread ?? 0;
-          if (!dep || !origin || !(startSpread > 0) || !(spread > 0)) return;
-          const pane = dep.size();
-          dep.set(dollyToward(origin, startSpread / spread, paneAnchor(at, dep, pane), pane, dep.limits?.()));
+          if (!(startSpread > 0) || !(spread > 0)) return;
+          apply(startSpread / spread);
         }
       };
     }