@vincentt-xr/sdk 2.0.0-alpha.0 → 2.0.0-alpha.1

package/dist/tracking.js

@@ -1,11 +1,12 @@
-import { u as pr } from "./useFaceResults-cpsSmKKc.js";
-import { u as g, T as z, a as K } from "./index-BD-JWMjE.js";
-import { b as yr, F as mr } from "./index-BD-JWMjE.js";
-import { jsx as E, Fragment as G } from "react/jsx-runtime";
-import { useThree as N, useFrame as v } from "@react-three/fiber";
-import { useRef as T, useCallback as C, useMemo as k, useEffect as x } from "react";
-import * as R from "three";
-import { X as S, R as w } from "./index-CYMj26Ej.js";
+import { u as yr } from "./useFaceResults-cpsSmKKc.js";
+import { T as z, u as K } from "./index-BGNbrc4C.js";
+import { a as Tr, F as br } from "./index-BGNbrc4C.js";
+import { jsx as g, Fragment as G } from "react/jsx-runtime";
+import { useThree as N, useFrame as k } from "@react-three/fiber";
+import { useRef as T, useCallback as C, useMemo as A, useEffect as x } from "react";
+import * as E from "three";
+import { X as v, R as w } from "./index-safCs_af.js";
+import { u as S } from "./useXRModel-BMJE1hrk.js";
 const L = {
   "body.head": 0,
   "body.leftShoulder": 11,
@@ -20,55 +21,55 @@ const L = {
   "body.rightKnee": 26,
   "body.leftAnkle": 27,
   "body.rightAnkle": 28
-}, er = ({ bodyIndex: r = 0, active: n = !0, children: t }) => {
-  const e = T(null), { ready: o, node: a } = g(
-    S.BODY_TRACKER,
+}, or = ({ bodyIndex: r = 0, active: n = !0, children: t }) => {
+  const e = T(null), { ready: o, node: i } = S(
+    v.BODY_TRACKER,
     void 0,
     n
-  ), { camera: s } = N(), d = T(s);
-  d.current !== s && (d.current = s);
-  const i = T(null);
-  v(() => {
-    if (!o || !a || !e.current) return;
-    const f = a;
-    i.current = f;
-    const c = f.getLandmarks2D(r), u = c == null ? void 0 : c[0];
-    if (!u) {
+  ), { camera: s } = N(), p = T(s);
+  p.current !== s && (p.current = s);
+  const c = T(null);
+  k(() => {
+    if (!o || !i || !e.current) return;
+    const d = i;
+    c.current = d;
+    const u = d.getLandmarks2D(r), y = u == null ? void 0 : u[0];
+    if (!y) {
       e.current.visible = !1;
       return;
     }
-    const p = D(u, d.current);
-    e.current.visible = !0, e.current.position.copy(p);
+    const l = D(y, p.current);
+    e.current.visible = !0, e.current.position.copy(l);
   });
-  const l = C(
-    (f) => {
-      const c = i.current;
-      if (!c) return null;
-      const u = c.getLandmarks2D(r);
+  const a = C(
+    (d) => {
+      const u = c.current;
       if (!u) return null;
-      if (f === "body.neck") {
-        const h = u[11], b = u[12];
-        if (!h || !b) return null;
-        const A = {
-          x: (h.x + b.x) / 2,
-          y: (h.y + b.y) / 2,
-          z: (h.z + b.z) / 2
+      const y = u.getLandmarks2D(r);
+      if (!y) return null;
+      if (d === "body.neck") {
+        const f = y[11], b = y[12];
+        if (!f || !b) return null;
+        const R = {
+          x: (f.x + b.x) / 2,
+          y: (f.y + b.y) / 2,
+          z: (f.z + b.z) / 2
         };
-        return { position: D(A, d.current) };
+        return { position: D(R, p.current) };
       }
-      const p = L[f];
-      if (p === void 0) return null;
-      const m = u[p];
-      return m ? { position: D(m, d.current) } : null;
+      const l = L[d];
+      if (l === void 0) return null;
+      const m = y[l];
+      return m ? { position: D(m, p.current) } : null;
     },
     [r]
-  ), y = k(
-    () => ({ type: "body", resolveLandmark: l }),
-    [l]
+  ), h = A(
+    () => ({ type: "body", resolveLandmark: a }),
+    [a]
   );
-  return /* @__PURE__ */ E(z.Provider, { value: y, children: /* @__PURE__ */ E("group", { ref: e, renderOrder: w.TRACKED, children: t }) });
+  return /* @__PURE__ */ g(z.Provider, { value: h, children: /* @__PURE__ */ g("group", { ref: e, renderOrder: w.TRACKED, children: t }) });
 }, D = (r, n) => {
-  const t = new R.Vector3(r.x, r.y, r.z);
+  const t = new E.Vector3(r.x, r.y, r.z);
   t.unproject(n);
   const e = t.sub(n.position).normalize(), o = -n.position.z / e.z;
   return n.position.clone().add(e.multiplyScalar(o));
@@ -83,42 +84,42 @@ const L = {
   "hand.middleBase": 9,
   "hand.ringBase": 13,
   "hand.pinkyBase": 17
-}, tr = ({ children: r, targetFps: n, active: t = !0 }) => {
-  const e = T(null), o = k(
+}, ir = ({ children: r, targetFps: n, active: t = !0 }) => {
+  const e = T(null), o = A(
     () => n === void 0 ? void 0 : { targetFps: n },
     [n]
-  ), { ready: a, node: s } = g(
-    S.GESTURE_TRACKER,
+  ), { ready: i, node: s } = S(
+    v.GESTURE_TRACKER,
     o,
     t
-  ), { camera: d } = N(), i = T(d);
-  i.current !== d && (i.current = d);
-  const l = T(null);
-  v(() => {
-    var p;
-    if (!a || !s || !e.current) return;
-    l.current = s;
-    const c = (p = s == null ? void 0 : s.coordinates) == null ? void 0 : p[0];
-    if (!c) {
+  ), { camera: p } = N(), c = T(p);
+  c.current !== p && (c.current = p);
+  const a = T(null);
+  k(() => {
+    var l;
+    if (!i || !s || !e.current) return;
+    a.current = s;
+    const u = (l = s == null ? void 0 : s.coordinates) == null ? void 0 : l[0];
+    if (!u) {
       e.current.visible = !1;
       return;
     }
-    const u = _(c, i.current);
-    e.current.visible = !0, e.current.position.copy(u);
+    const y = _(u, c.current);
+    e.current.visible = !0, e.current.position.copy(y);
   });
-  const y = C((c) => {
-    var m, h;
-    const u = W[c];
-    if (u === void 0) return null;
-    const p = (h = (m = l.current) == null ? void 0 : m.coordinates) == null ? void 0 : h[u];
-    return p ? { position: _(p, i.current) } : null;
-  }, []), f = k(
-    () => ({ type: "hand", resolveLandmark: y }),
-    [y]
+  const h = C((u) => {
+    var m, f;
+    const y = W[u];
+    if (y === void 0) return null;
+    const l = (f = (m = a.current) == null ? void 0 : m.coordinates) == null ? void 0 : f[y];
+    return l ? { position: _(l, c.current) } : null;
+  }, []), d = A(
+    () => ({ type: "hand", resolveLandmark: h }),
+    [h]
   );
-  return /* @__PURE__ */ E(z.Provider, { value: f, children: /* @__PURE__ */ E("group", { ref: e, renderOrder: w.TRACKED, children: r }) });
+  return /* @__PURE__ */ g(z.Provider, { value: d, children: /* @__PURE__ */ g("group", { ref: e, renderOrder: w.TRACKED, children: r }) });
 }, _ = (r, n) => {
-  const t = new R.Vector3(r.x, r.y, r.z);
+  const t = new E.Vector3(r.x, r.y, r.z);
   t.unproject(n);
   const e = t.sub(n.position).normalize(), o = -n.position.z / e.z;
   return n.position.clone().add(e.multiplyScalar(o));
@@ -132,7 +133,7 @@ const L = {
   gesture: t,
   now: e,
   mode: o,
-  debounceMs: a,
+  debounceMs: i,
   holdMs: s
 }) => {
   if (r.fired) return null;
@@ -144,7 +145,7 @@ const L = {
       r.holdStart = null;
     return null;
   }
-  return r.armed ? n && t ? (r.fired = !0, t) : null : (n ? r.armStart = null : (r.armStart === null && (r.armStart = e), e - r.armStart >= a && (r.armed = !0)), null);
+  return r.armed ? n && t ? (r.fired = !0, t) : null : (n ? r.armStart = null : (r.armStart === null && (r.armStart = e), e - r.armStart >= i && (r.armed = !0)), null);
 };
 function F({
   gestures: r,
@@ -152,31 +153,31 @@ function F({
   debounceMs: t = P,
   holdMs: e = V,
   onTrigger: o,
-  enabled: a = !0
+  enabled: i = !0
 }) {
-  const { ready: s, node: d } = g(S.GESTURE_TRACKER), i = T(o);
+  const { ready: s, node: p } = S(v.GESTURE_TRACKER), c = T(o);
   x(() => {
-    i.current = o;
+    c.current = o;
   }, [o]);
-  const l = T(/* @__PURE__ */ new Set());
+  const a = T(/* @__PURE__ */ new Set());
   x(() => {
-    l.current = new Set(Array.isArray(r) ? r : [r]);
+    a.current = new Set(Array.isArray(r) ? r : [r]);
   }, [r]);
-  const y = T($());
-  v(() => {
-    if (!a || !s || !d) return;
-    const f = d.gesture, c = !!(f && l.current.has(f)), u = j(y.current, {
-      isTrigger: c,
-      gesture: f,
+  const h = T($());
+  k(() => {
+    if (!i || !s || !p) return;
+    const d = p.gesture, u = !!(d && a.current.has(d)), y = j(h.current, {
+      isTrigger: u,
+      gesture: d,
       now: performance.now(),
       mode: n,
       debounceMs: t,
       holdMs: e
     });
-    u && i.current(u);
+    y && c.current(y);
   });
 }
-const or = (r) => (F(r), null), q = {
+const cr = (r) => (F(r), null), q = {
   "hand.wrist": 0,
   "hand.thumbTip": 4,
   "hand.indexTip": 8,
@@ -187,51 +188,75 @@ const or = (r) => (F(r), null), q = {
   "hand.middleBase": 9,
   "hand.ringBase": 13,
   "hand.pinkyBase": 17
-}, ir = ({ children: r, targetFps: n, active: t = !0 }) => {
-  const e = T(null), o = k(
-    () => n === void 0 ? void 0 : { targetFps: n },
-    [n]
-  ), { ready: a, node: s } = g(
-    S.HAND_TRACKER,
-    o,
-    t
-  ), { camera: d } = N(), i = T(d);
-  i.current !== d && (i.current = d);
-  const l = T(null);
-  v(() => {
-    var m;
-    if (!a || !s || !e.current) return;
-    const c = s;
-    l.current = c;
-    const u = (m = c == null ? void 0 : c.coordinates) == null ? void 0 : m[0];
-    if (!u) {
-      e.current.visible = !1;
+};
+function U(r, n, t = 0) {
+  var o;
+  const e = (o = r == null ? void 0 : r.hands) != null && o.length ? r.hands : r != null && r.coordinates ? [
+    {
+      coordinates: r.coordinates,
+      gesture: r.gesture,
+      handedness: r.handedness
+    }
+  ] : [];
+  if (e.length) {
+    if (n) {
+      const i = e.find((s) => s.handedness === n);
+      if (i) return i;
+    }
+    return e[t] ?? e[0];
+  }
+}
+const sr = ({
+  children: r,
+  hand: n,
+  handIndex: t = 0,
+  targetFps: e,
+  active: o = !0
+}) => {
+  const i = T(null), s = A(
+    () => e === void 0 ? void 0 : { targetFps: e },
+    [e]
+  ), { ready: p, node: c } = S(
+    v.HAND_TRACKER,
+    s,
+    o
+  ), { camera: a } = N(), h = T(a);
+  h.current !== a && (h.current = a);
+  const d = T(null);
+  k(() => {
+    var b;
+    if (!p || !c || !i.current) return;
+    const l = U(c, n, t);
+    d.current = l ?? null;
+    const m = (b = l == null ? void 0 : l.coordinates) == null ? void 0 : b[0];
+    if (!m) {
+      i.current.visible = !1;
       return;
     }
-    const p = B(u, i.current);
-    e.current.visible = !0, e.current.position.copy(p);
+    const f = B(m, h.current);
+    i.current.visible = !0, i.current.position.copy(f);
   });
-  const y = C((c) => {
-    var m, h;
-    const u = q[c];
-    if (u === void 0) return null;
-    const p = (h = (m = l.current) == null ? void 0 : m.coordinates) == null ? void 0 : h[u];
-    return p ? { position: B(p, i.current) } : null;
-  }, []), f = k(
-    () => ({ type: "hand", resolveLandmark: y }),
-    [y]
+  const u = C((l) => {
+    var b, R;
+    const m = q[l];
+    if (m === void 0) return null;
+    const f = (R = (b = d.current) == null ? void 0 : b.coordinates) == null ? void 0 : R[m];
+    return f ? { position: B(f, h.current) } : null;
+  }, []), y = A(
+    () => ({ type: "hand", resolveLandmark: u }),
+    [u]
   );
-  return /* @__PURE__ */ E(z.Provider, { value: f, children: /* @__PURE__ */ E("group", { ref: e, renderOrder: w.TRACKED, children: r }) });
+  return /* @__PURE__ */ g(z.Provider, { value: y, children: /* @__PURE__ */ g("group", { ref: i, renderOrder: w.TRACKED, children: r }) });
 }, B = (r, n) => {
-  const t = new R.Vector3(r.x, r.y, r.z);
+  const t = new E.Vector3(r.x, r.y, r.z);
   t.unproject(n);
   const e = t.sub(n.position).normalize(), o = -n.position.z / e.z;
   return n.position.clone().add(e.multiplyScalar(o));
-}, H = ["portrait"], cr = ({ type: r, active: n = !0, children: t }) => (g(S.BACKGROUND_SEGMENTATION, { type: r }, n), x(() => {
+}, H = ["portrait"], ur = ({ type: r, active: n = !0, children: t }) => (S(v.BACKGROUND_SEGMENTATION, { type: r }, n), x(() => {
   H.includes(r) || console.warn(
     `[Segmentation] unsupported type "${r}"; valid values: ${H.join(", ")}`
   );
-}, [r]), /* @__PURE__ */ E(G, { children: t })), sr = [
+}, [r]), /* @__PURE__ */ g(G, { children: t })), ar = [
   "face.forehead",
   "face.noseTip",
   "face.chin",
@@ -240,7 +265,7 @@ const or = (r) => (F(r), null), q = {
   "face.leftCheek",
   "face.rightCheek",
   "face.mouthCenter"
-], ur = [
+], dr = [
   "hand.wrist",
   "hand.thumbTip",
   "hand.indexTip",
@@ -251,7 +276,7 @@ const or = (r) => (F(r), null), q = {
   "hand.middleBase",
   "hand.ringBase",
   "hand.pinkyBase"
-], ar = [
+], lr = [
   "body.head",
   "body.neck",
   "body.leftShoulder",
@@ -266,79 +291,79 @@ const or = (r) => (F(r), null), q = {
   "body.rightKnee",
   "body.leftAnkle",
   "body.rightAnkle"
-], U = (r) => r.startsWith("face.") ? "face" : r.startsWith("hand.") ? "hand" : r.startsWith("body.") ? "body" : null, M = (r, n, t) => n + t * (r - n), O = (r, n) => 1 / (1 + 1 / (2 * Math.PI * r) / n), X = (r, n, t, e, o, a) => {
+], X = (r) => r.startsWith("face.") ? "face" : r.startsWith("hand.") ? "hand" : r.startsWith("body.") ? "body" : null, M = (r, n, t) => n + t * (r - n), O = (r, n) => 1 / (1 + 1 / (2 * Math.PI * r) / n), Y = (r, n, t, e, o, i) => {
   if (!r.initialized || t <= 0)
     return r.pos.copy(n), r.prevRaw.copy(n), r.dxHat.set(0, 0, 0), r.initialized = !0, r;
-  const s = O(a, t), d = ["x", "y", "z"];
-  for (const i of d) {
-    const l = (n[i] - r.prevRaw[i]) / t, y = M(l, r.dxHat[i], s);
-    r.dxHat[i] = y;
-    const f = e + o * Math.abs(y), c = O(f, t);
-    r.pos[i] = M(n[i], r.pos[i], c), r.prevRaw[i] = n[i];
+  const s = O(i, t), p = ["x", "y", "z"];
+  for (const c of p) {
+    const a = (n[c] - r.prevRaw[c]) / t, h = M(a, r.dxHat[c], s);
+    r.dxHat[c] = h;
+    const d = e + o * Math.abs(h), u = O(d, t);
+    r.pos[c] = M(n[c], r.pos[c], u), r.prevRaw[c] = n[c];
   }
   return r;
-}, dr = ({
+}, fr = ({
   target: r,
   offset: n,
   smoothing: t = 0,
   children: e
 }) => {
-  const o = K(), a = T(null), s = T(!1), d = T(new R.Vector3()), i = T({
-    pos: new R.Vector3(),
-    prevRaw: new R.Vector3(),
-    dxHat: new R.Vector3(),
+  const o = K(), i = T(null), s = T(!1), p = T(new E.Vector3()), c = T({
+    pos: new E.Vector3(),
+    prevRaw: new E.Vector3(),
+    dxHat: new E.Vector3(),
     initialized: !1
-  }), l = U(r), y = o !== null && l !== null && o.type !== l, f = o === null, c = f || y || l === null;
+  }), a = X(r), h = o !== null && a !== null && o.type !== a, d = o === null, u = d || h || a === null;
   return x(() => {
-    f ? console.warn(
+    d ? console.warn(
       `[TrackingAnchor] target "${r}" requires a FaceTracker / HandTracker / BodyTracker ancestor; rendering null.`
-    ) : y ? console.warn(
+    ) : h ? console.warn(
       `[TrackingAnchor] target "${r}" namespace does not match parent tracker type "${o == null ? void 0 : o.type}"; rendering null.`
-    ) : l === null && console.warn(
+    ) : a === null && console.warn(
       `[TrackingAnchor] target "${r}" is not a recognized face/hand/body landmark; rendering null.`
     );
-  }, [r, l, f, y, o == null ? void 0 : o.type]), v((u, p) => {
-    if (c || !a.current || !o) return;
+  }, [r, a, d, h, o == null ? void 0 : o.type]), k((y, l) => {
+    if (u || !i.current || !o) return;
     const m = o.resolveLandmark(r);
     if (!m) {
-      a.current.visible = !1, s.current = !1, i.current.initialized = !1;
+      i.current.visible = !1, s.current = !1, c.current.initialized = !1;
       return;
     }
-    a.current.visible = !0;
-    const h = d.current.copy(m.position), b = a.current.parent;
+    i.current.visible = !0;
+    const f = p.current.copy(m.position), b = i.current.parent;
     if (b) {
       b.updateMatrixWorld();
-      const A = new R.Matrix4().copy(b.matrixWorld).invert();
-      h.applyMatrix4(A);
+      const R = new E.Matrix4().copy(b.matrixWorld).invert();
+      f.applyMatrix4(R);
     }
-    if (n && (h.x += n[0], h.y += n[1], h.z += n[2]), t > 0) {
-      const A = t * 0.1;
-      X(
-        i.current,
-        h,
-        s.current ? p : 0,
-        A,
+    if (n && (f.x += n[0], f.y += n[1], f.z += n[2]), t > 0) {
+      const R = t * 0.1;
+      Y(
+        c.current,
+        f,
+        s.current ? l : 0,
+        R,
         0.5,
         1
-      ), a.current.position.copy(i.current.pos);
+      ), i.current.position.copy(c.current.pos);
     } else
-      a.current.position.copy(h);
-    s.current = !0, m.quaternion && a.current.quaternion.copy(m.quaternion);
-  }), c ? null : /* @__PURE__ */ E("group", { ref: a, renderOrder: w.TRACKED, children: e });
+      i.current.position.copy(f);
+    s.current = !0, m.quaternion && i.current.quaternion.copy(m.quaternion);
+  }), u ? null : /* @__PURE__ */ g("group", { ref: i, renderOrder: w.TRACKED, children: e });
 };
 export {
-  ar as BODY_TARGETS,
-  er as BodyTracker,
-  sr as FACE_TARGETS,
-  yr as FaceMesh,
-  mr as FaceTracker,
-  tr as GestureTracker,
-  or as GestureTrigger,
-  ur as HAND_TARGETS,
-  ir as HandTracker,
+  lr as BODY_TARGETS,
+  or as BodyTracker,
+  ar as FACE_TARGETS,
+  Tr as FaceMesh,
+  br as FaceTracker,
+  ir as GestureTracker,
+  cr as GestureTrigger,
+  dr as HAND_TARGETS,
+  sr as HandTracker,
   H as SEGMENTATION_TYPES,
-  cr as Segmentation,
-  dr as TrackingAnchor,
-  U as getTargetNamespace,
-  pr as useFaceResults
+  ur as Segmentation,
+  fr as TrackingAnchor,
+  X as getTargetNamespace,
+  yr as useFaceResults
 };

package/dist/types/hand-tracking.d.ts

@@ -1,5 +1,13 @@
 import { Coordinate } from './common';
+export type Handedness = "left" | "right";
 export type HandData = {
     coordinates?: Coordinate[];
     gesture?: "closed_fist" | "open_palm";
+    handedness?: Handedness;
+};
+export type HandTrackingData = {
+    hands?: HandData[];
+    coordinates?: Coordinate[];
+    gesture?: HandData["gesture"];
+    handedness?: Handedness;
 };

package/dist/types/nodes.d.ts

@@ -20,8 +20,10 @@ export type XRModelNodeBodyTracking = {
     getLandmarks2D: (bodyIndex?: number) => Coordinate[] | undefined;
 };
 export type XRModelNodeHandTracking = {
+    hands?: HandData[];
     coordinates?: HandData["coordinates"];
     gesture?: HandData["gesture"];
+    handedness?: HandData["handedness"];
 };
 export type XRModelNodeGestureTracking = {
     coordinates?: GestureData["coordinates"];

package/dist/useXRModel-3DcUa28n.cjs

@@ -0,0 +1 @@
+"use strict";const e=require("react"),E=require("./index-DxshgBu0.cjs");function S(t,o,l=!0){const{session:r}=E.useXRContext(),s=e.useId(),[i,f]=e.useState(null),y=e.useMemo(()=>JSON.stringify(o??{}),[o]);e.useEffect(()=>{let u=!1;return f(null),r.registry.acquire(t,s,o).catch(c=>{u||f(c instanceof Error?c:new Error(String(c)))}),()=>{u=!0,r.registry.release(t,s)}},[r,t,s,y]),e.useEffect(()=>{r.registry.setActive(t,s,l)},[r,t,s,l]);const g=r.store,n=e.useSyncExternalStore(u=>g.subscribe(u),()=>g.getSnapshot().pipeline.get(t)??null,()=>null),d=e.useMemo(()=>n?n.getModelNode():null,[n]);return{ready:n!==null&&i===null,node:d,error:i}}exports.useXRModel=S;

package/dist/useXRModel-BMJE1hrk.js

@@ -0,0 +1,28 @@
+import { useId as p, useState as E, useMemo as g, useEffect as y, useSyncExternalStore as d } from "react";
+import { u as x } from "./index-safCs_af.js";
+function h(e, o, l = !0) {
+  const { session: r } = x(), t = p(), [c, i] = E(null), a = g(() => JSON.stringify(o ?? {}), [o]);
+  y(() => {
+    let s = !1;
+    return i(null), r.registry.acquire(e, t, o).catch((u) => {
+      s || i(u instanceof Error ? u : new Error(String(u)));
+    }), () => {
+      s = !0, r.registry.release(e, t);
+    };
+  }, [r, e, t, a]), y(() => {
+    r.registry.setActive(e, t, l);
+  }, [r, e, t, l]);
+  const f = r.store, n = d(
+    (s) => f.subscribe(s),
+    () => f.getSnapshot().pipeline.get(e) ?? null,
+    () => null
+  ), S = g(() => n ? n.getModelNode() : null, [n]);
+  return {
+    ready: n !== null && c === null,
+    node: S,
+    error: c
+  };
+}
+export {
+  h as u
+};