@xrift/world-components 0.40.2 → 0.41.2
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/PhysicsPlayer.d.ts +4 -1
- package/dist/components/DevEnvironment/components/PhysicsPlayer.d.ts.map +1 -1
- package/dist/components/DevEnvironment/components/PhysicsPlayer.js +28 -7
- package/dist/components/DevEnvironment/components/PhysicsPlayer.js.map +1 -1
- package/dist/components/DevEnvironment/constants.d.ts +13 -0
- package/dist/components/DevEnvironment/constants.d.ts.map +1 -1
- package/dist/components/DevEnvironment/constants.js +13 -0
- package/dist/components/DevEnvironment/constants.js.map +1 -1
- package/dist/components/DevEnvironment/index.d.ts.map +1 -1
- package/dist/components/DevEnvironment/index.js +34 -3
- package/dist/components/DevEnvironment/index.js.map +1 -1
- 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/package.json +3 -3
|
@@ -1,9 +1,12 @@
|
|
|
1
|
+
import type { MutableRefObject } from 'react';
|
|
2
|
+
import type { PlayerMovement } from '../../../types/movement';
|
|
1
3
|
interface Props {
|
|
2
4
|
moveSpeed: number;
|
|
3
5
|
spawnPosition: [number, number, number];
|
|
4
6
|
respawnThreshold: number;
|
|
5
7
|
allowInfiniteJump: boolean;
|
|
8
|
+
movementRef?: MutableRefObject<PlayerMovement>;
|
|
6
9
|
}
|
|
7
|
-
export declare function PhysicsPlayer({ moveSpeed, spawnPosition, respawnThreshold, allowInfiniteJump, }: Props): import("react/jsx-runtime").JSX.Element;
|
|
10
|
+
export declare function PhysicsPlayer({ moveSpeed, spawnPosition, respawnThreshold, allowInfiniteJump, movementRef, }: Props): import("react/jsx-runtime").JSX.Element;
|
|
8
11
|
export {};
|
|
9
12
|
//# sourceMappingURL=PhysicsPlayer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PhysicsPlayer.d.ts","sourceRoot":"","sources":["../../../../src/components/DevEnvironment/components/PhysicsPlayer.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"PhysicsPlayer.d.ts","sourceRoot":"","sources":["../../../../src/components/DevEnvironment/components/PhysicsPlayer.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAA;AAY7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAU7D,UAAU,KAAK;IACb,SAAS,EAAE,MAAM,CAAA;IACjB,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;IACvC,gBAAgB,EAAE,MAAM,CAAA;IACxB,iBAAiB,EAAE,OAAO,CAAA;IAC1B,WAAW,CAAC,EAAE,gBAAgB,CAAC,cAAc,CAAC,CAAA;CAC/C;AAED,wBAAgB,aAAa,CAAC,EAC5B,SAAS,EACT,aAAa,EACb,gBAAgB,EAChB,iBAAiB,EACjB,WAAW,GACZ,EAAE,KAAK,2CA0OP"}
|
|
@@ -5,9 +5,8 @@ import { CapsuleCollider, CuboidCollider, RigidBody, } from '@react-three/rapier
|
|
|
5
5
|
import { Vector3 } from 'three';
|
|
6
6
|
import { useSpawnPoint } from '../../../hooks/useSpawnPoint';
|
|
7
7
|
import { LAYERS } from '../../../constants/layers';
|
|
8
|
-
import { PLAYER_HALF_HEIGHT, PLAYER_RADIUS, JUMP_VELOCITY, LINEAR_DAMPING, CAMERA_Y_OFFSET, } from '../constants';
|
|
9
|
-
|
|
10
|
-
export function PhysicsPlayer({ moveSpeed, spawnPosition, respawnThreshold, allowInfiniteJump, }) {
|
|
8
|
+
import { PLAYER_HALF_HEIGHT, PLAYER_RADIUS, JUMP_VELOCITY, LINEAR_DAMPING, CAMERA_Y_OFFSET, DEV_AVATAR_HEIGHT, } from '../constants';
|
|
9
|
+
export function PhysicsPlayer({ moveSpeed, spawnPosition, respawnThreshold, allowInfiniteJump, movementRef, }) {
|
|
11
10
|
const rigidBodyRef = useRef(null);
|
|
12
11
|
const avatarGroupRef = useRef(null);
|
|
13
12
|
const headRef = useRef(null);
|
|
@@ -126,16 +125,38 @@ export function PhysicsPlayer({ moveSpeed, spawnPosition, respawnThreshold, allo
|
|
|
126
125
|
const pos = rb.translation();
|
|
127
126
|
camera.position.set(pos.x, pos.y + CAMERA_Y_OFFSET, pos.z);
|
|
128
127
|
// --- DummyAvatar 位置同期 ---
|
|
128
|
+
camera.getWorldDirection(forwardRef.current);
|
|
129
|
+
const yaw = -Math.atan2(forwardRef.current.x, -forwardRef.current.z);
|
|
130
|
+
const pitch = Math.asin(forwardRef.current.y);
|
|
129
131
|
if (avatarGroupRef.current) {
|
|
130
132
|
avatarGroupRef.current.position.set(pos.x, pos.y + CAMERA_Y_OFFSET, pos.z);
|
|
131
|
-
camera.getWorldDirection(forwardRef.current);
|
|
132
|
-
const yaw = -Math.atan2(forwardRef.current.x, -forwardRef.current.z);
|
|
133
|
-
const pitch = Math.asin(forwardRef.current.y);
|
|
134
133
|
avatarGroupRef.current.rotation.set(0, yaw, 0);
|
|
135
134
|
if (headRef.current) {
|
|
136
135
|
headRef.current.rotation.set(pitch, 0, 0);
|
|
137
136
|
}
|
|
138
137
|
}
|
|
138
|
+
// --- useUsers 用の PlayerMovement を更新（足元基準） ---
|
|
139
|
+
if (movementRef) {
|
|
140
|
+
const m = movementRef.current;
|
|
141
|
+
m.position.x = pos.x;
|
|
142
|
+
m.position.y = pos.y - (PLAYER_HALF_HEIGHT + PLAYER_RADIUS);
|
|
143
|
+
m.position.z = pos.z;
|
|
144
|
+
if (len > 0) {
|
|
145
|
+
m.direction.x = moveX / moveSpeed;
|
|
146
|
+
m.direction.z = moveZ / moveSpeed;
|
|
147
|
+
m.horizontalSpeed = moveSpeed;
|
|
148
|
+
}
|
|
149
|
+
else {
|
|
150
|
+
m.direction.x = 0;
|
|
151
|
+
m.direction.z = 0;
|
|
152
|
+
m.horizontalSpeed = 0;
|
|
153
|
+
}
|
|
154
|
+
m.verticalSpeed = vy;
|
|
155
|
+
m.rotation.yaw = yaw;
|
|
156
|
+
m.rotation.pitch = pitch;
|
|
157
|
+
m.isGrounded = isGroundedRef.current;
|
|
158
|
+
m.isJumping = !isGroundedRef.current && vy > 0;
|
|
159
|
+
}
|
|
139
160
|
// --- リスポーン ---
|
|
140
161
|
if (pos.y < respawnThreshold) {
|
|
141
162
|
if (spawnPoint) {
|
|
@@ -154,6 +175,6 @@ export function PhysicsPlayer({ moveSpeed, spawnPosition, respawnThreshold, allo
|
|
|
154
175
|
isGroundedRef.current = true;
|
|
155
176
|
}, onIntersectionExit: () => {
|
|
156
177
|
isGroundedRef.current = false;
|
|
157
|
-
} })] }), _jsxs("group", { ref: avatarGroupRef, children: [_jsxs("mesh", { castShadow: true, ref: headRef, children: [_jsx("boxGeometry", { args: [0.2, 0.1, 0.2] }), _jsx("meshLambertMaterial", { color: "#ffcccc" })] }), _jsxs("mesh", { castShadow: true, position: [0, -
|
|
178
|
+
} })] }), _jsxs("group", { ref: avatarGroupRef, children: [_jsxs("mesh", { castShadow: true, ref: headRef, children: [_jsx("boxGeometry", { args: [0.2, 0.1, 0.2] }), _jsx("meshLambertMaterial", { color: "#ffcccc" })] }), _jsxs("mesh", { castShadow: true, position: [0, -DEV_AVATAR_HEIGHT * 0.55, 0], children: [_jsx("boxGeometry", { args: [0.3, DEV_AVATAR_HEIGHT, 0.1] }), _jsx("meshLambertMaterial", { color: "#ccffcc" })] })] })] }));
|
|
158
179
|
}
|
|
159
180
|
//# sourceMappingURL=PhysicsPlayer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PhysicsPlayer.js","sourceRoot":"","sources":["../../../../src/components/DevEnvironment/components/PhysicsPlayer.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"PhysicsPlayer.js","sourceRoot":"","sources":["../../../../src/components/DevEnvironment/components/PhysicsPlayer.tsx"],"names":[],"mappings":"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"}
|
|
@@ -20,4 +20,17 @@ export declare const CROSSHAIR_SIZE = 20;
|
|
|
20
20
|
export declare const CROSSHAIR_THICKNESS = 2;
|
|
21
21
|
export declare const CROSSHAIR_ACTIVE_THICKNESS = 3;
|
|
22
22
|
export declare const HIGHLIGHT_COLOR = "#4dabf7";
|
|
23
|
+
/**
|
|
24
|
+
* DevEnvironment 上のローカルユーザー定数
|
|
25
|
+
* 本番環境では xrift-frontend が UsersProvider に実装を注入するが、
|
|
26
|
+
* DevEnvironment ではダミーのユーザー情報を提供して useUsers を機能させる
|
|
27
|
+
*/
|
|
28
|
+
export declare const DEV_LOCAL_USER_ID = "dev-local-user";
|
|
29
|
+
export declare const DEV_LOCAL_USER_DISPLAY_NAME = "Dev User";
|
|
30
|
+
/**
|
|
31
|
+
* DummyAvatar の見た目に基づく高さ情報
|
|
32
|
+
* eyeHeight はカプセル底面（地面）からカメラまでの距離
|
|
33
|
+
*/
|
|
34
|
+
export declare const DEV_AVATAR_HEIGHT = 1.5;
|
|
35
|
+
export declare const DEV_EYE_HEIGHT: number;
|
|
23
36
|
//# sourceMappingURL=constants.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/components/DevEnvironment/constants.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,eAAO,MAAM,kBAAkB,MAAM,CAAA;AACrC,eAAO,MAAM,aAAa,MAAM,CAAA;AAChC,eAAO,MAAM,UAAU,IAAM,CAAA;AAC7B,eAAO,MAAM,aAAa,MAAM,CAAA;AAChC,eAAO,MAAM,cAAc,MAAM,CAAA;AACjC,eAAO,MAAM,eAAe,OAAO,CAAA;AACnC,eAAO,MAAM,mBAAmB,MAAM,CAAA;AACtC,eAAO,MAAM,sBAAsB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAqB,CAAA;AACjF,eAAO,MAAM,eAAe,OAAO,CAAA;AACnC,eAAO,MAAM,2BAA2B,OAAO,CAAA;AAC/C,eAAO,MAAM,mBAAmB,OAAO,CAAA;AACvC,eAAO,MAAM,kBAAkB,OAAO,CAAA;AAEtC;;GAEG;AACH,eAAO,MAAM,cAAc,KAAK,CAAA;AAChC,eAAO,MAAM,mBAAmB,IAAI,CAAA;AACpC,eAAO,MAAM,0BAA0B,IAAI,CAAA;AAC3C,eAAO,MAAM,eAAe,YAAY,CAAA"}
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/components/DevEnvironment/constants.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,eAAO,MAAM,kBAAkB,MAAM,CAAA;AACrC,eAAO,MAAM,aAAa,MAAM,CAAA;AAChC,eAAO,MAAM,UAAU,IAAM,CAAA;AAC7B,eAAO,MAAM,aAAa,MAAM,CAAA;AAChC,eAAO,MAAM,cAAc,MAAM,CAAA;AACjC,eAAO,MAAM,eAAe,OAAO,CAAA;AACnC,eAAO,MAAM,mBAAmB,MAAM,CAAA;AACtC,eAAO,MAAM,sBAAsB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAqB,CAAA;AACjF,eAAO,MAAM,eAAe,OAAO,CAAA;AACnC,eAAO,MAAM,2BAA2B,OAAO,CAAA;AAC/C,eAAO,MAAM,mBAAmB,OAAO,CAAA;AACvC,eAAO,MAAM,kBAAkB,OAAO,CAAA;AAEtC;;GAEG;AACH,eAAO,MAAM,cAAc,KAAK,CAAA;AAChC,eAAO,MAAM,mBAAmB,IAAI,CAAA;AACpC,eAAO,MAAM,0BAA0B,IAAI,CAAA;AAC3C,eAAO,MAAM,eAAe,YAAY,CAAA;AAExC;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,mBAAmB,CAAA;AACjD,eAAO,MAAM,2BAA2B,aAAa,CAAA;AAErD;;;GAGG;AACH,eAAO,MAAM,iBAAiB,MAAM,CAAA;AACpC,eAAO,MAAM,cAAc,QAAuD,CAAA"}
|
|
@@ -20,4 +20,17 @@ export const CROSSHAIR_SIZE = 20;
|
|
|
20
20
|
export const CROSSHAIR_THICKNESS = 2;
|
|
21
21
|
export const CROSSHAIR_ACTIVE_THICKNESS = 3;
|
|
22
22
|
export const HIGHLIGHT_COLOR = '#4dabf7';
|
|
23
|
+
/**
|
|
24
|
+
* DevEnvironment 上のローカルユーザー定数
|
|
25
|
+
* 本番環境では xrift-frontend が UsersProvider に実装を注入するが、
|
|
26
|
+
* DevEnvironment ではダミーのユーザー情報を提供して useUsers を機能させる
|
|
27
|
+
*/
|
|
28
|
+
export const DEV_LOCAL_USER_ID = 'dev-local-user';
|
|
29
|
+
export const DEV_LOCAL_USER_DISPLAY_NAME = 'Dev User';
|
|
30
|
+
/**
|
|
31
|
+
* DummyAvatar の見た目に基づく高さ情報
|
|
32
|
+
* eyeHeight はカプセル底面（地面）からカメラまでの距離
|
|
33
|
+
*/
|
|
34
|
+
export const DEV_AVATAR_HEIGHT = 1.5;
|
|
35
|
+
export const DEV_EYE_HEIGHT = PLAYER_HALF_HEIGHT + PLAYER_RADIUS + CAMERA_Y_OFFSET;
|
|
23
36
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/components/DevEnvironment/constants.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,CAAA;AACrC,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,CAAA;AAChC,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,CAAA;AAC7B,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,CAAA;AAChC,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,CAAA;AACjC,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,CAAA;AACnC,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,EAAE,CAAA;AACtC,MAAM,CAAC,MAAM,sBAAsB,GAA6B,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,CAAA;AACjF,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,CAAA;AACnC,MAAM,CAAC,MAAM,2BAA2B,GAAG,IAAI,CAAA;AAC/C,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,CAAA;AACvC,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,CAAA;AAEtC;;GAEG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,EAAE,CAAA;AAChC,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAA;AACpC,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,CAAA;AAC3C,MAAM,CAAC,MAAM,eAAe,GAAG,SAAS,CAAA"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/components/DevEnvironment/constants.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,CAAA;AACrC,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,CAAA;AAChC,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,CAAA;AAC7B,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,CAAA;AAChC,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,CAAA;AACjC,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,CAAA;AACnC,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,EAAE,CAAA;AACtC,MAAM,CAAC,MAAM,sBAAsB,GAA6B,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,CAAA;AACjF,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,CAAA;AACnC,MAAM,CAAC,MAAM,2BAA2B,GAAG,IAAI,CAAA;AAC/C,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,CAAA;AACvC,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,CAAA;AAEtC;;GAEG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,EAAE,CAAA;AAChC,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAA;AACpC,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,CAAA;AAC3C,MAAM,CAAC,MAAM,eAAe,GAAG,SAAS,CAAA;AAExC;;;;GAIG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,gBAAgB,CAAA;AACjD,MAAM,CAAC,MAAM,2BAA2B,GAAG,UAAU,CAAA;AAErD;;;GAGG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,CAAA;AACpC,MAAM,CAAC,MAAM,cAAc,GAAG,kBAAkB,GAAG,aAAa,GAAG,eAAe,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/DevEnvironment/index.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/DevEnvironment/index.tsx"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAmCpC,MAAM,MAAM,mBAAmB,GAAG,KAAK,CAAA;AAmBvC,wBAAgB,cAAc,CAAC,EAC7B,QAAQ,EACR,MAAM,EACN,SAAsB,EACtB,OAAc,EACd,aAAsC,EACtC,gBAAsC,EACtC,aAAa,EACb,gBAAgB,EAAE,mBAAmB,GACtC,EAAE,KAAK,2CAqFP"}
|
|
@@ -1,17 +1,29 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
-
import { useCallback, useMemo, useState, useSyncExternalStore } from 'react';
|
|
2
|
+
import { useCallback, useMemo, useRef, useState, useSyncExternalStore } from 'react';
|
|
3
3
|
import { Canvas } from '@react-three/fiber';
|
|
4
4
|
import { PointerLockControls } from '@react-three/drei';
|
|
5
5
|
import { Physics } from '@react-three/rapier';
|
|
6
6
|
import { SpawnPointProvider } from '../../contexts/SpawnPointContext';
|
|
7
|
+
import { UsersProvider } from '../../contexts/UsersContext';
|
|
7
8
|
import { PCFShadowMap } from 'three';
|
|
8
9
|
import { toThreeOutputBufferType } from './utils';
|
|
9
|
-
import { DEFAULT_SPAWN_POSITION, DEFAULT_GRAVITY, DEFAULT_ALLOW_INFINITE_JUMP, DEFAULT_CAMERA_NEAR, DEFAULT_CAMERA_FAR, MOVE_SPEED, RESPAWN_Y_THRESHOLD, } from './constants';
|
|
10
|
+
import { DEFAULT_SPAWN_POSITION, DEFAULT_GRAVITY, DEFAULT_ALLOW_INFINITE_JUMP, DEFAULT_CAMERA_NEAR, DEFAULT_CAMERA_FAR, MOVE_SPEED, RESPAWN_Y_THRESHOLD, DEV_LOCAL_USER_ID, DEV_LOCAL_USER_DISPLAY_NAME, DEV_AVATAR_HEIGHT, DEV_EYE_HEIGHT, } from './constants';
|
|
10
11
|
import { PhysicsPlayer } from './components/PhysicsPlayer';
|
|
11
12
|
import { CenterRaycaster } from './components/CenterRaycaster';
|
|
12
13
|
import { Crosshair } from './components/Crosshair';
|
|
13
14
|
import { PointerLockStatus } from './components/PointerLockStatus';
|
|
14
15
|
import { ControlsHelp } from './components/ControlsHelp';
|
|
16
|
+
const DEV_LOCAL_USER = {
|
|
17
|
+
id: DEV_LOCAL_USER_ID,
|
|
18
|
+
displayName: DEV_LOCAL_USER_DISPLAY_NAME,
|
|
19
|
+
avatarUrl: null,
|
|
20
|
+
isGuest: true,
|
|
21
|
+
};
|
|
22
|
+
const DEV_LOCAL_AVATAR_HEIGHT = {
|
|
23
|
+
height: DEV_AVATAR_HEIGHT,
|
|
24
|
+
eyeHeight: DEV_EYE_HEIGHT,
|
|
25
|
+
};
|
|
26
|
+
const EMPTY_REMOTE_USERS = [];
|
|
15
27
|
const containerStyle = {
|
|
16
28
|
width: '100vw',
|
|
17
29
|
height: '100vh',
|
|
@@ -30,6 +42,25 @@ export function DevEnvironment({ children, camera, moveSpeed = MOVE_SPEED, shado
|
|
|
30
42
|
const [isHit, setIsHit] = useState(false);
|
|
31
43
|
const isPointerLocked = useSyncExternalStore(subscribePointerLock, getPointerLockSnapshot, () => false);
|
|
32
44
|
const handleHitChange = useCallback((hit) => setIsHit(hit), []);
|
|
45
|
+
// ローカルユーザーの位置情報を保持する ref。PhysicsPlayer が毎フレーム書き込み、
|
|
46
|
+
// useUsers().getLocalMovement() がここから読み取る（再レンダリングは発生しない）
|
|
47
|
+
const localMovementRef = useRef({
|
|
48
|
+
position: { x: spawnPosition[0], y: spawnPosition[1], z: spawnPosition[2] },
|
|
49
|
+
direction: { x: 0, z: 0 },
|
|
50
|
+
horizontalSpeed: 0,
|
|
51
|
+
verticalSpeed: 0,
|
|
52
|
+
rotation: { yaw: 0, pitch: 0 },
|
|
53
|
+
isGrounded: true,
|
|
54
|
+
isJumping: false,
|
|
55
|
+
});
|
|
56
|
+
const usersImplementation = useMemo(() => ({
|
|
57
|
+
localUser: DEV_LOCAL_USER,
|
|
58
|
+
remoteUsers: EMPTY_REMOTE_USERS,
|
|
59
|
+
getMovement: () => undefined,
|
|
60
|
+
getLocalMovement: () => localMovementRef.current,
|
|
61
|
+
getAvatarHeight: () => undefined,
|
|
62
|
+
getLocalAvatarHeight: () => DEV_LOCAL_AVATAR_HEIGHT,
|
|
63
|
+
}), []);
|
|
33
64
|
const gravity = physicsConfig?.gravity ?? DEFAULT_GRAVITY;
|
|
34
65
|
const allowInfiniteJump = physicsConfig?.allowInfiniteJump ?? DEFAULT_ALLOW_INFINITE_JUMP;
|
|
35
66
|
const outputBufferType = toThreeOutputBufferType(outputBufferTypeStr);
|
|
@@ -45,6 +76,6 @@ export function DevEnvironment({ children, camera, moveSpeed = MOVE_SPEED, shado
|
|
|
45
76
|
fov: cameraFov,
|
|
46
77
|
near: cameraNear,
|
|
47
78
|
far: cameraFar,
|
|
48
|
-
}, gl: glProps, children: [_jsx(PointerLockControls, {}), _jsx(CenterRaycaster, { onHitChange: handleHitChange }), _jsx(Physics, { gravity: [0, -gravity, 0], timeStep: "vary", children:
|
|
79
|
+
}, gl: glProps, children: [_jsx(PointerLockControls, {}), _jsx(CenterRaycaster, { onHitChange: handleHitChange }), _jsx(Physics, { gravity: [0, -gravity, 0], timeStep: "vary", children: _jsx(SpawnPointProvider, { children: _jsxs(UsersProvider, { implementation: usersImplementation, children: [_jsx(PhysicsPlayer, { moveSpeed: moveSpeed, spawnPosition: spawnPosition, respawnThreshold: respawnThreshold, allowInfiniteJump: allowInfiniteJump, movementRef: localMovementRef }), children] }) }) })] }), _jsx(Crosshair, { active: isHit }), _jsx(PointerLockStatus, { isLocked: isPointerLocked }), _jsx(ControlsHelp, {})] }));
|
|
49
80
|
}
|
|
50
81
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/DevEnvironment/index.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/DevEnvironment/index.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAA;AACpF,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAC3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAA;AACrE,OAAO,EAAE,aAAa,EAAqC,MAAM,6BAA6B,CAAA;AAG9F,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAA;AAEpC,OAAO,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAA;AACjD,OAAO,EACL,sBAAsB,EACtB,eAAe,EACf,2BAA2B,EAC3B,mBAAmB,EACnB,kBAAkB,EAClB,UAAU,EACV,mBAAmB,EACnB,iBAAiB,EACjB,2BAA2B,EAC3B,iBAAiB,EACjB,cAAc,GACf,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAA;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAExD,MAAM,cAAc,GAAS;IAC3B,EAAE,EAAE,iBAAiB;IACrB,WAAW,EAAE,2BAA2B;IACxC,SAAS,EAAE,IAAI;IACf,OAAO,EAAE,IAAI;CACd,CAAA;AAED,MAAM,uBAAuB,GAAiB;IAC5C,MAAM,EAAE,iBAAiB;IACzB,SAAS,EAAE,cAAc;CAC1B,CAAA;AAED,MAAM,kBAAkB,GAAW,EAAE,CAAA;AAIrC,MAAM,cAAc,GAAwB;IAC1C,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,OAAO;IACf,QAAQ,EAAE,UAAU;CACrB,CAAA;AAED,SAAS,oBAAoB,CAAC,QAAoB;IAChD,QAAQ,CAAC,gBAAgB,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAA;IACxD,OAAO,GAAG,EAAE;QACV,QAAQ,CAAC,mBAAmB,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAA;IAC7D,CAAC,CAAA;AACH,CAAC;AAED,SAAS,sBAAsB;IAC7B,OAAO,QAAQ,CAAC,kBAAkB,KAAK,IAAI,CAAA;AAC7C,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,EAC7B,QAAQ,EACR,MAAM,EACN,SAAS,GAAG,UAAU,EACtB,OAAO,GAAG,IAAI,EACd,aAAa,GAAG,sBAAsB,EACtC,gBAAgB,GAAG,mBAAmB,EACtC,aAAa,EACb,gBAAgB,EAAE,mBAAmB,GAC/B;IACN,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IACzC,MAAM,eAAe,GAAG,oBAAoB,CAC1C,oBAAoB,EACpB,sBAAsB,EACtB,GAAG,EAAE,CAAC,KAAK,CACZ,CAAA;IACD,MAAM,eAAe,GAAG,WAAW,CAAC,CAAC,GAAY,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAA;IAExE,mDAAmD;IACnD,yDAAyD;IACzD,MAAM,gBAAgB,GAAG,MAAM,CAAiB;QAC9C,QAAQ,EAAE,EAAE,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE;QAC3E,SAAS,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE;QACzB,eAAe,EAAE,CAAC;QAClB,aAAa,EAAE,CAAC;QAChB,QAAQ,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE;QAC9B,UAAU,EAAE,IAAI;QAChB,SAAS,EAAE,KAAK;KACjB,CAAC,CAAA;IAEF,MAAM,mBAAmB,GAAG,OAAO,CACjC,GAAG,EAAE,CAAC,CAAC;QACL,SAAS,EAAE,cAAc;QACzB,WAAW,EAAE,kBAAkB;QAC/B,WAAW,EAAE,GAAG,EAAE,CAAC,SAAS;QAC5B,gBAAgB,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,OAAO;QAChD,eAAe,EAAE,GAAG,EAAE,CAAC,SAAS;QAChC,oBAAoB,EAAE,GAAG,EAAE,CAAC,uBAAuB;KACpD,CAAC,EACF,EAAE,CACH,CAAA;IAED,MAAM,OAAO,GAAG,aAAa,EAAE,OAAO,IAAI,eAAe,CAAA;IACzD,MAAM,iBAAiB,GACrB,aAAa,EAAE,iBAAiB,IAAI,2BAA2B,CAAA;IAEjE,MAAM,gBAAgB,GAAG,uBAAuB,CAAC,mBAAmB,CAAC,CAAA;IACrE,MAAM,OAAO,GAAG,OAAO,CACrB,GAAG,EAAE,CACH,gBAAgB;QACd,CAAC,CAAC,EAAE,qBAAqB,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAE;QAClE,CAAC,CAAC,EAAE,qBAAqB,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,EACpD,CAAC,gBAAgB,CAAC,CACnB,CAAA;IAED,MAAM,cAAc,GAAG,MAAM,EAAE,QAAQ,IAAI,aAAa,CAAA;IACxD,MAAM,SAAS,GAAG,MAAM,EAAE,GAAG,IAAI,EAAE,CAAA;IACnC,MAAM,UAAU,GAAG,MAAM,EAAE,IAAI,IAAI,mBAAmB,CAAA;IACtD,MAAM,SAAS,GAAG,MAAM,EAAE,GAAG,IAAI,kBAAkB,CAAA;IAEnD,OAAO,CACL,eAAK,KAAK,EAAE,cAAc,aACxB,MAAC,MAAM,IACL,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,KAAK,EACjD,MAAM,EAAE;oBACN,QAAQ,EAAE,cAAc;oBACxB,GAAG,EAAE,SAAS;oBACd,IAAI,EAAE,UAAU;oBAChB,GAAG,EAAE,SAAS;iBACf,EACD,EAAE,EAAE,OAAO,aAEX,KAAC,mBAAmB,KAAG,EACvB,KAAC,eAAe,IAAC,WAAW,EAAE,eAAe,GAAI,EACjD,KAAC,OAAO,IAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAC,MAAM,YACjD,KAAC,kBAAkB,cACjB,MAAC,aAAa,IAAC,cAAc,EAAE,mBAAmB,aAChD,KAAC,aAAa,IACZ,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,aAAa,EAC5B,gBAAgB,EAAE,gBAAgB,EAClC,iBAAiB,EAAE,iBAAiB,EACpC,WAAW,EAAE,gBAAgB,GAC7B,EACD,QAAQ,IACK,GACG,GACb,IACH,EACT,KAAC,SAAS,IAAC,MAAM,EAAE,KAAK,GAAI,EAC5B,KAAC,iBAAiB,IAAC,QAAQ,EAAE,eAAe,GAAI,EAChD,KAAC,YAAY,KAAG,IACZ,CACP,CAAA;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/Mirror/index.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAGrC,YAAY,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AA8B1C,wBAAgB,MAAM,CAAC,EACrB,QAAuB,EACvB,QAAoB,EACpB,IAAa,EACb,KAAgB,EAChB,iBAAuB,EACvB,WAAkC,GACnC,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/Mirror/index.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAGrC,YAAY,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AA8B1C,wBAAgB,MAAM,CAAC,EACrB,QAAuB,EACvB,QAAoB,EACpB,IAAa,EACb,KAAgB,EAChB,iBAAuB,EACvB,WAAkC,GACnC,EAAE,WAAW,2CAiHb"}
|
|
@@ -84,19 +84,18 @@ export function Mirror({ position = [0, 2.5, -9], rotation = [0, 0, 0], size = [
|
|
|
84
84
|
fallbackRef.current = null;
|
|
85
85
|
};
|
|
86
86
|
}, [size[0], size[1], color, textureResolution, gl]);
|
|
87
|
-
// Reflector
|
|
87
|
+
// Reflectorのリフレクションカメラの全レイヤーを有効化
|
|
88
88
|
// VRMFirstPersonのレイヤー設定により、メインカメラではThirdPersonOnlyレイヤー（頭部）が
|
|
89
89
|
// 非表示になっているが、鏡には全身を映す必要があるため
|
|
90
|
-
// onBeforeRenderでメインカメラの設定がコピーされるため、毎フレーム設定が必要
|
|
91
90
|
useFrame(({ camera, gl }) => {
|
|
92
91
|
const reflector = reflectorRef.current;
|
|
93
92
|
if (!reflector)
|
|
94
93
|
return;
|
|
94
|
+
// VR モードでは XR カメラを使用
|
|
95
|
+
const activeCamera = gl.xr.isPresenting ? gl.xr.getCamera() : camera;
|
|
95
96
|
// LOD: カメラと鏡の距離に応じて Reflector ↔ envMap を切り替え
|
|
96
97
|
const fallback = fallbackRef.current;
|
|
97
98
|
if (fallback && groupRef.current) {
|
|
98
|
-
// VR モードでは XR カメラのワールド座標を使用
|
|
99
|
-
const activeCamera = gl.xr.isPresenting ? gl.xr.getCamera() : camera;
|
|
100
99
|
_cameraWorldPos.setFromMatrixPosition(activeCamera.matrixWorld);
|
|
101
100
|
const distance = _cameraWorldPos.distanceTo(groupRef.current.getWorldPosition(_worldPos));
|
|
102
101
|
const useReflector = shouldUseReflector(distance, lodDistance, usingReflectorRef.current, LOD_HYSTERESIS_RATIO);
|
|
@@ -108,10 +107,18 @@ export function Mirror({ position = [0, 2.5, -9], rotation = [0, 0, 0], size = [
|
|
|
108
107
|
}
|
|
109
108
|
if (!reflector.visible)
|
|
110
109
|
return;
|
|
111
|
-
//
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
110
|
+
// three r184+ ではリフレクション用カメラがメインカメラごとの clone に変わり、
|
|
111
|
+
// getReflectionCamera(camera) で取得する。clone はメインカメラのレイヤー設定
|
|
112
|
+
// （ThirdPersonOnly 無効）を継承するため、そのままだと鏡に頭部が映らない。
|
|
113
|
+
// リフレクションカメラの全レイヤーを有効化して全身を映す。
|
|
114
|
+
// 型定義にないため any 相当でキャストしてアクセスする。
|
|
115
|
+
const reflectorApi = reflector;
|
|
116
|
+
if (typeof reflectorApi.getReflectionCamera === 'function') {
|
|
117
|
+
reflectorApi.getReflectionCamera(activeCamera).layers.enableAll();
|
|
118
|
+
}
|
|
119
|
+
else if (reflectorApi.camera) {
|
|
120
|
+
// three r183 以前: 単一の内部カメラ
|
|
121
|
+
reflectorApi.camera.layers.enableAll();
|
|
115
122
|
}
|
|
116
123
|
});
|
|
117
124
|
return _jsx("group", { ref: groupRef, position: position, rotation: rotation });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Mirror/index.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Mirror/index.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;AAEzC,OAAO,EAAE,KAAK,EAAS,IAAI,EAAE,aAAa,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAClF,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAA;AAC7D,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAExE,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAA;AAI5C,MAAM,SAAS,GAAG,IAAI,OAAO,EAAE,CAAA;AAC/B,MAAM,eAAe,GAAG,IAAI,OAAO,EAAE,CAAA;AAErC,MAAM,oBAAoB,GAAG;;;;;;;;;CAS5B,CAAA;AAED,MAAM,sBAAsB,GAAG;;;;;;;;;;;;CAY9B,CAAA;AAED,MAAM,UAAU,MAAM,CAAC,EACrB,QAAQ,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EACvB,QAAQ,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EACpB,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EACb,KAAK,GAAG,QAAQ,EAChB,iBAAiB,GAAG,GAAG,EACvB,WAAW,GAAG,oBAAoB,GACtB;IACZ,MAAM,QAAQ,GAAG,MAAM,CAAQ,IAAI,CAAC,CAAA;IACpC,MAAM,YAAY,GAAG,MAAM,CAAmB,IAAI,CAAC,CAAA;IACnD,MAAM,WAAW,GAAG,MAAM,CAAc,IAAI,CAAC,CAAA;IAC7C,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,CAAA;IACtC,MAAM,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;IAEhC,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,YAAY,GAAG,QAAQ,CAAC,OAAO,CAAA;QACrC,IAAI,CAAC,YAAY;YAAE,OAAM;QAEzB,MAAM,QAAQ,GAAG,IAAI,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;QAEpD,yBAAyB;QACzB,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;QAC1C,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,iBAAiB,CAAC,CAAA;QACxE,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,iBAAiB,CAAC,CAAA;QAEzE,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,QAAQ,EAAE;YACxC,QAAQ,EAAE,KAAK;YACf,YAAY;YACZ,aAAa;YACb,KAAK;YACL,WAAW,EAAE,CAAC,EAAE,kDAAkD;SACnE,CAAC,CAAA;QAEF,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;QAC/B,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;QAC3B,YAAY,CAAC,OAAO,GAAG,SAAS,CAAA;QAEhC,uCAAuC;QACvC,MAAM,gBAAgB,GAAG,IAAI,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;QAC5D,MAAM,gBAAgB,GAAG,IAAI,cAAc,CAAC;YAC1C,YAAY,EAAE,oBAAoB;YAClC,cAAc,EAAE,sBAAsB;YACtC,QAAQ,EAAE;gBACR,SAAS,EAAE,EAAE,KAAK,EAAE,IAAI,KAAK,CAAC,KAAK,CAAC,EAAE;gBACtC,SAAS,EAAE,EAAE,KAAK,EAAE,IAAI,KAAK,CAAC,QAAQ,CAAC,EAAE;gBACzC,YAAY,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE;aAC7B;SACF,CAAC,CAAA;QACF,MAAM,YAAY,GAAG,IAAI,IAAI,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAA;QACjE,YAAY,CAAC,OAAO,GAAG,KAAK,CAAA;QAC5B,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;QAC9B,WAAW,CAAC,OAAO,GAAG,YAAY,CAAA;QAElC,iBAAiB,CAAC,OAAO,GAAG,IAAI,CAAA;QAEhC,OAAO,GAAG,EAAE;YACV,IAAI,YAAY,EAAE,CAAC;gBACjB,YAAY,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;gBAC9B,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;gBACjC,QAAQ,CAAC,OAAO,EAAE,CAAA;gBAClB,SAAS,CAAC,OAAO,EAAE,EAAE,CAAA;gBACrB,gBAAgB,CAAC,OAAO,EAAE,CAAA;gBAC1B,gBAAgB,CAAC,OAAO,EAAE,CAAA;YAC5B,CAAC;YACD,YAAY,CAAC,OAAO,GAAG,IAAI,CAAA;YAC3B,WAAW,CAAC,OAAO,GAAG,IAAI,CAAA;QAC5B,CAAC,CAAA;IACH,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,iBAAiB,EAAE,EAAE,CAAC,CAAC,CAAA;IAEpD,iCAAiC;IACjC,4DAA4D;IAC5D,6BAA6B;IAC7B,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE;QAC1B,MAAM,SAAS,GAAG,YAAY,CAAC,OAAO,CAAA;QACtC,IAAI,CAAC,SAAS;YAAE,OAAM;QAEtB,qBAAqB;QACrB,MAAM,YAAY,GAAG,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,MAAM,CAAA;QAEpE,6CAA6C;QAC7C,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAA;QACpC,IAAI,QAAQ,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;YACjC,eAAe,CAAC,qBAAqB,CAAC,YAAY,CAAC,WAAW,CAAC,CAAA;YAC/D,MAAM,QAAQ,GAAG,eAAe,CAAC,UAAU,CACzC,QAAQ,CAAC,OAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAC7C,CAAA;YACD,MAAM,YAAY,GAAG,kBAAkB,CACrC,QAAQ,EACR,WAAW,EACX,iBAAiB,CAAC,OAAO,EACzB,oBAAoB,CACrB,CAAA;YAED,IAAI,YAAY,KAAK,iBAAiB,CAAC,OAAO,EAAE,CAAC;gBAC/C,iBAAiB,CAAC,OAAO,GAAG,YAAY,CAAA;gBACxC,SAAS,CAAC,OAAO,GAAG,YAAY,CAAA;gBAChC,QAAQ,CAAC,OAAO,GAAG,CAAC,YAAY,CAAA;YAClC,CAAC;QACH,CAAC;QAED,IAAI,CAAC,SAAS,CAAC,OAAO;YAAE,OAAM;QAE9B,kDAAkD;QAClD,yDAAyD;QACzD,+CAA+C;QAC/C,+BAA+B;QAC/B,gCAAgC;QAChC,MAAM,YAAY,GAAG,SAGpB,CAAA;QACD,IAAI,OAAO,YAAY,CAAC,mBAAmB,KAAK,UAAU,EAAE,CAAC;YAC3D,YAAY,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,CAAA;QACnE,CAAC;aAAM,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;YAC/B,0BAA0B;YAC1B,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,CAAA;QACxC,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,gBAAO,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,GAAI,CAAA;AACzE,CAAC"}
|
|
@@ -26,6 +26,6 @@ export const ScreenShareDisplay = memo(({ id, position = DEFAULT_POSITION, rotat
|
|
|
26
26
|
startScreenShare();
|
|
27
27
|
}
|
|
28
28
|
}, [isSharing, startScreenShare, stopScreenShare]);
|
|
29
|
-
return (_jsxs("group", { position: position, rotation: rotation, children: [_jsxs(Interactable, { id: id, onInteract: handleInteract, interactionText: interactionText, children: [_jsxs("mesh", { visible: !hasVideo, children: [_jsx("planeGeometry", { args: [screenSize[0], screenSize[1]] }), _jsx("meshBasicMaterial", { side: THREE.FrontSide, toneMapped: false, color: "#1a1a2a" })] }), _jsxs("mesh", { visible: hasVideo, children: [_jsx("planeGeometry", { args: [videoSize[0], videoSize[1]] }), _jsx("meshBasicMaterial", { map: texture, side: THREE.FrontSide, toneMapped: false })] })] }), !hasVideo && (_jsx(Text, { position: [0, 0, 0.01], fontSize: width * 0.05, color: "#666666", anchorX: "center", anchorY: "middle", textAlign: "center", "material-side": THREE.FrontSide, children: isRoomConnected ? 'クリックして画面共有' : '
|
|
29
|
+
return (_jsxs("group", { position: position, rotation: rotation, children: [_jsxs(Interactable, { id: id, onInteract: handleInteract, interactionText: interactionText, children: [_jsxs("mesh", { visible: !hasVideo, children: [_jsx("planeGeometry", { args: [screenSize[0], screenSize[1]] }), _jsx("meshBasicMaterial", { side: THREE.FrontSide, toneMapped: false, color: "#1a1a2a" })] }), _jsxs("mesh", { visible: hasVideo, children: [_jsx("planeGeometry", { args: [videoSize[0], videoSize[1]] }), _jsx("meshBasicMaterial", { map: texture, side: THREE.FrontSide, toneMapped: false })] })] }), !hasVideo && (_jsx(Text, { position: [0, 0, 0.01], fontSize: width * 0.05, color: "#666666", anchorX: "center", anchorY: "middle", textAlign: "center", "material-side": THREE.FrontSide, children: isRoomConnected ? 'クリックして画面共有' : '音声通話に接続できていません' }))] }));
|
|
30
30
|
});
|
|
31
31
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/ScreenShareDisplay/index.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AACxC,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAClD,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAA;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAKzC,SAAS;AACT,MAAM,aAAa,GAAG,CAAC,CAAA;AACvB,MAAM,gBAAgB,GAA6B,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;AAC5D,MAAM,gBAAgB,GAA6B,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;AAE5D;;;GAGG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,CAAC,CAAC,EACtC,EAAE,EACF,QAAQ,GAAG,gBAAgB,EAC3B,QAAQ,GAAG,gBAAgB,EAC3B,KAAK,GAAG,aAAa,EACrB,SAAS,GACH,EAAE,EAAE;IACV,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,gBAAgB,EAAE,eAAe,EAAE,eAAe,EAAE,GAAG,qBAAqB,EAAE,CAAA;IAC/G,MAAM,eAAe,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAA;IACzD,MAAM,UAAU,GAAG,OAAO,CAAmB,GAAG,EAAE,CAAC,CAAC,KAAK,EAAE,KAAK,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAA;IACtF,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,eAAe,CAAC,YAAY,EAAE,UAAU,EAAE,SAAS,CAAC,CAAA;IAE7F,MAAM,cAAc,GAAG,WAAW,CAAC,GAAG,EAAE;QACtC,IAAI,SAAS,EAAE,CAAC;YACd,eAAe,EAAE,CAAA;QACnB,CAAC;aAAM,CAAC;YACN,gBAAgB,EAAE,CAAA;QACpB,CAAC;IACH,CAAC,EAAE,CAAC,SAAS,EAAE,gBAAgB,EAAE,eAAe,CAAC,CAAC,CAAA;IAElD,OAAO,CACL,iBAAO,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,aAC3C,MAAC,YAAY,IACX,EAAE,EAAE,EAAE,EACN,UAAU,EAAE,cAAc,EAC1B,eAAe,EAAE,eAAe,aAGhC,gBAAM,OAAO,EAAE,CAAC,QAAQ,aACtB,wBAAe,IAAI,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,GAAI,EACvD,4BACE,IAAI,EAAE,KAAK,CAAC,SAAS,EACrB,UAAU,EAAE,KAAK,EACjB,KAAK,EAAC,SAAS,GACf,IACG,EAEP,gBAAM,OAAO,EAAE,QAAQ,aACrB,wBAAe,IAAI,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,GAAI,EACrD,4BACE,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,KAAK,CAAC,SAAS,EACrB,UAAU,EAAE,KAAK,GACjB,IACG,IACM,EAGd,CAAC,QAAQ,IAAI,CACZ,KAAC,IAAI,IACH,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,EACtB,QAAQ,EAAE,KAAK,GAAG,IAAI,EACtB,KAAK,EAAC,SAAS,EACf,OAAO,EAAC,QAAQ,EAChB,OAAO,EAAC,QAAQ,EAChB,SAAS,EAAC,QAAQ,mBACH,KAAK,CAAC,SAAS,YAE7B,eAAe,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/ScreenShareDisplay/index.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@xrift/world-components",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.41.2",
|
|
4
4
|
"description": "Shared components and utilities for Xrift worlds",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -58,11 +58,11 @@
|
|
|
58
58
|
"@react-three/uikit": "^1.0.62",
|
|
59
59
|
"@triplex/api": "^0.1.4",
|
|
60
60
|
"@types/react": "^18.3.12",
|
|
61
|
-
"@types/three": "^0.
|
|
61
|
+
"@types/three": "^0.185.0",
|
|
62
62
|
"@vitejs/plugin-react": "^6.0.1",
|
|
63
63
|
"jsdom": "^28.0.0",
|
|
64
64
|
"react-dom": "^19.2.0",
|
|
65
|
-
"three": "^0.
|
|
65
|
+
"three": "^0.185.0",
|
|
66
66
|
"typescript": "^5.6.3",
|
|
67
67
|
"vitest": "^4.0.17"
|
|
68
68
|
}
|