@xrift/world-components 0.41.0 → 0.42.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/components/DevEnvironment/components/ControlsHelp.d.ts.map +1 -1
- package/dist/components/DevEnvironment/components/ControlsHelp.js +1 -1
- package/dist/components/DevEnvironment/components/ControlsHelp.js.map +1 -1
- package/dist/components/DevEnvironment/components/GrabSystem/__tests__/store.test.d.ts +2 -0
- package/dist/components/DevEnvironment/components/GrabSystem/__tests__/store.test.d.ts.map +1 -0
- package/dist/components/DevEnvironment/components/GrabSystem/__tests__/store.test.js +114 -0
- package/dist/components/DevEnvironment/components/GrabSystem/__tests__/store.test.js.map +1 -0
- package/dist/components/DevEnvironment/components/GrabSystem/__tests__/utils.test.d.ts +2 -0
- package/dist/components/DevEnvironment/components/GrabSystem/__tests__/utils.test.d.ts.map +1 -0
- package/dist/components/DevEnvironment/components/GrabSystem/__tests__/utils.test.js +103 -0
- package/dist/components/DevEnvironment/components/GrabSystem/__tests__/utils.test.js.map +1 -0
- package/dist/components/DevEnvironment/components/GrabSystem/constants.d.ts +15 -0
- package/dist/components/DevEnvironment/components/GrabSystem/constants.d.ts.map +1 -0
- package/dist/components/DevEnvironment/components/GrabSystem/constants.js +15 -0
- package/dist/components/DevEnvironment/components/GrabSystem/constants.js.map +1 -0
- package/dist/components/DevEnvironment/components/GrabSystem/ghostAppearance.d.ts +9 -0
- package/dist/components/DevEnvironment/components/GrabSystem/ghostAppearance.d.ts.map +1 -0
- package/dist/components/DevEnvironment/components/GrabSystem/ghostAppearance.js +45 -0
- package/dist/components/DevEnvironment/components/GrabSystem/ghostAppearance.js.map +1 -0
- package/dist/components/DevEnvironment/components/GrabSystem/index.d.ts +12 -0
- package/dist/components/DevEnvironment/components/GrabSystem/index.d.ts.map +1 -0
- package/dist/components/DevEnvironment/components/GrabSystem/index.js +147 -0
- package/dist/components/DevEnvironment/components/GrabSystem/index.js.map +1 -0
- package/dist/components/DevEnvironment/components/GrabSystem/store.d.ts +43 -0
- package/dist/components/DevEnvironment/components/GrabSystem/store.d.ts.map +1 -0
- package/dist/components/DevEnvironment/components/GrabSystem/store.js +89 -0
- package/dist/components/DevEnvironment/components/GrabSystem/store.js.map +1 -0
- package/dist/components/DevEnvironment/components/GrabSystem/utils.d.ts +29 -0
- package/dist/components/DevEnvironment/components/GrabSystem/utils.d.ts.map +1 -0
- package/dist/components/DevEnvironment/components/GrabSystem/utils.js +54 -0
- package/dist/components/DevEnvironment/components/GrabSystem/utils.js.map +1 -0
- package/dist/components/DevEnvironment/index.d.ts.map +1 -1
- package/dist/components/DevEnvironment/index.js +6 -1
- package/dist/components/DevEnvironment/index.js.map +1 -1
- package/dist/components/Grabbable/constants.d.ts +7 -0
- package/dist/components/Grabbable/constants.d.ts.map +1 -0
- package/dist/components/Grabbable/constants.js +7 -0
- package/dist/components/Grabbable/constants.js.map +1 -0
- package/dist/components/Grabbable/index.d.ts +17 -0
- package/dist/components/Grabbable/index.d.ts.map +1 -0
- package/dist/components/Grabbable/index.js +58 -0
- package/dist/components/Grabbable/index.js.map +1 -0
- package/dist/components/Grabbable/types.d.ts +27 -0
- package/dist/components/Grabbable/types.d.ts.map +1 -0
- package/dist/components/Grabbable/types.js +2 -0
- package/dist/components/Grabbable/types.js.map +1 -0
- package/dist/components/Mirror/index.d.ts.map +1 -1
- package/dist/components/Mirror/index.js +15 -8
- package/dist/components/Mirror/index.js.map +1 -1
- package/dist/components/ScreenShareDisplay/index.js +1 -1
- package/dist/components/ScreenShareDisplay/index.js.map +1 -1
- package/dist/constants/layers.d.ts +6 -0
- package/dist/constants/layers.d.ts.map +1 -1
- package/dist/constants/layers.js +7 -0
- package/dist/constants/layers.js.map +1 -1
- package/dist/contexts/GrabbableContext.d.ts +78 -0
- package/dist/contexts/GrabbableContext.d.ts.map +1 -0
- package/dist/contexts/GrabbableContext.js +38 -0
- package/dist/contexts/GrabbableContext.js.map +1 -0
- package/dist/contexts/XRiftContext.d.ts +7 -1
- package/dist/contexts/XRiftContext.d.ts.map +1 -1
- package/dist/contexts/XRiftContext.js +3 -1
- package/dist/contexts/XRiftContext.js.map +1 -1
- package/dist/index.d.ts +3 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -0
- package/dist/index.js.map +1 -1
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ControlsHelp.d.ts","sourceRoot":"","sources":["../../../../src/components/DevEnvironment/components/ControlsHelp.tsx"],"names":[],"mappings":"AAgCA,wBAAgB,YAAY,
|
|
1
|
+
{"version":3,"file":"ControlsHelp.d.ts","sourceRoot":"","sources":["../../../../src/components/DevEnvironment/components/ControlsHelp.tsx"],"names":[],"mappings":"AAgCA,wBAAgB,YAAY,4CAqB3B"}
|
|
@@ -27,6 +27,6 @@ function Kbd({ children }) {
|
|
|
27
27
|
return _jsx("kbd", { style: kbdStyle, children: children });
|
|
28
28
|
}
|
|
29
29
|
export function ControlsHelp() {
|
|
30
|
-
return (_jsxs("div", { style: containerStyle, children: [_jsxs("div", { children: [_jsx(Kbd, { children: "Click" }), " \u30ED\u30C3\u30AF\u958B\u59CB / \u30A4\u30F3\u30BF\u30E9\u30AF\u30C8"] }), _jsxs("div", { children: [_jsx(Kbd, { children: "W" }), _jsx(Kbd, { children: "A" }), _jsx(Kbd, { children: "S" }), _jsx(Kbd, { children: "D" }), " \u79FB\u52D5"] }), _jsxs("div", { children: [_jsx(Kbd, { children: "Space" }), _jsx(Kbd, { children: "E" }), " \u30B8\u30E3\u30F3\u30D7"] })] }));
|
|
30
|
+
return (_jsxs("div", { style: containerStyle, children: [_jsxs("div", { children: [_jsx(Kbd, { children: "Click" }), " \u30ED\u30C3\u30AF\u958B\u59CB / \u30A4\u30F3\u30BF\u30E9\u30AF\u30C8"] }), _jsxs("div", { children: [_jsx(Kbd, { children: "W" }), _jsx(Kbd, { children: "A" }), _jsx(Kbd, { children: "S" }), _jsx(Kbd, { children: "D" }), " \u79FB\u52D5"] }), _jsxs("div", { children: [_jsx(Kbd, { children: "Space" }), _jsx(Kbd, { children: "E" }), " \u30B8\u30E3\u30F3\u30D7"] }), _jsxs("div", { children: [_jsx(Kbd, { children: "G" }), " \u63B4\u3080 / \u7F6E\u304F\uFF08Grabbable\uFF09"] })] }));
|
|
31
31
|
}
|
|
32
32
|
//# sourceMappingURL=ControlsHelp.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ControlsHelp.js","sourceRoot":"","sources":["../../../../src/components/DevEnvironment/components/ControlsHelp.tsx"],"names":[],"mappings":";AAEA,MAAM,cAAc,GAAkB;IACpC,QAAQ,EAAE,UAAU;IACpB,MAAM,EAAE,EAAE;IACV,IAAI,EAAE,EAAE;IACR,OAAO,EAAE,WAAW;IACpB,UAAU,EAAE,qBAAqB;IACjC,KAAK,EAAE,MAAM;IACb,YAAY,EAAE,CAAC;IACf,QAAQ,EAAE,EAAE;IACZ,UAAU,EAAE,GAAG;IACf,aAAa,EAAE,MAAM;IACrB,UAAU,EAAE,MAAM;IAClB,UAAU,EAAE,uBAAuB;IACnC,cAAc,EAAE,WAAW;CAC5B,CAAA;AAED,MAAM,QAAQ,GAAkB;IAC9B,OAAO,EAAE,cAAc;IACvB,OAAO,EAAE,SAAS;IAClB,UAAU,EAAE,2BAA2B;IACvC,YAAY,EAAE,CAAC;IACf,QAAQ,EAAE,EAAE;IACZ,UAAU,EAAE,SAAS;IACrB,WAAW,EAAE,CAAC;CACf,CAAA;AAED,SAAS,GAAG,CAAC,EAAE,QAAQ,EAA2B;IAChD,OAAO,cAAK,KAAK,EAAE,QAAQ,YAAG,QAAQ,GAAO,CAAA;AAC/C,CAAC;AAED,MAAM,UAAU,YAAY;IAC1B,OAAO,CACL,eAAK,KAAK,EAAE,cAAc,aACxB,0BACE,KAAC,GAAG,wBAAY,8EACZ,EACN,0BACE,KAAC,GAAG,oBAAQ,EACZ,KAAC,GAAG,oBAAQ,EACZ,KAAC,GAAG,oBAAQ,EACZ,KAAC,GAAG,oBAAQ,qBACR,EACN,0BACE,KAAC,GAAG,wBAAY,EAChB,KAAC,GAAG,oBAAQ,iCACR,IACF,CACP,CAAA;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"ControlsHelp.js","sourceRoot":"","sources":["../../../../src/components/DevEnvironment/components/ControlsHelp.tsx"],"names":[],"mappings":";AAEA,MAAM,cAAc,GAAkB;IACpC,QAAQ,EAAE,UAAU;IACpB,MAAM,EAAE,EAAE;IACV,IAAI,EAAE,EAAE;IACR,OAAO,EAAE,WAAW;IACpB,UAAU,EAAE,qBAAqB;IACjC,KAAK,EAAE,MAAM;IACb,YAAY,EAAE,CAAC;IACf,QAAQ,EAAE,EAAE;IACZ,UAAU,EAAE,GAAG;IACf,aAAa,EAAE,MAAM;IACrB,UAAU,EAAE,MAAM;IAClB,UAAU,EAAE,uBAAuB;IACnC,cAAc,EAAE,WAAW;CAC5B,CAAA;AAED,MAAM,QAAQ,GAAkB;IAC9B,OAAO,EAAE,cAAc;IACvB,OAAO,EAAE,SAAS;IAClB,UAAU,EAAE,2BAA2B;IACvC,YAAY,EAAE,CAAC;IACf,QAAQ,EAAE,EAAE;IACZ,UAAU,EAAE,SAAS;IACrB,WAAW,EAAE,CAAC;CACf,CAAA;AAED,SAAS,GAAG,CAAC,EAAE,QAAQ,EAA2B;IAChD,OAAO,cAAK,KAAK,EAAE,QAAQ,YAAG,QAAQ,GAAO,CAAA;AAC/C,CAAC;AAED,MAAM,UAAU,YAAY;IAC1B,OAAO,CACL,eAAK,KAAK,EAAE,cAAc,aACxB,0BACE,KAAC,GAAG,wBAAY,8EACZ,EACN,0BACE,KAAC,GAAG,oBAAQ,EACZ,KAAC,GAAG,oBAAQ,EACZ,KAAC,GAAG,oBAAQ,EACZ,KAAC,GAAG,oBAAQ,qBACR,EACN,0BACE,KAAC,GAAG,wBAAY,EAChB,KAAC,GAAG,oBAAQ,iCACR,EACN,0BACE,KAAC,GAAG,oBAAQ,yDACR,IACF,CACP,CAAA;AACH,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"store.test.d.ts","sourceRoot":"","sources":["../../../../../../src/components/DevEnvironment/components/GrabSystem/__tests__/store.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,114 @@
|
|
|
1
|
+
import { describe, expect, it, vi } from 'vitest';
|
|
2
|
+
import { MAX_HOLD_DISTANCE, MIN_HOLD_DISTANCE } from '../constants';
|
|
3
|
+
import { createDevGrabStore } from '../store';
|
|
4
|
+
const createEntry = (overrides = {}) => ({
|
|
5
|
+
renderGhost: () => null,
|
|
6
|
+
onMove: () => { },
|
|
7
|
+
getTransform: () => ({
|
|
8
|
+
position: { x: 0, y: 1, z: -3 },
|
|
9
|
+
rotation: { x: 0, y: 0.5, z: 0 },
|
|
10
|
+
scale: 2,
|
|
11
|
+
}),
|
|
12
|
+
...overrides,
|
|
13
|
+
});
|
|
14
|
+
describe('createDevGrabStore', () => {
|
|
15
|
+
it('登録した対象を掴むと holding になり、掴んだ時点の姿勢を保持する', () => {
|
|
16
|
+
const store = createDevGrabStore();
|
|
17
|
+
store.contextValue.registerGrabbable('box', createEntry());
|
|
18
|
+
store.grab('box', { x: 0, y: 1, z: 0 });
|
|
19
|
+
const state = store.getState();
|
|
20
|
+
expect(state.phase).toBe('holding');
|
|
21
|
+
expect(state.grabbedId).toBe('box');
|
|
22
|
+
expect(state.holdDistance).toBeCloseTo(3);
|
|
23
|
+
expect(state.heldRotation).toEqual({ x: 0, y: 0.5, z: 0 });
|
|
24
|
+
expect(state.heldScale).toBe(2);
|
|
25
|
+
});
|
|
26
|
+
it('未登録の ID を掴もうとしても idle のまま', () => {
|
|
27
|
+
const store = createDevGrabStore();
|
|
28
|
+
store.grab('unknown', { x: 0, y: 0, z: 0 });
|
|
29
|
+
expect(store.getState().phase).toBe('idle');
|
|
30
|
+
});
|
|
31
|
+
it('掴み距離は MIN/MAX に丸められる', () => {
|
|
32
|
+
const store = createDevGrabStore();
|
|
33
|
+
store.contextValue.registerGrabbable('near', createEntry({
|
|
34
|
+
getTransform: () => ({
|
|
35
|
+
position: { x: 0, y: 0, z: -0.1 },
|
|
36
|
+
rotation: { x: 0, y: 0, z: 0 },
|
|
37
|
+
scale: 1,
|
|
38
|
+
}),
|
|
39
|
+
}));
|
|
40
|
+
store.grab('near', { x: 0, y: 0, z: 0 });
|
|
41
|
+
expect(store.getState().holdDistance).toBe(MIN_HOLD_DISTANCE);
|
|
42
|
+
});
|
|
43
|
+
it('adjustHoldDistance は holding 中のみ動作し clamp される', () => {
|
|
44
|
+
const store = createDevGrabStore();
|
|
45
|
+
store.contextValue.registerGrabbable('box', createEntry());
|
|
46
|
+
store.adjustHoldDistance(1);
|
|
47
|
+
expect(store.getState().holdDistance).toBe(0);
|
|
48
|
+
store.grab('box', { x: 0, y: 1, z: 0 });
|
|
49
|
+
store.adjustHoldDistance(100);
|
|
50
|
+
expect(store.getState().holdDistance).toBe(MAX_HOLD_DISTANCE);
|
|
51
|
+
store.adjustHoldDistance(-100);
|
|
52
|
+
expect(store.getState().holdDistance).toBe(MIN_HOLD_DISTANCE);
|
|
53
|
+
});
|
|
54
|
+
it('release で最後の heldPosition と掴んだ時点の回転が onMove に渡り idle に戻る', () => {
|
|
55
|
+
const onMove = vi.fn();
|
|
56
|
+
const store = createDevGrabStore();
|
|
57
|
+
store.contextValue.registerGrabbable('box', createEntry({ onMove }));
|
|
58
|
+
store.grab('box', { x: 0, y: 1, z: 0 });
|
|
59
|
+
store.updateHeldPosition({ x: 5, y: 2, z: -1 });
|
|
60
|
+
store.release();
|
|
61
|
+
expect(onMove).toHaveBeenCalledWith({
|
|
62
|
+
position: { x: 5, y: 2, z: -1 },
|
|
63
|
+
rotation: { x: 0, y: 0.5, z: 0 },
|
|
64
|
+
});
|
|
65
|
+
expect(store.getState().phase).toBe('idle');
|
|
66
|
+
expect(store.getState().grabbedId).toBeNull();
|
|
67
|
+
});
|
|
68
|
+
it('cancel は onMove を呼ばずに idle に戻る', () => {
|
|
69
|
+
const onMove = vi.fn();
|
|
70
|
+
const store = createDevGrabStore();
|
|
71
|
+
store.contextValue.registerGrabbable('box', createEntry({ onMove }));
|
|
72
|
+
store.grab('box', { x: 0, y: 1, z: 0 });
|
|
73
|
+
store.cancel();
|
|
74
|
+
expect(onMove).not.toHaveBeenCalled();
|
|
75
|
+
expect(store.getState().phase).toBe('idle');
|
|
76
|
+
});
|
|
77
|
+
it('holding 中は別の対象を掴めない', () => {
|
|
78
|
+
const store = createDevGrabStore();
|
|
79
|
+
store.contextValue.registerGrabbable('a', createEntry());
|
|
80
|
+
store.contextValue.registerGrabbable('b', createEntry());
|
|
81
|
+
store.grab('a', { x: 0, y: 1, z: 0 });
|
|
82
|
+
store.grab('b', { x: 0, y: 1, z: 0 });
|
|
83
|
+
expect(store.getState().grabbedId).toBe('a');
|
|
84
|
+
});
|
|
85
|
+
it('掴み中の対象が登録解除されたら idle に戻る', () => {
|
|
86
|
+
const store = createDevGrabStore();
|
|
87
|
+
store.contextValue.registerGrabbable('box', createEntry());
|
|
88
|
+
store.grab('box', { x: 0, y: 1, z: 0 });
|
|
89
|
+
store.contextValue.unregisterGrabbable('box');
|
|
90
|
+
expect(store.getState().phase).toBe('idle');
|
|
91
|
+
expect(store.getState().grabbedId).toBeNull();
|
|
92
|
+
});
|
|
93
|
+
it('ホバー中の対象が登録解除されたら hoveredId が消える', () => {
|
|
94
|
+
const store = createDevGrabStore();
|
|
95
|
+
store.contextValue.registerGrabbable('box', createEntry());
|
|
96
|
+
store.setHovered('box');
|
|
97
|
+
store.contextValue.unregisterGrabbable('box');
|
|
98
|
+
expect(store.getState().hoveredId).toBeNull();
|
|
99
|
+
});
|
|
100
|
+
it('subscribeGrabbedId のリスナーが掴み/離しで呼ばれる', () => {
|
|
101
|
+
const listener = vi.fn();
|
|
102
|
+
const store = createDevGrabStore();
|
|
103
|
+
store.contextValue.registerGrabbable('box', createEntry());
|
|
104
|
+
const unsubscribe = store.contextValue.subscribeGrabbedId(listener);
|
|
105
|
+
store.grab('box', { x: 0, y: 1, z: 0 });
|
|
106
|
+
expect(listener).toHaveBeenCalledTimes(1);
|
|
107
|
+
store.release();
|
|
108
|
+
expect(listener).toHaveBeenCalledTimes(2);
|
|
109
|
+
unsubscribe();
|
|
110
|
+
store.grab('box', { x: 0, y: 1, z: 0 });
|
|
111
|
+
expect(listener).toHaveBeenCalledTimes(2);
|
|
112
|
+
});
|
|
113
|
+
});
|
|
114
|
+
//# sourceMappingURL=store.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"store.test.js","sourceRoot":"","sources":["../../../../../../src/components/DevEnvironment/components/GrabSystem/__tests__/store.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.test.d.ts","sourceRoot":"","sources":["../../../../../../src/components/DevEnvironment/components/GrabSystem/__tests__/utils.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,103 @@
|
|
|
1
|
+
import { describe, expect, it } from 'vitest';
|
|
2
|
+
import { Object3D, Quaternion, Vector3 } from 'three';
|
|
3
|
+
import { GRABBABLE_USER_DATA_KEY } from '../../../../Grabbable/constants';
|
|
4
|
+
import { MAX_ANCESTOR_DEPTH, MAX_HOLD_DISTANCE, MIN_HOLD_DISTANCE } from '../constants';
|
|
5
|
+
import { clampHoldDistance, computeHeldPosition, distanceBetween, findFirstGrabbableId, findGrabbableId, } from '../utils';
|
|
6
|
+
describe('clampHoldDistance', () => {
|
|
7
|
+
it('範囲内の距離はそのまま返す', () => {
|
|
8
|
+
expect(clampHoldDistance(3)).toBe(3);
|
|
9
|
+
});
|
|
10
|
+
it('最小距離未満は MIN_HOLD_DISTANCE に丸める', () => {
|
|
11
|
+
expect(clampHoldDistance(0.2)).toBe(MIN_HOLD_DISTANCE);
|
|
12
|
+
});
|
|
13
|
+
it('最大距離超過は MAX_HOLD_DISTANCE に丸める', () => {
|
|
14
|
+
expect(clampHoldDistance(99)).toBe(MAX_HOLD_DISTANCE);
|
|
15
|
+
});
|
|
16
|
+
});
|
|
17
|
+
describe('distanceBetween', () => {
|
|
18
|
+
it('2点間の距離を返す', () => {
|
|
19
|
+
expect(distanceBetween({ x: 0, y: 0, z: 0 }, { x: 3, y: 4, z: 0 })).toBeCloseTo(5);
|
|
20
|
+
});
|
|
21
|
+
it('同一点は 0 を返す', () => {
|
|
22
|
+
expect(distanceBetween({ x: 1, y: 2, z: 3 }, { x: 1, y: 2, z: 3 })).toBeCloseTo(0);
|
|
23
|
+
});
|
|
24
|
+
});
|
|
25
|
+
describe('computeHeldPosition', () => {
|
|
26
|
+
it('無回転なら前方(-Z)distance の位置を返す', () => {
|
|
27
|
+
const q = { x: 0, y: 0, z: 0, w: 1 };
|
|
28
|
+
const result = computeHeldPosition({ x: 1, y: 2, z: 3 }, q, 2);
|
|
29
|
+
expect(result.x).toBeCloseTo(1);
|
|
30
|
+
expect(result.y).toBeCloseTo(2);
|
|
31
|
+
expect(result.z).toBeCloseTo(1);
|
|
32
|
+
});
|
|
33
|
+
it('three.js の applyQuaternion と同じ結果になる', () => {
|
|
34
|
+
const quaternions = [
|
|
35
|
+
new Quaternion().setFromAxisAngle(new Vector3(0, 1, 0), Math.PI / 2),
|
|
36
|
+
new Quaternion().setFromAxisAngle(new Vector3(1, 0, 0), -Math.PI / 4),
|
|
37
|
+
new Quaternion().setFromAxisAngle(new Vector3(1, 2, 3).normalize(), 1.23),
|
|
38
|
+
];
|
|
39
|
+
const cameraPosition = { x: -2, y: 1.6, z: 5 };
|
|
40
|
+
const distance = 3.5;
|
|
41
|
+
for (const q of quaternions) {
|
|
42
|
+
const expected = new Vector3(0, 0, -1)
|
|
43
|
+
.applyQuaternion(q)
|
|
44
|
+
.multiplyScalar(distance)
|
|
45
|
+
.add(new Vector3(cameraPosition.x, cameraPosition.y, cameraPosition.z));
|
|
46
|
+
const result = computeHeldPosition(cameraPosition, q, distance);
|
|
47
|
+
expect(result.x).toBeCloseTo(expected.x);
|
|
48
|
+
expect(result.y).toBeCloseTo(expected.y);
|
|
49
|
+
expect(result.z).toBeCloseTo(expected.z);
|
|
50
|
+
}
|
|
51
|
+
});
|
|
52
|
+
});
|
|
53
|
+
describe('findGrabbableId', () => {
|
|
54
|
+
it('自身の userData から ID を見つける', () => {
|
|
55
|
+
const obj = new Object3D();
|
|
56
|
+
obj.userData[GRABBABLE_USER_DATA_KEY] = 'target-1';
|
|
57
|
+
expect(findGrabbableId(obj)).toBe('target-1');
|
|
58
|
+
});
|
|
59
|
+
it('親を辿って ID を見つける', () => {
|
|
60
|
+
const root = new Object3D();
|
|
61
|
+
root.userData[GRABBABLE_USER_DATA_KEY] = 'target-2';
|
|
62
|
+
const middle = new Object3D();
|
|
63
|
+
const leaf = new Object3D();
|
|
64
|
+
root.add(middle);
|
|
65
|
+
middle.add(leaf);
|
|
66
|
+
expect(findGrabbableId(leaf)).toBe('target-2');
|
|
67
|
+
});
|
|
68
|
+
it('ID が無ければ null を返す', () => {
|
|
69
|
+
expect(findGrabbableId(new Object3D())).toBeNull();
|
|
70
|
+
expect(findGrabbableId(null)).toBeNull();
|
|
71
|
+
});
|
|
72
|
+
it('最大親階層を超える探索はしない', () => {
|
|
73
|
+
const root = new Object3D();
|
|
74
|
+
root.userData[GRABBABLE_USER_DATA_KEY] = 'too-deep';
|
|
75
|
+
let current = root;
|
|
76
|
+
for (let i = 0; i < MAX_ANCESTOR_DEPTH; i++) {
|
|
77
|
+
const child = new Object3D();
|
|
78
|
+
current.add(child);
|
|
79
|
+
current = child;
|
|
80
|
+
}
|
|
81
|
+
expect(findGrabbableId(current)).toBeNull();
|
|
82
|
+
});
|
|
83
|
+
});
|
|
84
|
+
describe('findFirstGrabbableId', () => {
|
|
85
|
+
it('手前から順に走査して最初の ID を返す', () => {
|
|
86
|
+
const plain = new Object3D();
|
|
87
|
+
const grabbable = new Object3D();
|
|
88
|
+
grabbable.userData[GRABBABLE_USER_DATA_KEY] = 'first';
|
|
89
|
+
const another = new Object3D();
|
|
90
|
+
another.userData[GRABBABLE_USER_DATA_KEY] = 'second';
|
|
91
|
+
const result = findFirstGrabbableId([
|
|
92
|
+
{ object: plain },
|
|
93
|
+
{ object: grabbable },
|
|
94
|
+
{ object: another },
|
|
95
|
+
]);
|
|
96
|
+
expect(result).toBe('first');
|
|
97
|
+
});
|
|
98
|
+
it('掴める対象が無ければ null を返す', () => {
|
|
99
|
+
expect(findFirstGrabbableId([{ object: new Object3D() }])).toBeNull();
|
|
100
|
+
expect(findFirstGrabbableId([])).toBeNull();
|
|
101
|
+
});
|
|
102
|
+
});
|
|
103
|
+
//# sourceMappingURL=utils.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.test.js","sourceRoot":"","sources":["../../../../../../src/components/DevEnvironment/components/GrabSystem/__tests__/utils.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
/** 掴む/離すのキー */
|
|
2
|
+
export declare const GRAB_KEY = "g";
|
|
3
|
+
/** 掴んでいる間のカメラ→対象の最小距離[m](近すぎで自キャラに埋まるのを防ぐ) */
|
|
4
|
+
export declare const MIN_HOLD_DISTANCE = 1;
|
|
5
|
+
/** 掴んでいる間のカメラ→対象の最大距離[m] */
|
|
6
|
+
export declare const MAX_HOLD_DISTANCE = 10;
|
|
7
|
+
/** ホイール1ノッチあたりの距離変化[m] */
|
|
8
|
+
export declare const WHEEL_DISTANCE_STEP = 0.5;
|
|
9
|
+
/** ゴーストの不透明度 */
|
|
10
|
+
export declare const GRAB_GHOST_OPACITY = 0.5;
|
|
11
|
+
/** レイキャストを間引くフレーム間隔(パフォーマンス対策) */
|
|
12
|
+
export declare const RAYCAST_FRAME_INTERVAL = 5;
|
|
13
|
+
/** userData から grabbable ID を辿る際の最大親階層 */
|
|
14
|
+
export declare const MAX_ANCESTOR_DEPTH = 12;
|
|
15
|
+
//# sourceMappingURL=constants.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../src/components/DevEnvironment/components/GrabSystem/constants.ts"],"names":[],"mappings":"AAAA,eAAe;AACf,eAAO,MAAM,QAAQ,MAAM,CAAA;AAE3B,8CAA8C;AAC9C,eAAO,MAAM,iBAAiB,IAAM,CAAA;AAEpC,4BAA4B;AAC5B,eAAO,MAAM,iBAAiB,KAAO,CAAA;AAErC,0BAA0B;AAC1B,eAAO,MAAM,mBAAmB,MAAM,CAAA;AAEtC,gBAAgB;AAChB,eAAO,MAAM,kBAAkB,MAAM,CAAA;AAErC,kCAAkC;AAClC,eAAO,MAAM,sBAAsB,IAAI,CAAA;AAEvC,0CAA0C;AAC1C,eAAO,MAAM,kBAAkB,KAAK,CAAA"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
/** 掴む/離すのキー */
|
|
2
|
+
export const GRAB_KEY = 'g';
|
|
3
|
+
/** 掴んでいる間のカメラ→対象の最小距離[m](近すぎで自キャラに埋まるのを防ぐ) */
|
|
4
|
+
export const MIN_HOLD_DISTANCE = 1.0;
|
|
5
|
+
/** 掴んでいる間のカメラ→対象の最大距離[m] */
|
|
6
|
+
export const MAX_HOLD_DISTANCE = 10.0;
|
|
7
|
+
/** ホイール1ノッチあたりの距離変化[m] */
|
|
8
|
+
export const WHEEL_DISTANCE_STEP = 0.5;
|
|
9
|
+
/** ゴーストの不透明度 */
|
|
10
|
+
export const GRAB_GHOST_OPACITY = 0.5;
|
|
11
|
+
/** レイキャストを間引くフレーム間隔(パフォーマンス対策) */
|
|
12
|
+
export const RAYCAST_FRAME_INTERVAL = 5;
|
|
13
|
+
/** userData から grabbable ID を辿る際の最大親階層 */
|
|
14
|
+
export const MAX_ANCESTOR_DEPTH = 12;
|
|
15
|
+
//# sourceMappingURL=constants.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/components/DevEnvironment/components/GrabSystem/constants.ts"],"names":[],"mappings":"AAAA,eAAe;AACf,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,CAAA;AAE3B,8CAA8C;AAC9C,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,CAAA;AAEpC,4BAA4B;AAC5B,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,CAAA;AAErC,0BAA0B;AAC1B,MAAM,CAAC,MAAM,mBAAmB,GAAG,GAAG,CAAA;AAEtC,gBAAgB;AAChB,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,CAAA;AAErC,kCAAkC;AAClC,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAA;AAEvC,0CAA0C;AAC1C,MAAM,CAAC,MAAM,kBAAkB,GAAG,EAAE,CAAA"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { Object3D } from 'three';
|
|
2
|
+
/**
|
|
3
|
+
* 掴み中ゴースト用の見た目を group 全体に適用する。
|
|
4
|
+
* - GRABBABLE / INTERACTABLE レイヤーを除去してゴースト自身が
|
|
5
|
+
* レイキャスト対象にならないようにする(子が遅延マウントされるため毎フレーム)
|
|
6
|
+
* - マテリアルを半透明化(初回のみパッチ)
|
|
7
|
+
*/
|
|
8
|
+
export declare function applyGrabGhostAppearance(group: Object3D): void;
|
|
9
|
+
//# sourceMappingURL=ghostAppearance.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ghostAppearance.d.ts","sourceRoot":"","sources":["../../../../../src/components/DevEnvironment/components/GrabSystem/ghostAppearance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,QAAQ,EAAE,MAAM,OAAO,CAAA;AAyBrD;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI,CAkB9D"}
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
import { ShaderMaterial } from 'three';
|
|
2
|
+
import { LAYERS } from '../../../../constants/layers';
|
|
3
|
+
import { GRAB_GHOST_OPACITY } from './constants';
|
|
4
|
+
const PATCHED_KEY = '__grabGhostPatched';
|
|
5
|
+
/** ShaderMaterial の fragment shader 末尾に alpha 乗算を注入 */
|
|
6
|
+
function patchShaderAlpha(mat) {
|
|
7
|
+
mat.fragmentShader = mat.fragmentShader.replace(/}\s*$/, ` gl_FragColor.a *= ${GRAB_GHOST_OPACITY.toFixed(2)};\n}`);
|
|
8
|
+
mat.transparent = true;
|
|
9
|
+
mat.depthWrite = false;
|
|
10
|
+
mat.needsUpdate = true;
|
|
11
|
+
}
|
|
12
|
+
/** 通常マテリアルに半透明設定を適用 */
|
|
13
|
+
function patchStandardAlpha(mat) {
|
|
14
|
+
mat.transparent = true;
|
|
15
|
+
mat.opacity = GRAB_GHOST_OPACITY;
|
|
16
|
+
mat.depthWrite = false;
|
|
17
|
+
}
|
|
18
|
+
/**
|
|
19
|
+
* 掴み中ゴースト用の見た目を group 全体に適用する。
|
|
20
|
+
* - GRABBABLE / INTERACTABLE レイヤーを除去してゴースト自身が
|
|
21
|
+
* レイキャスト対象にならないようにする(子が遅延マウントされるため毎フレーム)
|
|
22
|
+
* - マテリアルを半透明化(初回のみパッチ)
|
|
23
|
+
*/
|
|
24
|
+
export function applyGrabGhostAppearance(group) {
|
|
25
|
+
group.traverse((obj) => {
|
|
26
|
+
obj.layers.disable(LAYERS.GRABBABLE);
|
|
27
|
+
obj.layers.disable(LAYERS.INTERACTABLE);
|
|
28
|
+
if (!('material' in obj))
|
|
29
|
+
return;
|
|
30
|
+
const mesh = obj;
|
|
31
|
+
const materials = Array.isArray(mesh.material) ? mesh.material : [mesh.material];
|
|
32
|
+
for (const mat of materials) {
|
|
33
|
+
if (!mat || mat.userData[PATCHED_KEY])
|
|
34
|
+
continue;
|
|
35
|
+
mat.userData[PATCHED_KEY] = true;
|
|
36
|
+
if (mat instanceof ShaderMaterial) {
|
|
37
|
+
patchShaderAlpha(mat);
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
patchStandardAlpha(mat);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
//# sourceMappingURL=ghostAppearance.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ghostAppearance.js","sourceRoot":"","sources":["../../../../../src/components/DevEnvironment/components/GrabSystem/ghostAppearance.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAA;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAA;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAEhD,MAAM,WAAW,GAAG,oBAAoB,CAAA;AAExC,uDAAuD;AACvD,SAAS,gBAAgB,CAAC,GAAmB;IAC3C,GAAG,CAAC,cAAc,GAAG,GAAG,CAAC,cAAc,CAAC,OAAO,CAC7C,OAAO,EACP,uBAAuB,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAC3D,CAAA;IACD,GAAG,CAAC,WAAW,GAAG,IAAI,CAAA;IACtB,GAAG,CAAC,UAAU,GAAG,KAAK,CAAA;IACtB,GAAG,CAAC,WAAW,GAAG,IAAI,CAAA;AACxB,CAAC;AAED,uBAAuB;AACvB,SAAS,kBAAkB,CAAC,GAAa;IACvC,GAAG,CAAC,WAAW,GAAG,IAAI,CAAA;IACtB,GAAG,CAAC,OAAO,GAAG,kBAAkB,CAAA;IAChC,GAAG,CAAC,UAAU,GAAG,KAAK,CAAA;AACxB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,wBAAwB,CAAC,KAAe;IACtD,KAAK,CAAC,QAAQ,CAAC,CAAC,GAAG,EAAE,EAAE;QACrB,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QACpC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;QAEvC,IAAI,CAAC,CAAC,UAAU,IAAI,GAAG,CAAC;YAAE,OAAM;QAChC,MAAM,IAAI,GAAG,GAAW,CAAA;QACxB,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAChF,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;YAC5B,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC;gBAAE,SAAQ;YAC/C,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,IAAI,CAAA;YAChC,IAAI,GAAG,YAAY,cAAc,EAAE,CAAC;gBAClC,gBAAgB,CAAC,GAAG,CAAC,CAAA;YACvB,CAAC;iBAAM,CAAC;gBACN,kBAAkB,CAAC,GAAG,CAAC,CAAA;YACzB,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAA;AACJ,CAAC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import type { DevGrabStore } from './store';
|
|
2
|
+
interface Props {
|
|
3
|
+
store: DevGrabStore;
|
|
4
|
+
}
|
|
5
|
+
/**
|
|
6
|
+
* DevEnvironment 用のローカル掴みシステム
|
|
7
|
+
* <Grabbable> で囲まれた対象を中央クロスヘアで狙って掴み、視点前方に浮かせて運ぶ
|
|
8
|
+
* (本番プラットフォームの GrabSystem と同じ操作感を開発プレビューで再現する)
|
|
9
|
+
*/
|
|
10
|
+
export declare function GrabSystem({ store }: Props): import("react/jsx-runtime").JSX.Element;
|
|
11
|
+
export {};
|
|
12
|
+
//# sourceMappingURL=index.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/DevEnvironment/components/GrabSystem/index.tsx"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAG3C,UAAU,KAAK;IACb,KAAK,EAAE,YAAY,CAAA;CACpB;AAoJD;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,EAAE,KAAK,EAAE,EAAE,KAAK,2CAQ1C"}
|
|
@@ -0,0 +1,147 @@
|
|
|
1
|
+
import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
+
import { useFrame, useThree } from '@react-three/fiber';
|
|
3
|
+
import { Suspense, useEffect, useRef, useSyncExternalStore } from 'react';
|
|
4
|
+
import { Raycaster, Vector2 } from 'three';
|
|
5
|
+
import { LAYERS } from '../../../../constants/layers';
|
|
6
|
+
import { GRAB_KEY, MAX_HOLD_DISTANCE, RAYCAST_FRAME_INTERVAL, WHEEL_DISTANCE_STEP, } from './constants';
|
|
7
|
+
import { applyGrabGhostAppearance } from './ghostAppearance';
|
|
8
|
+
import { computeHeldPosition, findFirstGrabbableId } from './utils';
|
|
9
|
+
const NDC_CENTER = new Vector2(0, 0);
|
|
10
|
+
/**
|
|
11
|
+
* 中央クロスヘアから掴める対象(GRABBABLE レイヤー)を狙うレイキャスター
|
|
12
|
+
*/
|
|
13
|
+
function GrabRaycaster({ store }) {
|
|
14
|
+
const camera = useThree((s) => s.camera);
|
|
15
|
+
const scene = useThree((s) => s.scene);
|
|
16
|
+
const raycasterRef = useRef(new Raycaster());
|
|
17
|
+
const frameCountRef = useRef(0);
|
|
18
|
+
useFrame(() => {
|
|
19
|
+
// 掴み中・ポインターロックなし → ホバーなし
|
|
20
|
+
if (store.getState().phase !== 'idle' || !document.pointerLockElement) {
|
|
21
|
+
store.setHovered(null);
|
|
22
|
+
return;
|
|
23
|
+
}
|
|
24
|
+
// パフォーマンス: 一定フレームに1回だけレイキャスト
|
|
25
|
+
frameCountRef.current++;
|
|
26
|
+
if (frameCountRef.current % RAYCAST_FRAME_INTERVAL !== 0)
|
|
27
|
+
return;
|
|
28
|
+
const raycaster = raycasterRef.current;
|
|
29
|
+
raycaster.layers.set(LAYERS.GRABBABLE);
|
|
30
|
+
raycaster.far = MAX_HOLD_DISTANCE;
|
|
31
|
+
raycaster.setFromCamera(NDC_CENTER, camera);
|
|
32
|
+
const intersects = raycaster.intersectObjects(scene.children, true);
|
|
33
|
+
store.setHovered(findFirstGrabbableId(intersects));
|
|
34
|
+
});
|
|
35
|
+
return null;
|
|
36
|
+
}
|
|
37
|
+
/**
|
|
38
|
+
* 掴む/離す/距離調整/キャンセルの入力を処理する
|
|
39
|
+
* - G: 狙っている対象を掴む / 掴み中なら確定して離す
|
|
40
|
+
* - クリック: 掴み中なら確定して離す
|
|
41
|
+
* - ホイール: 保持距離を増減(上スクロールで遠ざける)
|
|
42
|
+
* - Esc(ポインターロック解除): キャンセル(元位置)
|
|
43
|
+
*/
|
|
44
|
+
function GrabInputHandler({ store }) {
|
|
45
|
+
const camera = useThree((s) => s.camera);
|
|
46
|
+
useEffect(() => {
|
|
47
|
+
const grabOrRelease = () => {
|
|
48
|
+
const state = store.getState();
|
|
49
|
+
if (state.phase === 'holding') {
|
|
50
|
+
store.release();
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
53
|
+
if (!document.pointerLockElement)
|
|
54
|
+
return;
|
|
55
|
+
if (!state.hoveredId)
|
|
56
|
+
return;
|
|
57
|
+
store.grab(state.hoveredId, camera.position);
|
|
58
|
+
};
|
|
59
|
+
const handleKeyDown = (e) => {
|
|
60
|
+
if (e.repeat)
|
|
61
|
+
return;
|
|
62
|
+
if (e.key !== GRAB_KEY && e.key !== GRAB_KEY.toUpperCase())
|
|
63
|
+
return;
|
|
64
|
+
e.preventDefault();
|
|
65
|
+
grabOrRelease();
|
|
66
|
+
};
|
|
67
|
+
// クリックでの確定(ロック取得のためのクリックを誤検出しないよう mousedown 時のロック状態を見る)
|
|
68
|
+
let wasLockedOnMouseDown = false;
|
|
69
|
+
const handleMouseDown = () => {
|
|
70
|
+
wasLockedOnMouseDown = !!document.pointerLockElement;
|
|
71
|
+
};
|
|
72
|
+
const handleClick = () => {
|
|
73
|
+
if (store.getState().phase !== 'holding')
|
|
74
|
+
return;
|
|
75
|
+
if (!wasLockedOnMouseDown)
|
|
76
|
+
return;
|
|
77
|
+
store.release();
|
|
78
|
+
};
|
|
79
|
+
const handleWheel = (e) => {
|
|
80
|
+
if (store.getState().phase !== 'holding')
|
|
81
|
+
return;
|
|
82
|
+
e.preventDefault();
|
|
83
|
+
// 上スクロール(deltaY<0)で遠ざける
|
|
84
|
+
const delta = e.deltaY < 0 ? WHEEL_DISTANCE_STEP : -WHEEL_DISTANCE_STEP;
|
|
85
|
+
store.adjustHoldDistance(delta);
|
|
86
|
+
};
|
|
87
|
+
// Esc 等でポインターロックが外れたらキャンセル(元位置のまま)
|
|
88
|
+
const handlePointerLockChange = () => {
|
|
89
|
+
if (document.pointerLockElement)
|
|
90
|
+
return;
|
|
91
|
+
store.cancel();
|
|
92
|
+
};
|
|
93
|
+
window.addEventListener('keydown', handleKeyDown);
|
|
94
|
+
window.addEventListener('mousedown', handleMouseDown);
|
|
95
|
+
window.addEventListener('click', handleClick);
|
|
96
|
+
window.addEventListener('wheel', handleWheel, { passive: false });
|
|
97
|
+
document.addEventListener('pointerlockchange', handlePointerLockChange);
|
|
98
|
+
return () => {
|
|
99
|
+
window.removeEventListener('keydown', handleKeyDown);
|
|
100
|
+
window.removeEventListener('mousedown', handleMouseDown);
|
|
101
|
+
window.removeEventListener('click', handleClick);
|
|
102
|
+
window.removeEventListener('wheel', handleWheel);
|
|
103
|
+
document.removeEventListener('pointerlockchange', handlePointerLockChange);
|
|
104
|
+
};
|
|
105
|
+
}, [store, camera]);
|
|
106
|
+
return null;
|
|
107
|
+
}
|
|
108
|
+
/**
|
|
109
|
+
* 掴んでいる対象を視点前方に浮かせて表示するゴースト(半透明)
|
|
110
|
+
* 掴んだ時点の回転・スケールを維持し、位置だけ毎フレーム更新する
|
|
111
|
+
* 位置は確定用に heldPosition としてストアへ書き込む
|
|
112
|
+
*/
|
|
113
|
+
function GrabbedObjectGhost({ store }) {
|
|
114
|
+
const groupRef = useRef(null);
|
|
115
|
+
const camera = useThree((s) => s.camera);
|
|
116
|
+
const grabbedId = useSyncExternalStore(store.subscribe, () => store.getState().grabbedId);
|
|
117
|
+
const entry = grabbedId ? store.getEntry(grabbedId) : undefined;
|
|
118
|
+
useFrame(() => {
|
|
119
|
+
const group = groupRef.current;
|
|
120
|
+
if (!group)
|
|
121
|
+
return;
|
|
122
|
+
const { phase, holdDistance, heldRotation, heldScale } = store.getState();
|
|
123
|
+
if (phase !== 'holding') {
|
|
124
|
+
group.visible = false;
|
|
125
|
+
return;
|
|
126
|
+
}
|
|
127
|
+
const position = computeHeldPosition(camera.position, camera.quaternion, holdDistance);
|
|
128
|
+
group.position.set(position.x, position.y, position.z);
|
|
129
|
+
group.rotation.set(heldRotation.x, heldRotation.y, heldRotation.z);
|
|
130
|
+
group.scale.setScalar(heldScale);
|
|
131
|
+
group.visible = true;
|
|
132
|
+
store.updateHeldPosition(position);
|
|
133
|
+
applyGrabGhostAppearance(group);
|
|
134
|
+
});
|
|
135
|
+
if (!grabbedId || !entry)
|
|
136
|
+
return null;
|
|
137
|
+
return (_jsx("group", { ref: groupRef, visible: false, children: _jsx(Suspense, { fallback: null, children: entry.renderGhost() }) }));
|
|
138
|
+
}
|
|
139
|
+
/**
|
|
140
|
+
* DevEnvironment 用のローカル掴みシステム
|
|
141
|
+
* <Grabbable> で囲まれた対象を中央クロスヘアで狙って掴み、視点前方に浮かせて運ぶ
|
|
142
|
+
* (本番プラットフォームの GrabSystem と同じ操作感を開発プレビューで再現する)
|
|
143
|
+
*/
|
|
144
|
+
export function GrabSystem({ store }) {
|
|
145
|
+
return (_jsxs(_Fragment, { children: [_jsx(GrabRaycaster, { store: store }), _jsx(GrabbedObjectGhost, { store: store }), _jsx(GrabInputHandler, { store: store })] }));
|
|
146
|
+
}
|
|
147
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/components/DevEnvironment/components/GrabSystem/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import type { GrabbableContextValue, GrabbableEntry } from '../../../../contexts/GrabbableContext';
|
|
2
|
+
import type { Position3D, Rotation3D } from '../../../../types/movement';
|
|
3
|
+
export type DevGrabPhase = 'idle' | 'holding';
|
|
4
|
+
export interface DevGrabState {
|
|
5
|
+
phase: DevGrabPhase;
|
|
6
|
+
/** クロスヘアが狙っている grabbable ID */
|
|
7
|
+
hoveredId: string | null;
|
|
8
|
+
/** 掴んでいる grabbable ID */
|
|
9
|
+
grabbedId: string | null;
|
|
10
|
+
/** カメラ→対象の保持距離[m] */
|
|
11
|
+
holdDistance: number;
|
|
12
|
+
/** ゴーストの現在位置(確定時に使う。毎フレーム更新) */
|
|
13
|
+
heldPosition: Position3D;
|
|
14
|
+
/** 掴んだ時点の回転(掴み中は維持) */
|
|
15
|
+
heldRotation: Rotation3D;
|
|
16
|
+
/** 掴んだ時点のスケール */
|
|
17
|
+
heldScale: number;
|
|
18
|
+
}
|
|
19
|
+
/**
|
|
20
|
+
* DevEnvironment 用のローカル掴みストア(React 非依存)
|
|
21
|
+
* <Grabbable> 向けの GrabbableContextValue 実装(contextValue)と、
|
|
22
|
+
* DevEnvironment 内の GrabSystem が使う状態・アクションを提供する
|
|
23
|
+
*/
|
|
24
|
+
export interface DevGrabStore {
|
|
25
|
+
getState: () => DevGrabState;
|
|
26
|
+
/** 状態変化を購読する(useSyncExternalStore 互換) */
|
|
27
|
+
subscribe: (listener: () => void) => () => void;
|
|
28
|
+
getEntry: (id: string) => GrabbableEntry | undefined;
|
|
29
|
+
setHovered: (id: string | null) => void;
|
|
30
|
+
/** 狙っている対象を掴む(保持距離はカメラ→対象の距離から算出) */
|
|
31
|
+
grab: (id: string, cameraPosition: Position3D) => void;
|
|
32
|
+
adjustHoldDistance: (delta: number) => void;
|
|
33
|
+
/** ゴーストが毎フレーム書き込む(通知なし・getState で読む高頻度パターン) */
|
|
34
|
+
updateHeldPosition: (position: Position3D) => void;
|
|
35
|
+
/** 確定して離す(onMove で新しい姿勢をワールド側へ通知) */
|
|
36
|
+
release: () => void;
|
|
37
|
+
/** キャンセルして離す(onMove は呼ばない=元位置のまま) */
|
|
38
|
+
cancel: () => void;
|
|
39
|
+
/** <Grabbable> / GrabbableProvider に渡す実装 */
|
|
40
|
+
contextValue: GrabbableContextValue;
|
|
41
|
+
}
|
|
42
|
+
export declare function createDevGrabStore(): DevGrabStore;
|
|
43
|
+
//# sourceMappingURL=store.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../../../../src/components/DevEnvironment/components/GrabSystem/store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AAClG,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAGxE,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,SAAS,CAAA;AAE7C,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,YAAY,CAAA;IACnB,+BAA+B;IAC/B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,yBAAyB;IACzB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,qBAAqB;IACrB,YAAY,EAAE,MAAM,CAAA;IACpB,gCAAgC;IAChC,YAAY,EAAE,UAAU,CAAA;IACxB,uBAAuB;IACvB,YAAY,EAAE,UAAU,CAAA;IACxB,iBAAiB;IACjB,SAAS,EAAE,MAAM,CAAA;CAClB;AAED;;;;GAIG;AACH,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,YAAY,CAAA;IAC5B,yCAAyC;IACzC,SAAS,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,KAAK,MAAM,IAAI,CAAA;IAC/C,QAAQ,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,cAAc,GAAG,SAAS,CAAA;IACpD,UAAU,EAAE,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAA;IACvC,qCAAqC;IACrC,IAAI,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,UAAU,KAAK,IAAI,CAAA;IACtD,kBAAkB,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IAC3C,+CAA+C;IAC/C,kBAAkB,EAAE,CAAC,QAAQ,EAAE,UAAU,KAAK,IAAI,CAAA;IAClD,qCAAqC;IACrC,OAAO,EAAE,MAAM,IAAI,CAAA;IACnB,qCAAqC;IACrC,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,4CAA4C;IAC5C,YAAY,EAAE,qBAAqB,CAAA;CACpC;AAID,wBAAgB,kBAAkB,IAAI,YAAY,CAgFjD"}
|