@iwsdk/xr-input 1.0.0-rc.1 → 1.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.d.ts +4 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -0
- package/dist/index.js.map +1 -1
- package/dist/pointer/filtered-eye-gaze.d.ts +48 -0
- package/dist/pointer/filtered-eye-gaze.d.ts.map +1 -0
- package/dist/pointer/filtered-eye-gaze.js +118 -0
- package/dist/pointer/filtered-eye-gaze.js.map +1 -0
- package/dist/pointer/gaze-candidate-provider.d.ts +58 -0
- package/dist/pointer/gaze-candidate-provider.d.ts.map +1 -0
- package/dist/pointer/gaze-conecaster.d.ts +130 -0
- package/dist/pointer/gaze-conecaster.d.ts.map +1 -0
- package/dist/pointer/gaze-conecaster.js +456 -0
- package/dist/pointer/gaze-conecaster.js.map +1 -0
- package/dist/pointer/gaze-pointer.d.ts +266 -0
- package/dist/pointer/gaze-pointer.d.ts.map +1 -0
- package/dist/pointer/gaze-pointer.js +865 -0
- package/dist/pointer/gaze-pointer.js.map +1 -0
- package/dist/pointer/multi-pointer.d.ts +21 -6
- package/dist/pointer/multi-pointer.d.ts.map +1 -1
- package/dist/pointer/multi-pointer.js +52 -12
- package/dist/pointer/multi-pointer.js.map +1 -1
- package/dist/rig/xr-origin.d.ts +26 -0
- package/dist/rig/xr-origin.d.ts.map +1 -1
- package/dist/rig/xr-origin.js +25 -1
- package/dist/rig/xr-origin.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.d.ts.map +1 -1
- package/dist/visual/adapter/hand-visual-adapter.d.ts +9 -0
- package/dist/visual/adapter/hand-visual-adapter.d.ts.map +1 -1
- package/dist/visual/adapter/hand-visual-adapter.js +47 -9
- package/dist/visual/adapter/hand-visual-adapter.js.map +1 -1
- package/dist/xr-input-manager.d.ts +57 -1
- package/dist/xr-input-manager.d.ts.map +1 -1
- package/dist/xr-input-manager.js +285 -15
- package/dist/xr-input-manager.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xr-origin.d.ts","sourceRoot":"","sources":["../../src/rig/xr-origin.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,KAAK,EAAW,MAAM,OAAO,CAAC;AAEvC,qBAAa,QAAS,SAAQ,KAAK;IACjC,+EAA+E;IAC/E,SAAgB,IAAI,EAAE,KAAK,CAAC;IAE5B;;;OAGG;IACH,SAAgB,SAAS;;;MAGvB;IAEF;;;;;OAKG;IACH,SAAgB,UAAU;;;MAGxB;IAEF,iEAAiE;IACjE,SAAgB,kBAAkB;;;MAGhC;IAEF,2DAA2D;IAC3D,SAAgB,mBAAmB;;;MAGjC;IAEF;;;;;OAKG;IACH,SAAgB,cAAc;;;MAG5B;IAEF,OAAO,CAAC,aAAa,CAAiB;;
|
|
1
|
+
{"version":3,"file":"xr-origin.d.ts","sourceRoot":"","sources":["../../src/rig/xr-origin.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,KAAK,EAAW,MAAM,OAAO,CAAC;AAEvC;;;;;;GAMG;AACH,MAAM,MAAM,UAAU,GAAG,SAAS,GAAG,MAAM,CAAC;AAE5C,qBAAa,QAAS,SAAQ,KAAK;IACjC,+EAA+E;IAC/E,SAAgB,IAAI,EAAE,KAAK,CAAC;IAE5B;;;OAGG;IACH,SAAgB,SAAS;;;MAGvB;IAEF,gFAAgF;IAChF,SAAgB,QAAQ,EAAE,KAAK,CAAC;IAEhC,kFAAkF;IAC3E,UAAU,EAAE,UAAU,CAAU;IAEvC;;;;;OAKG;IACH,SAAgB,UAAU;;;MAGxB;IAEF,iEAAiE;IACjE,SAAgB,kBAAkB;;;MAGhC;IAEF,2DAA2D;IAC3D,SAAgB,mBAAmB;;;MAGjC;IAEF;;;;;OAKG;IACH,SAAgB,cAAc;;;MAG5B;IAEF,OAAO,CAAC,aAAa,CAAiB;IACtC,OAAO,CAAC,SAAS,CAAiB;;IAqBlC,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,gBAAgB,GAAG,IAAI;IAYlE;;;;;;OAMG;IACH,mBAAmB,CAAC,SAAS,EAAE,gBAAgB,GAAG,IAAI;IAUtD;;;OAGG;IACH,SAAS,IAAI,IAAI;CAGlB"}
|
package/dist/rig/xr-origin.js
CHANGED
|
@@ -17,6 +17,8 @@ class XROrigin extends Group {
|
|
|
17
17
|
left: new Group(),
|
|
18
18
|
right: new Group(),
|
|
19
19
|
};
|
|
20
|
+
/** Reports whether {@link XROrigin.eyeSpace} has a valid gaze pose this frame. */
|
|
21
|
+
this.gazeOrigin = 'none';
|
|
20
22
|
/**
|
|
21
23
|
* Primary controller grip poses copied from XRInputSource.gripSpace.
|
|
22
24
|
* Attach held objects as children and tune their local transform for the
|
|
@@ -48,9 +50,12 @@ class XROrigin extends Group {
|
|
|
48
50
|
right: new Group(),
|
|
49
51
|
};
|
|
50
52
|
this.headsetMatrix = new Matrix4();
|
|
53
|
+
this.eyeMatrix = new Matrix4();
|
|
51
54
|
this.head = new Group();
|
|
52
55
|
this.head.name = 'xr-origin-head';
|
|
53
|
-
this.
|
|
56
|
+
this.eyeSpace = new Group();
|
|
57
|
+
this.eyeSpace.name = 'xr-origin-eye';
|
|
58
|
+
this.add(this.head, this.eyeSpace, this.raySpaces.left, this.raySpaces.right, this.gripSpaces.left, this.gripSpaces.right, this.indexTipSpaces.left, this.indexTipSpaces.right);
|
|
54
59
|
}
|
|
55
60
|
updateHead(frame, referenceSpace) {
|
|
56
61
|
const pose = frame.getViewerPose(referenceSpace);
|
|
@@ -59,6 +64,25 @@ class XROrigin extends Group {
|
|
|
59
64
|
this.headsetMatrix.decompose(this.head.position, this.head.quaternion, this.head.scale);
|
|
60
65
|
}
|
|
61
66
|
}
|
|
67
|
+
/**
|
|
68
|
+
* Overwrite {@link XROrigin.eyeSpace} with a real eye-tracking pose and flip
|
|
69
|
+
* {@link XROrigin.gazeOrigin} to `'tracked'`.
|
|
70
|
+
*
|
|
71
|
+
* @param transform Gaze target-ray transform, posed against the same
|
|
72
|
+
* reference space {@link XROrigin.updateHead} uses — i.e. this group's space.
|
|
73
|
+
*/
|
|
74
|
+
applyTrackedEyePose(transform) {
|
|
75
|
+
this.eyeMatrix.fromArray(transform.matrix);
|
|
76
|
+
this.eyeMatrix.decompose(this.eyeSpace.position, this.eyeSpace.quaternion, this.eyeSpace.scale);
|
|
77
|
+
this.gazeOrigin = 'tracked';
|
|
78
|
+
}
|
|
79
|
+
/**
|
|
80
|
+
* Reset gaze to a known-unavailable state. Called when the session ends so
|
|
81
|
+
* {@link XROrigin.gazeOrigin} doesn't report a stale tracked pose.
|
|
82
|
+
*/
|
|
83
|
+
clearGaze() {
|
|
84
|
+
this.gazeOrigin = 'none';
|
|
85
|
+
}
|
|
62
86
|
}
|
|
63
87
|
|
|
64
88
|
export { XROrigin };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xr-origin.js","sources":["../../src/rig/xr-origin.ts"],"sourcesContent":["/**\n * Copyright (c) Meta Platforms, Inc. and affiliates.\n *\n * This source code is licensed under the MIT license found in the\n * LICENSE file in the root directory of this source tree.\n */\n\nimport { Group, Matrix4 } from 'three';\n\nexport class XROrigin extends Group {\n /** Viewer pose relative to this origin, updated from XRFrame.getViewerPose. */\n public readonly head: Group;\n\n /**\n * Primary target-ray poses copied from XRInputSource.targetRaySpace.\n * Local -Z is the pointing direction used by WebXR ray interactions.\n */\n public readonly raySpaces = {\n left: new Group(),\n right: new Group(),\n };\n\n /**\n * Primary controller grip poses copied from XRInputSource.gripSpace.\n * Attach held objects as children and tune their local transform for the\n * model; grip orientation is device/profile-defined and can differ from the\n * target ray. Sources without a gripSpace fall back to the ray pose.\n */\n public readonly gripSpaces = {\n left: new Group(),\n right: new Group(),\n };\n\n /** Target-ray poses for additional same-handed input sources. */\n public readonly secondaryRaySpaces = {\n left: new Group(),\n right: new Group(),\n };\n\n /** Grip poses for additional same-handed input sources. */\n public readonly secondaryGripSpaces = {\n left: new Group(),\n right: new Group(),\n };\n\n /**\n * Spaces representing the index finger tip positions for each hand.\n * Used by TouchPointer for poke interactions.\n * Updated from hand tracking joint data when hands are active.\n * Falls back to raySpaces when controllers are used.\n */\n public readonly indexTipSpaces = {\n left: new Group(),\n right: new Group(),\n };\n\n private headsetMatrix = new Matrix4();\n\n constructor() {\n super();\n\n this.head = new Group();\n this.head.name = 'xr-origin-head';\n this.add(\n this.head,\n this.raySpaces.left,\n this.raySpaces.right,\n this.gripSpaces.left,\n this.gripSpaces.right,\n this.indexTipSpaces.left,\n this.indexTipSpaces.right,\n );\n }\n\n updateHead(frame: XRFrame, referenceSpace: XRReferenceSpace): void {\n const pose = frame.getViewerPose(referenceSpace);\n if (pose) {\n this.headsetMatrix.fromArray(pose.transform.matrix);\n this.headsetMatrix.decompose(\n this.head.position,\n this.head.quaternion,\n this.head.scale,\n );\n }\n }\n}\n"],"names":[],"mappings":";;AAAA;;;;;AAKG;
|
|
1
|
+
{"version":3,"file":"xr-origin.js","sources":["../../src/rig/xr-origin.ts"],"sourcesContent":["/**\n * Copyright (c) Meta Platforms, Inc. and affiliates.\n *\n * This source code is licensed under the MIT license found in the\n * LICENSE file in the root directory of this source tree.\n */\n\nimport { Group, Matrix4 } from 'three';\n\n/**\n * Source of the gaze pose stored in {@link XROrigin.eyeSpace}.\n *\n * - `tracked`: a pose sourced from the `XRInputSource` whose\n * `targetRayMode` is `'gaze'`.\n * - `none`: no source, or no valid pose sampled this frame.\n */\nexport type GazeOrigin = 'tracked' | 'none';\n\nexport class XROrigin extends Group {\n /** Viewer pose relative to this origin, updated from XRFrame.getViewerPose. */\n public readonly head: Group;\n\n /**\n * Primary target-ray poses copied from XRInputSource.targetRaySpace.\n * Local -Z is the pointing direction used by WebXR ray interactions.\n */\n public readonly raySpaces = {\n left: new Group(),\n right: new Group(),\n };\n\n /** Latest valid gaze target-ray pose. Consult {@link gazeOrigin} before use. */\n public readonly eyeSpace: Group;\n\n /** Reports whether {@link XROrigin.eyeSpace} has a valid gaze pose this frame. */\n public gazeOrigin: GazeOrigin = 'none';\n\n /**\n * Primary controller grip poses copied from XRInputSource.gripSpace.\n * Attach held objects as children and tune their local transform for the\n * model; grip orientation is device/profile-defined and can differ from the\n * target ray. Sources without a gripSpace fall back to the ray pose.\n */\n public readonly gripSpaces = {\n left: new Group(),\n right: new Group(),\n };\n\n /** Target-ray poses for additional same-handed input sources. */\n public readonly secondaryRaySpaces = {\n left: new Group(),\n right: new Group(),\n };\n\n /** Grip poses for additional same-handed input sources. */\n public readonly secondaryGripSpaces = {\n left: new Group(),\n right: new Group(),\n };\n\n /**\n * Spaces representing the index finger tip positions for each hand.\n * Used by TouchPointer for poke interactions.\n * Updated from hand tracking joint data when hands are active.\n * Falls back to raySpaces when controllers are used.\n */\n public readonly indexTipSpaces = {\n left: new Group(),\n right: new Group(),\n };\n\n private headsetMatrix = new Matrix4();\n private eyeMatrix = new Matrix4();\n\n constructor() {\n super();\n\n this.head = new Group();\n this.head.name = 'xr-origin-head';\n this.eyeSpace = new Group();\n this.eyeSpace.name = 'xr-origin-eye';\n this.add(\n this.head,\n this.eyeSpace,\n this.raySpaces.left,\n this.raySpaces.right,\n this.gripSpaces.left,\n this.gripSpaces.right,\n this.indexTipSpaces.left,\n this.indexTipSpaces.right,\n );\n }\n\n updateHead(frame: XRFrame, referenceSpace: XRReferenceSpace): void {\n const pose = frame.getViewerPose(referenceSpace);\n if (pose) {\n this.headsetMatrix.fromArray(pose.transform.matrix);\n this.headsetMatrix.decompose(\n this.head.position,\n this.head.quaternion,\n this.head.scale,\n );\n }\n }\n\n /**\n * Overwrite {@link XROrigin.eyeSpace} with a real eye-tracking pose and flip\n * {@link XROrigin.gazeOrigin} to `'tracked'`.\n *\n * @param transform Gaze target-ray transform, posed against the same\n * reference space {@link XROrigin.updateHead} uses — i.e. this group's space.\n */\n applyTrackedEyePose(transform: XRRigidTransform): void {\n this.eyeMatrix.fromArray(transform.matrix);\n this.eyeMatrix.decompose(\n this.eyeSpace.position,\n this.eyeSpace.quaternion,\n this.eyeSpace.scale,\n );\n this.gazeOrigin = 'tracked';\n }\n\n /**\n * Reset gaze to a known-unavailable state. Called when the session ends so\n * {@link XROrigin.gazeOrigin} doesn't report a stale tracked pose.\n */\n clearGaze(): void {\n this.gazeOrigin = 'none';\n }\n}\n"],"names":[],"mappings":";;AAAA;;;;;AAKG;AAaG,MAAO,QAAS,SAAQ,KAAK,CAAA;AAwDjC,IAAA,WAAA,GAAA;AACE,QAAA,KAAK,EAAE;AArDT;;;AAGG;AACa,QAAA,IAAA,CAAA,SAAS,GAAG;YAC1B,IAAI,EAAE,IAAI,KAAK,EAAE;YACjB,KAAK,EAAE,IAAI,KAAK,EAAE;SACnB;;QAMM,IAAA,CAAA,UAAU,GAAe,MAAM;AAEtC;;;;;AAKG;AACa,QAAA,IAAA,CAAA,UAAU,GAAG;YAC3B,IAAI,EAAE,IAAI,KAAK,EAAE;YACjB,KAAK,EAAE,IAAI,KAAK,EAAE;SACnB;;AAGe,QAAA,IAAA,CAAA,kBAAkB,GAAG;YACnC,IAAI,EAAE,IAAI,KAAK,EAAE;YACjB,KAAK,EAAE,IAAI,KAAK,EAAE;SACnB;;AAGe,QAAA,IAAA,CAAA,mBAAmB,GAAG;YACpC,IAAI,EAAE,IAAI,KAAK,EAAE;YACjB,KAAK,EAAE,IAAI,KAAK,EAAE;SACnB;AAED;;;;;AAKG;AACa,QAAA,IAAA,CAAA,cAAc,GAAG;YAC/B,IAAI,EAAE,IAAI,KAAK,EAAE;YACjB,KAAK,EAAE,IAAI,KAAK,EAAE;SACnB;AAEO,QAAA,IAAA,CAAA,aAAa,GAAG,IAAI,OAAO,EAAE;AAC7B,QAAA,IAAA,CAAA,SAAS,GAAG,IAAI,OAAO,EAAE;AAK/B,QAAA,IAAI,CAAC,IAAI,GAAG,IAAI,KAAK,EAAE;AACvB,QAAA,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,gBAAgB;AACjC,QAAA,IAAI,CAAC,QAAQ,GAAG,IAAI,KAAK,EAAE;AAC3B,QAAA,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,eAAe;QACpC,IAAI,CAAC,GAAG,CACN,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,SAAS,CAAC,IAAI,EACnB,IAAI,CAAC,SAAS,CAAC,KAAK,EACpB,IAAI,CAAC,UAAU,CAAC,IAAI,EACpB,IAAI,CAAC,UAAU,CAAC,KAAK,EACrB,IAAI,CAAC,cAAc,CAAC,IAAI,EACxB,IAAI,CAAC,cAAc,CAAC,KAAK,CAC1B;IACH;IAEA,UAAU,CAAC,KAAc,EAAE,cAAgC,EAAA;QACzD,MAAM,IAAI,GAAG,KAAK,CAAC,aAAa,CAAC,cAAc,CAAC;QAChD,IAAI,IAAI,EAAE;YACR,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;YACnD,IAAI,CAAC,aAAa,CAAC,SAAS,CAC1B,IAAI,CAAC,IAAI,CAAC,QAAQ,EAClB,IAAI,CAAC,IAAI,CAAC,UAAU,EACpB,IAAI,CAAC,IAAI,CAAC,KAAK,CAChB;QACH;IACF;AAEA;;;;;;AAMG;AACH,IAAA,mBAAmB,CAAC,SAA2B,EAAA;QAC7C,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC;QAC1C,IAAI,CAAC,SAAS,CAAC,SAAS,CACtB,IAAI,CAAC,QAAQ,CAAC,QAAQ,EACtB,IAAI,CAAC,QAAQ,CAAC,UAAU,EACxB,IAAI,CAAC,QAAQ,CAAC,KAAK,CACpB;AACD,QAAA,IAAI,CAAC,UAAU,GAAG,SAAS;IAC7B;AAEA;;;AAGG;IACH,SAAS,GAAA;AACP,QAAA,IAAI,CAAC,UAAU,GAAG,MAAM;IAC1B;AACD;;;;"}
|
package/dist/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const VERSION = "1.0.0
|
|
1
|
+
export declare const VERSION = "1.0.0";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/dist/version.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,
|
|
1
|
+
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,UAAU,CAAC"}
|
|
@@ -17,6 +17,8 @@ export declare class XRHandVisualAdapter extends XRInputVisualAdapter {
|
|
|
17
17
|
private pinchThreshold;
|
|
18
18
|
private pinchCooldown;
|
|
19
19
|
private pinchData;
|
|
20
|
+
/** Continuous 0..1 pinch strength derived from thumb-tip↔index-tip distance. */
|
|
21
|
+
private pinchStrength;
|
|
20
22
|
private vec3;
|
|
21
23
|
private visualOffsetStart;
|
|
22
24
|
private visualOffsetEnd;
|
|
@@ -28,6 +30,13 @@ export declare class XRHandVisualAdapter extends XRInputVisualAdapter {
|
|
|
28
30
|
disconnect(): void;
|
|
29
31
|
update(frame: XRFrame, delta: number): void;
|
|
30
32
|
private updatePinch;
|
|
33
|
+
/**
|
|
34
|
+
* Continuous 0..1 pinch progress, where `0` is an open hand at
|
|
35
|
+
* {@link PINCH_OPEN_DISTANCE} and `1` is a closed pinch at the commit
|
|
36
|
+
* threshold. Use this to drive pre-commit affordances; use the gamepad's
|
|
37
|
+
* select state for the discrete pinch itself.
|
|
38
|
+
*/
|
|
39
|
+
getPinchStrength(): number;
|
|
31
40
|
toggleVisual(enabled: boolean): void;
|
|
32
41
|
capturePose(refSpace: XRSpace): Promise<HandPose>;
|
|
33
42
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hand-visual-adapter.d.ts","sourceRoot":"","sources":["../../../src/visual/adapter/hand-visual-adapter.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,KAAK,EAAW,iBAAiB,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EACL,QAAQ,EAER,iBAAiB,EACjB,oBAAoB,EACpB,oBAAoB,EACrB,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"hand-visual-adapter.d.ts","sourceRoot":"","sources":["../../../src/visual/adapter/hand-visual-adapter.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,KAAK,EAAW,iBAAiB,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EACL,QAAQ,EAER,iBAAiB,EACjB,oBAAoB,EACpB,oBAAoB,EACrB,MAAM,0BAA0B,CAAC;AASlC,eAAO,MAAM,iBAAiB,EAAE,WAuD/B,CAAC;AAEF,qBAAa,mBAAoB,SAAQ,oBAAoB;IACpD,WAAW,EAAE,YAAY,EAAE,CAAM;IACjC,eAAe,CAAC,EAAE,YAAY,CAAC;IACtC,OAAO,CAAC,QAAQ,CAAC,CAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,CAAU;IAC3B,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,SAAS,CAAgC;IACjD,gFAAgF;IAChF,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,IAAI,CAAiB;IAC7B,OAAO,CAAC,iBAAiB,CAAiB;IAC1C,OAAO,CAAC,eAAe,CAAiB;IACxC,OAAO,CAAC,IAAI,CAAiB;IAC7B,OAAO,CAAC,cAAc,CAAC,CAIrB;IACF,OAAO,CAAC,WAAW,CAAsB;gBAGvC,WAAW,EAAE,KAAK,EAClB,UAAU,EAAE,YAAY,EACxB,cAAc,EAAE,OAAO,EACvB,WAAW,EAAE,iBAAiB,CAAC,oBAAoB,CAAC,EACpD,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,iBAAiB,EACzB,WAAW,EAAE,aAAa;IAa5B,OAAO,CAAC,WAAW,EAAE,aAAa;IAsBlC,UAAU,IAAI,IAAI;IAiBlB,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM;IAuCpC,OAAO,CAAC,WAAW;IAoCnB;;;;;OAKG;IACH,gBAAgB,IAAI,MAAM;IAI1B,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAmBpC,WAAW,CAAC,QAAQ,EAAE,OAAO;IAU7B;;;OAGG;IACH,gBAAgB,IAAI,OAAO,GAAG,SAAS;IAIvC;;;;OAIG;IACH,sBAAsB,CAAC,WAAW,EAAE,OAAO,GAAG,IAAI;CAmBnD"}
|
|
@@ -8,6 +8,11 @@ import { XRInputVisualAdapter } from './base-visual-adapter.js';
|
|
|
8
8
|
* LICENSE file in the root directory of this source tree.
|
|
9
9
|
*/
|
|
10
10
|
const PINCH_COOLDOWN = 0.2;
|
|
11
|
+
/**
|
|
12
|
+
* Distance (meters) at which pinch strength is considered fully released.
|
|
13
|
+
* Roughly the resting span between an open thumb and index finger tip.
|
|
14
|
+
*/
|
|
15
|
+
const PINCH_OPEN_DISTANCE = 0.05;
|
|
11
16
|
const defaultHandLayout = {
|
|
12
17
|
selectComponentId: 'pinch',
|
|
13
18
|
components: {
|
|
@@ -71,6 +76,8 @@ class XRHandVisualAdapter extends XRInputVisualAdapter {
|
|
|
71
76
|
this.pinchThreshold = 0.008;
|
|
72
77
|
this.pinchCooldown = 0;
|
|
73
78
|
this.pinchData = { prev: false, curr: false };
|
|
79
|
+
/** Continuous 0..1 pinch strength derived from thumb-tip↔index-tip distance. */
|
|
80
|
+
this.pinchStrength = 0;
|
|
74
81
|
this.vec3 = new Vector3();
|
|
75
82
|
this.visualOffsetStart = new Vector3();
|
|
76
83
|
this.visualOffsetEnd = new Vector3();
|
|
@@ -97,6 +104,14 @@ class XRHandVisualAdapter extends XRInputVisualAdapter {
|
|
|
97
104
|
this.connectVisual();
|
|
98
105
|
}
|
|
99
106
|
disconnect() {
|
|
107
|
+
var _a;
|
|
108
|
+
(_a = this.pendingCapture) === null || _a === void 0 ? void 0 : _a.reject();
|
|
109
|
+
this.pendingCapture = undefined;
|
|
110
|
+
this.pinchStrength = 0;
|
|
111
|
+
this.pinchCooldown = 0;
|
|
112
|
+
this.pinchData.prev = false;
|
|
113
|
+
this.pinchData.curr = false;
|
|
114
|
+
this.gripXRSpace = undefined;
|
|
100
115
|
super.disconnect();
|
|
101
116
|
this.jointTransforms = undefined;
|
|
102
117
|
this.jointSpaces.length = 0;
|
|
@@ -138,22 +153,45 @@ class XRHandVisualAdapter extends XRInputVisualAdapter {
|
|
|
138
153
|
}
|
|
139
154
|
updatePinch(frame, delta) {
|
|
140
155
|
this.pinchData.prev = this.pinchData.curr;
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
156
|
+
let pinching = false;
|
|
157
|
+
this.pinchStrength = 0;
|
|
158
|
+
// Always compute pinch strength when joints are available; this is
|
|
159
|
+
// independent of the boolean cooldown so callers can drive continuous
|
|
160
|
+
// affordances (e.g. pinch-progress UI).
|
|
146
161
|
if (this.indexTip && this.thumbTip) {
|
|
147
162
|
const pose = frame.getPose(this.indexTip, this.thumbTip);
|
|
148
163
|
if (pose) {
|
|
149
164
|
this.vec3.copy(pose.transform.position);
|
|
150
|
-
const
|
|
151
|
-
|
|
152
|
-
|
|
165
|
+
const distance = this.vec3.length();
|
|
166
|
+
const span = PINCH_OPEN_DISTANCE - this.pinchThreshold;
|
|
167
|
+
if (span <= 0) {
|
|
168
|
+
this.pinchStrength = distance < this.pinchThreshold ? 1 : 0;
|
|
169
|
+
}
|
|
170
|
+
else {
|
|
171
|
+
const t = (PINCH_OPEN_DISTANCE - distance) / span;
|
|
172
|
+
this.pinchStrength = Math.max(0, Math.min(1, t));
|
|
153
173
|
}
|
|
154
|
-
|
|
174
|
+
pinching = distance < this.pinchThreshold;
|
|
155
175
|
}
|
|
156
176
|
}
|
|
177
|
+
if (this.pinchCooldown > 0) {
|
|
178
|
+
this.pinchData.curr = true;
|
|
179
|
+
this.pinchCooldown -= delta;
|
|
180
|
+
return;
|
|
181
|
+
}
|
|
182
|
+
if (pinching) {
|
|
183
|
+
this.pinchCooldown = PINCH_COOLDOWN;
|
|
184
|
+
}
|
|
185
|
+
this.pinchData.curr = pinching;
|
|
186
|
+
}
|
|
187
|
+
/**
|
|
188
|
+
* Continuous 0..1 pinch progress, where `0` is an open hand at
|
|
189
|
+
* {@link PINCH_OPEN_DISTANCE} and `1` is a closed pinch at the commit
|
|
190
|
+
* threshold. Use this to drive pre-commit affordances; use the gamepad's
|
|
191
|
+
* select state for the discrete pinch itself.
|
|
192
|
+
*/
|
|
193
|
+
getPinchStrength() {
|
|
194
|
+
return this.pinchStrength;
|
|
157
195
|
}
|
|
158
196
|
toggleVisual(enabled) {
|
|
159
197
|
this.visualsEnabled = enabled;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hand-visual-adapter.js","sources":["../../../src/visual/adapter/hand-visual-adapter.ts"],"sourcesContent":["/**\n * Copyright (c) Meta Platforms, Inc. and affiliates.\n *\n * This source code is licensed under the MIT license found in the\n * LICENSE file in the root directory of this source tree.\n */\n\nimport { Group, Matrix4, PerspectiveCamera, Scene, Vector3 } from 'three';\nimport { InputLayout } from '../../gamepad/input-profiles.js';\nimport { XRAssetLoader } from '../../xr-input-manager.js';\nimport {\n HandPose,\n InputConfig,\n VisualConstructor,\n VisualImplementation,\n XRInputVisualAdapter,\n} from './base-visual-adapter.js';\n\nconst PINCH_COOLDOWN = 0.2;\n\nexport const defaultHandLayout: InputLayout = {\n selectComponentId: 'pinch',\n components: {\n pinch: {\n type: 'button',\n gamepadIndices: {\n button: 0,\n },\n rootNodeName: '',\n visualResponses: {},\n },\n swipeleft: {\n type: 'button',\n gamepadIndices: {\n button: 5,\n },\n rootNodeName: '',\n visualResponses: {},\n },\n swiperight: {\n type: 'button',\n gamepadIndices: {\n button: 6,\n },\n rootNodeName: '',\n visualResponses: {},\n },\n swipeup: {\n type: 'button',\n gamepadIndices: {\n button: 7,\n },\n rootNodeName: '',\n visualResponses: {},\n },\n swipedown: {\n type: 'button',\n gamepadIndices: {\n button: 8,\n },\n rootNodeName: '',\n visualResponses: {},\n },\n confirm: {\n type: 'button',\n gamepadIndices: {\n button: 9,\n },\n rootNodeName: '',\n visualResponses: {},\n },\n },\n rootNodeName: '',\n gamepadMapping: 'xr-standard',\n assetPath: '',\n};\n\nexport class XRHandVisualAdapter extends XRInputVisualAdapter {\n public jointSpaces: XRJointSpace[] = [];\n public jointTransforms?: Float32Array;\n private indexTip?: XRSpace;\n private thumbTip?: XRSpace;\n private pinchThreshold = 0.008;\n private pinchCooldown = 0;\n private pinchData = { prev: false, curr: false };\n private vec3 = new Vector3();\n private visualOffsetStart = new Vector3();\n private visualOffsetEnd = new Vector3();\n private mat4 = new Matrix4();\n private pendingCapture?: {\n refSpace: XRSpace;\n resolve: (value: HandPose) => void;\n reject: () => void;\n };\n private gripXRSpace: XRSpace | undefined;\n\n constructor(\n playerSpace: Group,\n handedness: XRHandedness,\n visualsEnabled: boolean,\n visualClass: VisualConstructor<VisualImplementation>,\n scene: Scene,\n camera: PerspectiveCamera,\n assetLoader: XRAssetLoader,\n ) {\n super(\n playerSpace,\n handedness,\n visualsEnabled,\n visualClass,\n scene,\n camera,\n assetLoader,\n );\n }\n\n connect(inputSource: XRInputSource) {\n super.connect(inputSource);\n const hand = inputSource.hand!;\n this.gripXRSpace = inputSource.gripSpace || inputSource.targetRaySpace;\n\n hand.forEach((jointSpace) => {\n if (jointSpace.jointName === 'index-finger-tip') {\n this.indexTip = jointSpace;\n } else if (jointSpace.jointName === 'thumb-tip') {\n this.thumbTip = jointSpace;\n }\n this.jointSpaces.push(jointSpace);\n });\n\n this.jointTransforms = new Float32Array(hand.size * 16);\n this.inputConfig = {\n inputSource,\n layout: defaultHandLayout,\n } as InputConfig;\n this.connectVisual();\n }\n\n disconnect(): void {\n super.disconnect();\n this.jointTransforms = undefined;\n this.jointSpaces.length = 0;\n this.indexTip = undefined;\n this.thumbTip = undefined;\n this.disconnectVisual();\n }\n\n update(frame: XRFrame, delta: number) {\n if (this._inputSource && this.jointTransforms) {\n const success =\n frame.fillPoses?.(\n this.jointSpaces,\n this.gripXRSpace!,\n this.jointTransforms,\n ) ?? false;\n if (success) {\n this.updatePinch(frame, delta);\n if (this.visual && this.gripSpace) {\n this.visual.model.position.copy(this.gripSpace.position);\n this.visual.model.quaternion.copy(this.gripSpace.quaternion);\n this.visual.update(delta);\n }\n\n if (this.pendingCapture) {\n const { refSpace, resolve, reject } = this.pendingCapture;\n const jointTransforms = new Float32Array(this.jointTransforms.length);\n const success =\n frame.fillPoses?.(this.jointSpaces, refSpace, jointTransforms) ??\n false;\n if (success) {\n const pose: HandPose = {};\n this.jointSpaces.forEach((jointSpace, index) => {\n pose[jointSpace.jointName] = this.mat4\n .fromArray(jointTransforms, index * 16)\n .toArray();\n });\n resolve(pose);\n } else {\n reject();\n }\n this.pendingCapture = undefined;\n }\n }\n }\n }\n\n private updatePinch(frame: XRFrame, delta: number) {\n this.pinchData.prev = this.pinchData.curr;\n\n if (this.pinchCooldown > 0) {\n this.pinchData.curr = true;\n this.pinchCooldown -= delta;\n return;\n }\n\n if (this.indexTip && this.thumbTip) {\n const pose = frame.getPose(this.indexTip, this.thumbTip);\n if (pose) {\n this.vec3.copy(pose.transform.position);\n const pinching = this.vec3.length() < this.pinchThreshold;\n if (pinching) {\n this.pinchCooldown = PINCH_COOLDOWN;\n }\n this.pinchData.curr = pinching;\n }\n }\n }\n\n toggleVisual(enabled: boolean): void {\n this.visualsEnabled = enabled;\n if (this.visual) {\n this.visual.toggle(enabled);\n }\n }\n\n // getSelectStart() {\n // \treturn this.pinchData.curr && !this.pinchData.prev;\n // }\n\n // getSelectEnd() {\n // \treturn !this.pinchData.curr && this.pinchData.prev;\n // }\n\n // getSelecting() {\n // \treturn this.pinchData.curr;\n // }\n\n capturePose(refSpace: XRSpace) {\n return new Promise<HandPose>((resolve, reject) => {\n this.pendingCapture = {\n refSpace,\n resolve,\n reject,\n };\n });\n }\n\n /**\n * Returns the XRSpace for the index finger tip, if available.\n * Used for poke/touch interactions.\n */\n getIndexTipSpace(): XRSpace | undefined {\n return this.indexTip;\n }\n\n /**\n * Moves only the rendered hand model by a world-space offset. Tracking state\n * and pointer poses stay unchanged; the next update resets the model to the\n * raw grip pose before applying a fresh visual offset.\n */\n applyVisualOffsetWorld(offsetWorld: Vector3): void {\n if (!this.visual) {\n return;\n }\n\n const parent = this.visual.model.parent;\n if (!parent) {\n this.visual.model.position.add(offsetWorld);\n return;\n }\n\n parent.getWorldPosition(this.visualOffsetStart);\n this.visualOffsetEnd.copy(this.visualOffsetStart).add(offsetWorld);\n parent.worldToLocal(this.visualOffsetStart);\n parent.worldToLocal(this.visualOffsetEnd);\n this.visual.model.position.add(\n this.visualOffsetEnd.sub(this.visualOffsetStart),\n );\n }\n}\n"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"hand-visual-adapter.js","sources":["../../../src/visual/adapter/hand-visual-adapter.ts"],"sourcesContent":["/**\n * Copyright (c) Meta Platforms, Inc. and affiliates.\n *\n * This source code is licensed under the MIT license found in the\n * LICENSE file in the root directory of this source tree.\n */\n\nimport { Group, Matrix4, PerspectiveCamera, Scene, Vector3 } from 'three';\nimport { InputLayout } from '../../gamepad/input-profiles.js';\nimport { XRAssetLoader } from '../../xr-input-manager.js';\nimport {\n HandPose,\n InputConfig,\n VisualConstructor,\n VisualImplementation,\n XRInputVisualAdapter,\n} from './base-visual-adapter.js';\n\nconst PINCH_COOLDOWN = 0.2;\n/**\n * Distance (meters) at which pinch strength is considered fully released.\n * Roughly the resting span between an open thumb and index finger tip.\n */\nconst PINCH_OPEN_DISTANCE = 0.05;\n\nexport const defaultHandLayout: InputLayout = {\n selectComponentId: 'pinch',\n components: {\n pinch: {\n type: 'button',\n gamepadIndices: {\n button: 0,\n },\n rootNodeName: '',\n visualResponses: {},\n },\n swipeleft: {\n type: 'button',\n gamepadIndices: {\n button: 5,\n },\n rootNodeName: '',\n visualResponses: {},\n },\n swiperight: {\n type: 'button',\n gamepadIndices: {\n button: 6,\n },\n rootNodeName: '',\n visualResponses: {},\n },\n swipeup: {\n type: 'button',\n gamepadIndices: {\n button: 7,\n },\n rootNodeName: '',\n visualResponses: {},\n },\n swipedown: {\n type: 'button',\n gamepadIndices: {\n button: 8,\n },\n rootNodeName: '',\n visualResponses: {},\n },\n confirm: {\n type: 'button',\n gamepadIndices: {\n button: 9,\n },\n rootNodeName: '',\n visualResponses: {},\n },\n },\n rootNodeName: '',\n gamepadMapping: 'xr-standard',\n assetPath: '',\n};\n\nexport class XRHandVisualAdapter extends XRInputVisualAdapter {\n public jointSpaces: XRJointSpace[] = [];\n public jointTransforms?: Float32Array;\n private indexTip?: XRSpace;\n private thumbTip?: XRSpace;\n private pinchThreshold = 0.008;\n private pinchCooldown = 0;\n private pinchData = { prev: false, curr: false };\n /** Continuous 0..1 pinch strength derived from thumb-tip↔index-tip distance. */\n private pinchStrength = 0;\n private vec3 = new Vector3();\n private visualOffsetStart = new Vector3();\n private visualOffsetEnd = new Vector3();\n private mat4 = new Matrix4();\n private pendingCapture?: {\n refSpace: XRSpace;\n resolve: (value: HandPose) => void;\n reject: () => void;\n };\n private gripXRSpace: XRSpace | undefined;\n\n constructor(\n playerSpace: Group,\n handedness: XRHandedness,\n visualsEnabled: boolean,\n visualClass: VisualConstructor<VisualImplementation>,\n scene: Scene,\n camera: PerspectiveCamera,\n assetLoader: XRAssetLoader,\n ) {\n super(\n playerSpace,\n handedness,\n visualsEnabled,\n visualClass,\n scene,\n camera,\n assetLoader,\n );\n }\n\n connect(inputSource: XRInputSource) {\n super.connect(inputSource);\n const hand = inputSource.hand!;\n this.gripXRSpace = inputSource.gripSpace || inputSource.targetRaySpace;\n\n hand.forEach((jointSpace) => {\n if (jointSpace.jointName === 'index-finger-tip') {\n this.indexTip = jointSpace;\n } else if (jointSpace.jointName === 'thumb-tip') {\n this.thumbTip = jointSpace;\n }\n this.jointSpaces.push(jointSpace);\n });\n\n this.jointTransforms = new Float32Array(hand.size * 16);\n this.inputConfig = {\n inputSource,\n layout: defaultHandLayout,\n } as InputConfig;\n this.connectVisual();\n }\n\n disconnect(): void {\n this.pendingCapture?.reject();\n this.pendingCapture = undefined;\n this.pinchStrength = 0;\n this.pinchCooldown = 0;\n this.pinchData.prev = false;\n this.pinchData.curr = false;\n this.gripXRSpace = undefined;\n\n super.disconnect();\n this.jointTransforms = undefined;\n this.jointSpaces.length = 0;\n this.indexTip = undefined;\n this.thumbTip = undefined;\n this.disconnectVisual();\n }\n\n update(frame: XRFrame, delta: number) {\n if (this._inputSource && this.jointTransforms) {\n const success =\n frame.fillPoses?.(\n this.jointSpaces,\n this.gripXRSpace!,\n this.jointTransforms,\n ) ?? false;\n if (success) {\n this.updatePinch(frame, delta);\n if (this.visual && this.gripSpace) {\n this.visual.model.position.copy(this.gripSpace.position);\n this.visual.model.quaternion.copy(this.gripSpace.quaternion);\n this.visual.update(delta);\n }\n\n if (this.pendingCapture) {\n const { refSpace, resolve, reject } = this.pendingCapture;\n const jointTransforms = new Float32Array(this.jointTransforms.length);\n const success =\n frame.fillPoses?.(this.jointSpaces, refSpace, jointTransforms) ??\n false;\n if (success) {\n const pose: HandPose = {};\n this.jointSpaces.forEach((jointSpace, index) => {\n pose[jointSpace.jointName] = this.mat4\n .fromArray(jointTransforms, index * 16)\n .toArray();\n });\n resolve(pose);\n } else {\n reject();\n }\n this.pendingCapture = undefined;\n }\n }\n }\n }\n\n private updatePinch(frame: XRFrame, delta: number) {\n this.pinchData.prev = this.pinchData.curr;\n let pinching = false;\n this.pinchStrength = 0;\n\n // Always compute pinch strength when joints are available; this is\n // independent of the boolean cooldown so callers can drive continuous\n // affordances (e.g. pinch-progress UI).\n if (this.indexTip && this.thumbTip) {\n const pose = frame.getPose(this.indexTip, this.thumbTip);\n if (pose) {\n this.vec3.copy(pose.transform.position);\n const distance = this.vec3.length();\n const span = PINCH_OPEN_DISTANCE - this.pinchThreshold;\n if (span <= 0) {\n this.pinchStrength = distance < this.pinchThreshold ? 1 : 0;\n } else {\n const t = (PINCH_OPEN_DISTANCE - distance) / span;\n this.pinchStrength = Math.max(0, Math.min(1, t));\n }\n pinching = distance < this.pinchThreshold;\n }\n }\n\n if (this.pinchCooldown > 0) {\n this.pinchData.curr = true;\n this.pinchCooldown -= delta;\n return;\n }\n\n if (pinching) {\n this.pinchCooldown = PINCH_COOLDOWN;\n }\n this.pinchData.curr = pinching;\n }\n\n /**\n * Continuous 0..1 pinch progress, where `0` is an open hand at\n * {@link PINCH_OPEN_DISTANCE} and `1` is a closed pinch at the commit\n * threshold. Use this to drive pre-commit affordances; use the gamepad's\n * select state for the discrete pinch itself.\n */\n getPinchStrength(): number {\n return this.pinchStrength;\n }\n\n toggleVisual(enabled: boolean): void {\n this.visualsEnabled = enabled;\n if (this.visual) {\n this.visual.toggle(enabled);\n }\n }\n\n // getSelectStart() {\n // \treturn this.pinchData.curr && !this.pinchData.prev;\n // }\n\n // getSelectEnd() {\n // \treturn !this.pinchData.curr && this.pinchData.prev;\n // }\n\n // getSelecting() {\n // \treturn this.pinchData.curr;\n // }\n\n capturePose(refSpace: XRSpace) {\n return new Promise<HandPose>((resolve, reject) => {\n this.pendingCapture = {\n refSpace,\n resolve,\n reject,\n };\n });\n }\n\n /**\n * Returns the XRSpace for the index finger tip, if available.\n * Used for poke/touch interactions.\n */\n getIndexTipSpace(): XRSpace | undefined {\n return this.indexTip;\n }\n\n /**\n * Moves only the rendered hand model by a world-space offset. Tracking state\n * and pointer poses stay unchanged; the next update resets the model to the\n * raw grip pose before applying a fresh visual offset.\n */\n applyVisualOffsetWorld(offsetWorld: Vector3): void {\n if (!this.visual) {\n return;\n }\n\n const parent = this.visual.model.parent;\n if (!parent) {\n this.visual.model.position.add(offsetWorld);\n return;\n }\n\n parent.getWorldPosition(this.visualOffsetStart);\n this.visualOffsetEnd.copy(this.visualOffsetStart).add(offsetWorld);\n parent.worldToLocal(this.visualOffsetStart);\n parent.worldToLocal(this.visualOffsetEnd);\n this.visual.model.position.add(\n this.visualOffsetEnd.sub(this.visualOffsetStart),\n );\n }\n}\n"],"names":[],"mappings":";;;AAAA;;;;;AAKG;AAaH,MAAM,cAAc,GAAG,GAAG;AAC1B;;;AAGG;AACH,MAAM,mBAAmB,GAAG,IAAI;AAEzB,MAAM,iBAAiB,GAAgB;AAC5C,IAAA,iBAAiB,EAAE,OAAO;AAC1B,IAAA,UAAU,EAAE;AACV,QAAA,KAAK,EAAE;AACL,YAAA,IAAI,EAAE,QAAQ;AACd,YAAA,cAAc,EAAE;AACd,gBAAA,MAAM,EAAE,CAAC;AACV,aAAA;AACD,YAAA,YAAY,EAAE,EAAE;AAChB,YAAA,eAAe,EAAE,EAAE;AACpB,SAAA;AACD,QAAA,SAAS,EAAE;AACT,YAAA,IAAI,EAAE,QAAQ;AACd,YAAA,cAAc,EAAE;AACd,gBAAA,MAAM,EAAE,CAAC;AACV,aAAA;AACD,YAAA,YAAY,EAAE,EAAE;AAChB,YAAA,eAAe,EAAE,EAAE;AACpB,SAAA;AACD,QAAA,UAAU,EAAE;AACV,YAAA,IAAI,EAAE,QAAQ;AACd,YAAA,cAAc,EAAE;AACd,gBAAA,MAAM,EAAE,CAAC;AACV,aAAA;AACD,YAAA,YAAY,EAAE,EAAE;AAChB,YAAA,eAAe,EAAE,EAAE;AACpB,SAAA;AACD,QAAA,OAAO,EAAE;AACP,YAAA,IAAI,EAAE,QAAQ;AACd,YAAA,cAAc,EAAE;AACd,gBAAA,MAAM,EAAE,CAAC;AACV,aAAA;AACD,YAAA,YAAY,EAAE,EAAE;AAChB,YAAA,eAAe,EAAE,EAAE;AACpB,SAAA;AACD,QAAA,SAAS,EAAE;AACT,YAAA,IAAI,EAAE,QAAQ;AACd,YAAA,cAAc,EAAE;AACd,gBAAA,MAAM,EAAE,CAAC;AACV,aAAA;AACD,YAAA,YAAY,EAAE,EAAE;AAChB,YAAA,eAAe,EAAE,EAAE;AACpB,SAAA;AACD,QAAA,OAAO,EAAE;AACP,YAAA,IAAI,EAAE,QAAQ;AACd,YAAA,cAAc,EAAE;AACd,gBAAA,MAAM,EAAE,CAAC;AACV,aAAA;AACD,YAAA,YAAY,EAAE,EAAE;AAChB,YAAA,eAAe,EAAE,EAAE;AACpB,SAAA;AACF,KAAA;AACD,IAAA,YAAY,EAAE,EAAE;AAChB,IAAA,cAAc,EAAE,aAAa;AAC7B,IAAA,SAAS,EAAE,EAAE;;AAGT,MAAO,mBAAoB,SAAQ,oBAAoB,CAAA;AAqB3D,IAAA,WAAA,CACE,WAAkB,EAClB,UAAwB,EACxB,cAAuB,EACvB,WAAoD,EACpD,KAAY,EACZ,MAAyB,EACzB,WAA0B,EAAA;AAE1B,QAAA,KAAK,CACH,WAAW,EACX,UAAU,EACV,cAAc,EACd,WAAW,EACX,KAAK,EACL,MAAM,EACN,WAAW,CACZ;QArCI,IAAA,CAAA,WAAW,GAAmB,EAAE;QAI/B,IAAA,CAAA,cAAc,GAAG,KAAK;QACtB,IAAA,CAAA,aAAa,GAAG,CAAC;QACjB,IAAA,CAAA,SAAS,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE;;QAExC,IAAA,CAAA,aAAa,GAAG,CAAC;AACjB,QAAA,IAAA,CAAA,IAAI,GAAG,IAAI,OAAO,EAAE;AACpB,QAAA,IAAA,CAAA,iBAAiB,GAAG,IAAI,OAAO,EAAE;AACjC,QAAA,IAAA,CAAA,eAAe,GAAG,IAAI,OAAO,EAAE;AAC/B,QAAA,IAAA,CAAA,IAAI,GAAG,IAAI,OAAO,EAAE;IA0B5B;AAEA,IAAA,OAAO,CAAC,WAA0B,EAAA;AAChC,QAAA,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC;AAC1B,QAAA,MAAM,IAAI,GAAG,WAAW,CAAC,IAAK;QAC9B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC,SAAS,IAAI,WAAW,CAAC,cAAc;AAEtE,QAAA,IAAI,CAAC,OAAO,CAAC,CAAC,UAAU,KAAI;AAC1B,YAAA,IAAI,UAAU,CAAC,SAAS,KAAK,kBAAkB,EAAE;AAC/C,gBAAA,IAAI,CAAC,QAAQ,GAAG,UAAU;YAC5B;AAAO,iBAAA,IAAI,UAAU,CAAC,SAAS,KAAK,WAAW,EAAE;AAC/C,gBAAA,IAAI,CAAC,QAAQ,GAAG,UAAU;YAC5B;AACA,YAAA,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC;AACnC,QAAA,CAAC,CAAC;AAEF,QAAA,IAAI,CAAC,eAAe,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;QACvD,IAAI,CAAC,WAAW,GAAG;YACjB,WAAW;AACX,YAAA,MAAM,EAAE,iBAAiB;SACX;QAChB,IAAI,CAAC,aAAa,EAAE;IACtB;IAEA,UAAU,GAAA;;AACR,QAAA,CAAA,EAAA,GAAA,IAAI,CAAC,cAAc,MAAA,IAAA,IAAA,EAAA,KAAA,MAAA,GAAA,MAAA,GAAA,EAAA,CAAE,MAAM,EAAE;AAC7B,QAAA,IAAI,CAAC,cAAc,GAAG,SAAS;AAC/B,QAAA,IAAI,CAAC,aAAa,GAAG,CAAC;AACtB,QAAA,IAAI,CAAC,aAAa,GAAG,CAAC;AACtB,QAAA,IAAI,CAAC,SAAS,CAAC,IAAI,GAAG,KAAK;AAC3B,QAAA,IAAI,CAAC,SAAS,CAAC,IAAI,GAAG,KAAK;AAC3B,QAAA,IAAI,CAAC,WAAW,GAAG,SAAS;QAE5B,KAAK,CAAC,UAAU,EAAE;AAClB,QAAA,IAAI,CAAC,eAAe,GAAG,SAAS;AAChC,QAAA,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC;AAC3B,QAAA,IAAI,CAAC,QAAQ,GAAG,SAAS;AACzB,QAAA,IAAI,CAAC,QAAQ,GAAG,SAAS;QACzB,IAAI,CAAC,gBAAgB,EAAE;IACzB;IAEA,MAAM,CAAC,KAAc,EAAE,KAAa,EAAA;;QAClC,IAAI,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,eAAe,EAAE;YAC7C,MAAM,OAAO,GACX,CAAA,EAAA,GAAA,CAAA,EAAA,GAAA,KAAK,CAAC,SAAS,MAAA,IAAA,IAAA,EAAA,KAAA,MAAA,GAAA,MAAA,GAAA,EAAA,CAAA,IAAA,CAAA,KAAA,EACb,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,WAAY,EACjB,IAAI,CAAC,eAAe,CACrB,MAAA,IAAA,IAAA,EAAA,KAAA,MAAA,GAAA,EAAA,GAAI,KAAK;YACZ,IAAI,OAAO,EAAE;AACX,gBAAA,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,KAAK,CAAC;gBAC9B,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,SAAS,EAAE;AACjC,oBAAA,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;AACxD,oBAAA,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC;AAC5D,oBAAA,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;gBAC3B;AAEA,gBAAA,IAAI,IAAI,CAAC,cAAc,EAAE;oBACvB,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,cAAc;oBACzD,MAAM,eAAe,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC;AACrE,oBAAA,MAAM,OAAO,GACX,CAAA,EAAA,GAAA,MAAA,KAAK,CAAC,SAAS,MAAA,IAAA,IAAA,EAAA,KAAA,MAAA,GAAA,MAAA,GAAA,EAAA,CAAA,IAAA,CAAA,KAAA,EAAG,IAAI,CAAC,WAAW,EAAE,QAAQ,EAAE,eAAe,CAAC,MAAA,IAAA,IAAA,EAAA,KAAA,MAAA,GAAA,EAAA,GAC9D,KAAK;oBACP,IAAI,OAAO,EAAE;wBACX,MAAM,IAAI,GAAa,EAAE;wBACzB,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,KAAK,KAAI;4BAC7C,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;AAC/B,iCAAA,SAAS,CAAC,eAAe,EAAE,KAAK,GAAG,EAAE;AACrC,iCAAA,OAAO,EAAE;AACd,wBAAA,CAAC,CAAC;wBACF,OAAO,CAAC,IAAI,CAAC;oBACf;yBAAO;AACL,wBAAA,MAAM,EAAE;oBACV;AACA,oBAAA,IAAI,CAAC,cAAc,GAAG,SAAS;gBACjC;YACF;QACF;IACF;IAEQ,WAAW,CAAC,KAAc,EAAE,KAAa,EAAA;QAC/C,IAAI,CAAC,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI;QACzC,IAAI,QAAQ,GAAG,KAAK;AACpB,QAAA,IAAI,CAAC,aAAa,GAAG,CAAC;;;;QAKtB,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,EAAE;AAClC,YAAA,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC;YACxD,IAAI,IAAI,EAAE;gBACR,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;gBACvC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;AACnC,gBAAA,MAAM,IAAI,GAAG,mBAAmB,GAAG,IAAI,CAAC,cAAc;AACtD,gBAAA,IAAI,IAAI,IAAI,CAAC,EAAE;AACb,oBAAA,IAAI,CAAC,aAAa,GAAG,QAAQ,GAAG,IAAI,CAAC,cAAc,GAAG,CAAC,GAAG,CAAC;gBAC7D;qBAAO;oBACL,MAAM,CAAC,GAAG,CAAC,mBAAmB,GAAG,QAAQ,IAAI,IAAI;AACjD,oBAAA,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAClD;AACA,gBAAA,QAAQ,GAAG,QAAQ,GAAG,IAAI,CAAC,cAAc;YAC3C;QACF;AAEA,QAAA,IAAI,IAAI,CAAC,aAAa,GAAG,CAAC,EAAE;AAC1B,YAAA,IAAI,CAAC,SAAS,CAAC,IAAI,GAAG,IAAI;AAC1B,YAAA,IAAI,CAAC,aAAa,IAAI,KAAK;YAC3B;QACF;QAEA,IAAI,QAAQ,EAAE;AACZ,YAAA,IAAI,CAAC,aAAa,GAAG,cAAc;QACrC;AACA,QAAA,IAAI,CAAC,SAAS,CAAC,IAAI,GAAG,QAAQ;IAChC;AAEA;;;;;AAKG;IACH,gBAAgB,GAAA;QACd,OAAO,IAAI,CAAC,aAAa;IAC3B;AAEA,IAAA,YAAY,CAAC,OAAgB,EAAA;AAC3B,QAAA,IAAI,CAAC,cAAc,GAAG,OAAO;AAC7B,QAAA,IAAI,IAAI,CAAC,MAAM,EAAE;AACf,YAAA,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;QAC7B;IACF;;;;;;;;;;AAcA,IAAA,WAAW,CAAC,QAAiB,EAAA;QAC3B,OAAO,IAAI,OAAO,CAAW,CAAC,OAAO,EAAE,MAAM,KAAI;YAC/C,IAAI,CAAC,cAAc,GAAG;gBACpB,QAAQ;gBACR,OAAO;gBACP,MAAM;aACP;AACH,QAAA,CAAC,CAAC;IACJ;AAEA;;;AAGG;IACH,gBAAgB,GAAA;QACd,OAAO,IAAI,CAAC,QAAQ;IACtB;AAEA;;;;AAIG;AACH,IAAA,sBAAsB,CAAC,WAAoB,EAAA;AACzC,QAAA,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAChB;QACF;QAEA,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM;QACvC,IAAI,CAAC,MAAM,EAAE;YACX,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC;YAC3C;QACF;AAEA,QAAA,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,iBAAiB,CAAC;AAC/C,QAAA,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC;AAClE,QAAA,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,iBAAiB,CAAC;AAC3C,QAAA,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC;QACzC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAC5B,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,CACjD;IACH;AACD;;;;"}
|
|
@@ -5,9 +5,10 @@
|
|
|
5
5
|
* LICENSE file in the root directory of this source tree.
|
|
6
6
|
*/
|
|
7
7
|
import { Signal } from '@preact/signals-core';
|
|
8
|
-
import { PerspectiveCamera, Scene, WebXRManager } from 'three';
|
|
8
|
+
import { Object3D, PerspectiveCamera, Scene, WebXRManager } from 'three';
|
|
9
9
|
import { GLTF, GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader.js';
|
|
10
10
|
import { StatefulGamepad } from './gamepad/stateful-gamepad.js';
|
|
11
|
+
import { GazePointer } from './pointer/gaze-pointer.js';
|
|
11
12
|
import { MultiPointer } from './pointer/multi-pointer.js';
|
|
12
13
|
import { XROrigin } from './rig/xr-origin.js';
|
|
13
14
|
import { XRInputVisualAdapter } from './visual/adapter/base-visual-adapter.js';
|
|
@@ -44,6 +45,32 @@ export interface XRInputOptions {
|
|
|
44
45
|
export declare class XRInputManager {
|
|
45
46
|
readonly xrOrigin: XROrigin;
|
|
46
47
|
readonly multiPointers: Record<'left' | 'right', MultiPointer>;
|
|
48
|
+
/**
|
|
49
|
+
* Single global gaze pointer — gaze has no handedness, so it sits beside
|
|
50
|
+
* {@link XRInputManager.multiPointers} rather than inside them.
|
|
51
|
+
*
|
|
52
|
+
* Constructed unconditionally so systems (`GrabSystem`, `GazeSystem`) can
|
|
53
|
+
* hold a stable reference, but idle until {@link XRInputManager.gazeEnabled}
|
|
54
|
+
* is set. Nothing here costs a frame while gaze is off.
|
|
55
|
+
*/
|
|
56
|
+
readonly gazePointer: GazePointer;
|
|
57
|
+
/**
|
|
58
|
+
* Master switch for the gaze pipeline, flipped on by `GazeSystem` when the
|
|
59
|
+
* project opts into the gaze XR feature. While `false`, the gaze pose is
|
|
60
|
+
* never sampled, no cone cast runs, no pointer events are dispatched, and
|
|
61
|
+
* the pointer's reticle and ray space stay out of the rig entirely.
|
|
62
|
+
*/
|
|
63
|
+
get gazeEnabled(): boolean;
|
|
64
|
+
set gazeEnabled(enabled: boolean);
|
|
65
|
+
private gazeEnabledFlag;
|
|
66
|
+
/**
|
|
67
|
+
* Gaze-eligible Object3D roots, republished by the host every frame before
|
|
68
|
+
* {@link XRInputManager.update}. Gaze deliberately uses an explicit
|
|
69
|
+
* candidate list rather than raycasting the scene: the cone cast is
|
|
70
|
+
* O(candidates), and gaze should only consider objects that opted in.
|
|
71
|
+
*/
|
|
72
|
+
gazeCandidates: ReadonlyArray<Object3D>;
|
|
73
|
+
private readonly gazeInput;
|
|
47
74
|
readonly gamepads: Record<"left" | "right", StatefulGamepad | undefined>;
|
|
48
75
|
readonly visualAdapters: {
|
|
49
76
|
controller: {
|
|
@@ -63,10 +90,18 @@ export declare class XRInputManager {
|
|
|
63
90
|
private hadSession;
|
|
64
91
|
private readonly touchSurfaceVisualOffsets;
|
|
65
92
|
private processedInputSourceKeys;
|
|
93
|
+
private selectEventSession;
|
|
94
|
+
private readonly handSelectEvents;
|
|
95
|
+
private readonly handSelectFrameState;
|
|
96
|
+
private readonly gazeHandSelectionArmed;
|
|
97
|
+
private readonly pointerDisableWarnings;
|
|
98
|
+
private readonly selectStartHandler;
|
|
99
|
+
private readonly selectEndHandler;
|
|
66
100
|
constructor(options: XRInputOptions);
|
|
67
101
|
update(xrManager: WebXRManager, delta: number, time: number): void;
|
|
68
102
|
private onSessionEnded;
|
|
69
103
|
private disablePointers;
|
|
104
|
+
private warnPointerDisableFailure;
|
|
70
105
|
isPrimary(deviceType: 'controller' | 'hand', handedness: 'left' | 'right'): boolean;
|
|
71
106
|
/**
|
|
72
107
|
* Get the primary input source for a given handedness.
|
|
@@ -74,6 +109,18 @@ export declare class XRInputManager {
|
|
|
74
109
|
*/
|
|
75
110
|
getPrimaryInputSource(handedness: 'left' | 'right'): XRInputSource | undefined;
|
|
76
111
|
private resetActiveInputSources;
|
|
112
|
+
private syncSelectEventSession;
|
|
113
|
+
private updateHandSelectEvent;
|
|
114
|
+
private resetHandSelectEvents;
|
|
115
|
+
private resetHandSelectFrameState;
|
|
116
|
+
private resetGazeHandSelectionArming;
|
|
117
|
+
/**
|
|
118
|
+
* Snapshot each hand's selection once per render frame. Native hand sources
|
|
119
|
+
* expose WebXR select events but no Gamepad, and both the hand pointer and
|
|
120
|
+
* gaze pointer must observe the same edge without consuming it twice.
|
|
121
|
+
*/
|
|
122
|
+
private updateHandSelectFrameState;
|
|
123
|
+
private readHandSelectState;
|
|
77
124
|
/**
|
|
78
125
|
* Updates the active input sources from the XR session.
|
|
79
126
|
*
|
|
@@ -95,5 +142,14 @@ export declare class XRInputManager {
|
|
|
95
142
|
private assignInputSource;
|
|
96
143
|
private updateControllersAndHands;
|
|
97
144
|
private updatePointers;
|
|
145
|
+
/**
|
|
146
|
+
* Drive the global gaze pointer from this frame's candidates and pinch state.
|
|
147
|
+
*
|
|
148
|
+
* Either hand's pinch can commit a gaze selection, so both are sampled and
|
|
149
|
+
* the pointer applies its own hand mutual-exclusion. Direct touch/grab state
|
|
150
|
+
* feeds the pointer's suppression rule; it's read after
|
|
151
|
+
* {@link XRInputManager.updatePointers} so it reflects this frame, not last.
|
|
152
|
+
*/
|
|
153
|
+
private updateGazePointer;
|
|
98
154
|
}
|
|
99
155
|
//# sourceMappingURL=xr-input-manager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xr-input-manager.d.ts","sourceRoot":"","sources":["../src/xr-input-manager.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,MAAM,EAAU,MAAM,sBAAsB,CAAC;AACtD,OAAO,
|
|
1
|
+
{"version":3,"file":"xr-input-manager.d.ts","sourceRoot":"","sources":["../src/xr-input-manager.ts"],"names":[],"mappings":"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"}
|