12 Commits

Author SHA1 Message Date
Tom Boullay d29b01e398 feat(repair): broken parts spawn from exploded model node positions
🔍 Lint / 🪄 Check lint (push) Has been cancelled
🔍 Lint / 🎨 Check format (push) Has been cancelled
🔍 Lint / 🔎 Typecheck (push) Has been cancelled
📊 Quality / 🔒 Security Audit (push) Has been cancelled
📊 Quality / 📋 Dependency Freshness (push) Has been cancelled
📊 Quality / 📦 Bundle Size (push) Has been cancelled
🔍 Lint / 🏗 Build (push) Has been cancelled
Render the exploded mission model during the repairing step so broken
nodes (e.g. ebike refroidisseur) stay visible in the world, and surface
their world positions to RepairRepairingStep so broken pieces spawn
from where they belong on the model rather than from a static offset.

- ExplodableModel: add hideNodeNames (mesh visibility off, restored on
  unmount) and nodeAnchorNames + onNodeAnchorsChange (per-frame world
  positions debounced via signature so React state updates only when
  the values actually move).
- RepairGame: render ExplodableModel during 'repairing' with the broken
  node names hidden + anchors forwarded; threads brokenAnchors state
  to RepairRepairingStep.
- RepairScanSequence + RepairRepairingStep: propagate targetNodeName
  through scanned and fallback broken-part lists.
- RepairRepairingStep: broken parts spawn at brokenAnchors[targetNodeName]
  when set, falling back to legacy BROKEN_PART_START_OFFSETS otherwise.
2026-06-02 19:12:38 +02:00
Tom Boullay 6edc5f7972 docs: refresh hand-tracking notes and drop context-lost investigation 2026-06-02 19:06:32 +02:00
Tom Boullay ae35eb1dfb feat(handtracking): restyle svg visualizer and add silhouette fallback 2026-06-02 19:05:39 +02:00
Tom Boullay 4de86f4e58 feat(repair): align mission data with new pylone glb and broken-part workflow
- Update pylone path references from /models/pylone/model.gltf to .glb
  (galleryModels, mapInstancingConfig, repairMissions). The new glb
  exports a single cable node 'cable2' (no cable1).
- Pylon brokenParts: drop lampe and panneau2; the pylon design no longer
  has detached broken pieces (the cable is just missing from the model).
- Pylon replacement cables target the pylon's 'cable2' node world position
  via targetNodeName (used by the upcoming broken-anchor wiring).
- Ebike refroidisseur replacement and brokenPart both target the bike's
  'refroidisseur' node so the broken piece spawns from its original
  location and the replacement can install in the same slot.
2026-06-02 19:01:47 +02:00
Tom Boullay 5b123f9704 feat(repair): soft-lock mutually exclusive replacement parts
When a replacement part with a caseLockGroup is grabbed, sibling parts
sharing the same group become non-interactable and ghosted (35% opacity)
until the held part is released. This implements the pylon cable choice
where the player picks either cable1 or cable2 (both valid) without
being able to grab both simultaneously.

- GrabbableObject: add disabled prop (skips interaction frame logic and
  unmounts InteractableObject so it does not register with the manager)
  and onGrabChange callback fired on press, release, hand grab, and hand
  release. Force-releases when disabled becomes true mid-grab.
- SimpleModel: add opacity prop, traversed onto cloned mesh materials
  (safe because cloneResources clones materials per instance).
- RepairObjectModel: forward ghosted prop as opacity 0.35.
- RepairRepairingStep: track heldPartByLockGroup and pass disabled +
  ghosted to siblings of the currently held part.
2026-06-02 18:46:34 +02:00
Tom Boullay d1bf438465 feat(repair): inject ebike + pylon parts at packderelance anchors
- Ebike replacement parts: cooling core (correct, anchored at refroidisseur)
  + four distractors anchored at cabledroit/cablegauche/pucehaut/pucebas.
  Removes the ad-hoc gant_l/talkie distractors in favor of consistent
  case-anchored visuals.
- Pylon replacement parts: cable1 + cable2 (alternative correct, both with
  caseLockGroup 'pylon-cable' for upcoming soft-lock) + refroidisseur and
  two puce distractors anchored to packderelance.
- Farm replacement parts kept as-is (caseAnchor undefined falls back to
  placeholder slot positions for backward compatibility).
- RepairGame threads anchors from RepairCaseModel through RepairMissionCase
  to RepairRepairingStep; replacement-part initial position now resolves
  to the anchor world position when caseAnchor is set, falling back to the
  legacy slot index otherwise.
2026-06-02 18:37:12 +02:00
Tom Boullay d2ce990165 feat(repair): support multiple required parts and per-part case anchor
- RepairMissionConfig.requiredReplacementPartId (string) is replaced by
  requiredReplacementPartIds (readonly string[]) so a mission can accept
  several alternative correct parts (e.g. pylon will accept either cable).
- RepairMissionPartConfig gains optional caseAnchor (where the standalone
  spawns inside packderelance), caseLockGroup (mutually exclusive parts),
  and targetNodeName (snap onto a node of the broken model rather than a
  placeholder slot in the case).
- RepairScannedBrokenPart gains targetNodeName so scan results can carry
  this hint through to the repairing step.
- RepairRepairingStep validation logic (placed/wrong/feedback) now matches
  any id in requiredReplacementPartIds. Existing data is migrated mechanically
  (single-element arrays); part-level new fields are wired in subsequent
  commits.
2026-06-02 18:26:45 +02:00
Tom Boullay 7d2a257e84 feat(repair): expose case part anchors and fix lid node name
- Fix REPAIR_CASE_LID_NODE_NAME from "partiesup" to "partsup" (the actual
  node name in packderelance.gltf), restoring the lid open/close animation
  that was silently no-oping since introduction.
- Add REPAIR_CASE_PART_ANCHOR_NAMES (cabledroit, cablegauche, pucehaut,
  pucebas, refroidisseur) and REPAIR_CASE_PART_ANCHOR_FALLBACKS for
  case-local positions used when the GLTF lacks a node (refroidisseur).
- RepairCaseModel now resolves these anchor nodes on mount, hides existing
  meshes underneath them, and creates lightweight Object3D placeholders for
  missing names so the anchoring pipeline is uniform.
- Each frame, anchor world positions are converted to step-local space and
  emitted via the new onAnchorsChange callback (debounced via signature like
  placeholders). Consumers added in subsequent commits.
2026-06-02 18:20:43 +02:00
Tom Boullay 58eb60292f update: model pylone 2026-06-02 18:01:14 +02:00
Tom Boullay 73c6d7d50d fix(handtracking): bump browser camera to 640x480 for detection
The browser MediaPipe model (hand_landmarker.task float16) was failing
to detect hands at 320x240 — MediaPipe ran for 10s straight without
ever returning a hand. Bumping the requested camera resolution to
640x480 (browser only — backend still ships 320x240 JPEGs over the
WebSocket) makes the model reliably pick hands up.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-06-02 17:39:43 +02:00
Tom Boullay d9cacdad12 fix(handtracking): stabilize provider root and linger enabled
(1) HandTrackingProvider always renders the same JSX root
(HandTrackingRuntime) so toggling `enabled` no longer remounts the
<Canvas> below — that remount was destroying the WebGL context every
time the player entered an interaction zone.

(2) Add HAND_TRACKING_LINGER_MS (2s) cooldown on `enabled` so brief
walk-throughs of a trigger zone don't tear down MediaPipe before it
has time to initialize the webcam + model + first frame (cold start
~800ms).

Resolves the WebGL context lost + respawn loop and restores visible
hand tracking in the backend runtime. Browser JS runtime detection
quality is a separate follow-up.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-06-02 17:27:04 +02:00
Tom Boullay ab88ab722f Update intro.mp4 2026-06-02 17:24:56 +02:00
83 changed files with 866 additions and 680 deletions
+68 -20
View File
@@ -10,17 +10,23 @@ It is now also available to the production repair flow when a mission reaches a
## Runtime Flow ## Runtime Flow
1. The browser captures webcam frames in `src/hooks/handTracking/useRemoteHandTracking.ts`. The frontend can run hand tracking with two interchangeable sources, selected from the debug source controller:
2. Frames are sent to the local Python backend over WebSocket.
3. The backend runs MediaPipe hand landmark detection. - **Browser JS** (`src/hooks/handTracking/useBrowserHandTracking.ts`) runs MediaPipe `hand_landmarker.task` directly in the browser via `@mediapipe/tasks-vision`. Default for debug.
4. The backend returns hand data including landmarks, handedness, score, center point, and `isFist`. - **Backend** (`src/hooks/handTracking/useRemoteHandTracking.ts`) sends webcam frames as JPEG over WebSocket to a local Python process that runs MediaPipe and returns landmarks.
5. React stores the latest snapshot in the hand tracking provider.
6. `GrabbableObject` reads that snapshot each frame and uses fist state plus raycasting to grab objects. Both sources funnel into the same `HandTrackingContext` so all consumers see one shared snapshot:
7. `HandTrackingGlove` reads the same snapshot and places the rigged `gant_l` and `gant_r` models on the detected hands when hand tracking is active.
1. The active source captures or receives landmarks.
2. The hook applies an EMA smoothing pass on the landmarks before publishing the snapshot.
3. `HandTrackingProvider` exposes that snapshot through React context.
4. `GrabbableObject` reads the snapshot each frame and uses the fist state plus raycasting to grab objects.
5. `HandTrackingGlove` reads the same snapshot and places a rigged glove on each detected hand.
6. `HandTrackingVisualizer` paints an SVG wireframe overlay on top of the canvas.
## Activation Rules ## Activation Rules
Hand tracking is intentionally gated so the webcam and backend are not used all the time. Hand tracking is gated so the webcam and runtime are only spun up when actually needed.
The debug activation conditions are: The debug activation conditions are:
@@ -28,16 +34,26 @@ The debug activation conditions are:
- scene mode is `physics` - scene mode is `physics`
- the player is near an interaction, is holding an object, or is hand-holding an object - the player is near an interaction, is holding an object, or is hand-holding an object
This keeps hand tracking active while the player is inside an interaction zone, even if the camera is not aimed directly at the object.
The production repair activation conditions are: The production repair activation conditions are:
- active `mainState` is `ebike`, `pylon`, or `farm` - active `mainState` is `ebike`, `pylon`, or `farm`
- the active mission step is `inspected`, `repairing`, `reassembling`, or `done` - the active mission step is `inspected`, `repairing`, `reassembling`, or `done`
This keeps the webcam off during `waiting`, `fragmented`, and `scanning`, then enables hand input only when the repair flow is expected to use hands. This keeps the webcam off during `waiting`, `fragmented`, and `scanning`.
In the current production repair flow, `inspected` uses a two-fists hold gesture to advance to `fragmented`. The hold must last one second and is independent from local object interaction distance once the mission is in the correct state. Keyboard input for the same transition is handled separately by the repair case trigger, so pressing `E` requires the case to be focused through the shared interaction system. ### Linger
Once activation turns off (player walks back out of a trigger zone, or a mission step transitions away), the runtime stays alive for `HAND_TRACKING_LINGER_MS` (2000 ms) before being torn down. This gives MediaPipe enough time to finish initializing the webcam and load the model on a fresh entry — without the linger, a quick walk-through of a trigger zone never produces a detected hand.
## Provider Stability
`HandTrackingProvider` always renders the same JSX root (`HandTrackingRuntime`) and exposes `enabled` as a prop. Returning two different element types (`<HandTrackingContext value=IDLE>` vs `<ActiveHandTrackingProvider>`) used to be the historical shape and was the root cause of WebGL context loss: every `enabled` toggle forced React to remount the entire subtree, including the `<Canvas>`, which destroyed the WebGL renderer.
The two source hooks are therefore mounted in permanence with an `enabled` flag that they early-return on. No webcam or MediaPipe resources are created while `enabled` is false.
## StrictMode Resilience
In development, `<StrictMode>` mounts → unmounts → remounts each effect to surface non-idempotent code. The two source hooks delay their actual `start()` call by `HAND_TRACKING_RUNTIME_START_DELAY_MS` (80 ms) and clear the timer on cleanup, so a StrictMode double-mount or a rapid `nearby` flicker never reaches `getUserMedia` twice.
## Backend ## Backend
@@ -52,7 +68,27 @@ The Python process uses MediaPipe and the local model file:
backend/hand_landmarker.task backend/hand_landmarker.task
``` ```
The backend sends normalized hand coordinates and landmarks. The frontend treats the values as screen-space inputs, then maps them into world space with the active Three.js camera. The frontend sends JPEG frames at `HAND_TRACKING_FRAME_WIDTH × HAND_TRACKING_FRAME_HEIGHT` (320×240) to keep WebSocket bandwidth low. The backend sends normalized hand coordinates and landmarks.
## Browser MediaPipe
The browser path uses `hand_landmarker.task` (float16) downloaded from Google's MediaPipe model storage. The requested webcam resolution is **640×480** (`HAND_TRACKING_BROWSER_CAMERA_WIDTH/HEIGHT`), independent from the backend's 320×240. The float16 model is more sensitive than the backend Python model and needs the higher-resolution frame to detect hands reliably.
The MediaPipe delegate is currently `"GPU"`. CPU works too but is significantly slower; on a loaded scene the inference drops to ~5fps and the user feels noticeable lag during grab. MediaPipe creates its own WebGL context separate from Three.js, so there is no direct contention.
A singleton instance of `HandLandmarker` is cached in `src/lib/handTracking/browserHandTracking.ts`. `releaseBrowserHandLandmarker()` is called on cleanup and on WebGL context lost.
## Smoothing
MediaPipe at ~10 fps produces noticeable landmark jitter that, when fed raw into the scene, makes both the glove rig and any grabbed object tremble.
A simple exponential moving average is applied to every landmark before the snapshot is published:
```ts
smoothed.x = previous.x * (1 - factor) + next.x * factor;
```
The factor is `HAND_TRACKING_LANDMARK_SMOOTHING` (0.4). Hands are matched across frames by `handedness` so left/right don't bleed into each other.
## Frontend Data Shape ## Frontend Data Shape
@@ -106,24 +142,36 @@ This is less expressive than true depth-aware hand movement, but it is more stab
The current debug UI includes: The current debug UI includes:
- `HandTrackingDebugPanel` inside `DebugOverlayLayout` for status, usage, loaded glove model, server state, hand count, and fist state - `HandTrackingDebugPanel` inside `DebugOverlayLayout` for status, usage, loaded glove model, server state, hand count, and fist state
- `HandTrackingVisualizer` for the SVG landmark wireframe fallback - `HandTrackingVisualizer` for the SVG landmark overlay
- `HandTrackingGlove` for the left-hand `gant_l` and right-hand `gant_r` models in the R3F scene - `HandTrackingFallback` for the last-resort hand silhouette overlay
- `HandTrackingGlove` for the per-hand rigged glove models in the R3F scene
- `r3f-perf` for render performance - `r3f-perf` for render performance
- `lil-gui` for scene, camera, lighting, interaction, and grab controls - `lil-gui` for scene, camera, lighting, interaction, and grab controls
The hand tracking debug panel is a compact HTML grid outside the canvas. `Model loaded` displays the successfully loaded glove models. The SVG hand wireframe is only a fallback while models are loading or if a glove model fails to load. The SVG visualizer uses a "blueish hand" style: white connection lines between landmarks, cyan circles with a dark blue outline. The outline gets thicker when the hand is detected as a fist, so the user gets a visual confirmation of the grab gesture without having to look at the debug panel.
The fallback overlay (`HandTrackingFallback`) draws a simple open-hand or fist silhouette positioned on the detected wrist landmark. It only renders for a hand whose matching glove is in the `"error"` state in `useHandTrackingGloveStatus`. This guarantees the user always sees something on their hand even when the 3D glove model fails to load.
## Glove Models ## Glove Models
The current glove MVP uses `public/models/gant_l/model.gltf` and `public/models/gant_r/model.gltf`, which contain GLTF skins and armatures. Each model is positioned, oriented, and scaled from palm landmarks, then each finger bone chain is rotated toward the matching MediaPipe landmark chain. `HandTrackingGlove` loads `public/models/gant_l/model.gltf` for both hands. The right hand applies `scale.x = -1` at the group level to mirror the mesh, so the thumb ends up on the correct side. Both hands therefore share the same rig and the same material.
The glove models are intentionally smaller than the raw SVG overlay so they do not dominate the camera view. The historical `public/models/gant_r/model.gltf` is kept as legacy but is not loaded by the frontend — its GLB embeds three skeletons (`Hand_l`, `Hand_l_pad`, `Hand_r`) plus a `galet` mesh, which made the finger rig unreliable.
The `gant_l` material is set to `alphaMode: OPAQUE` with `doubleSided: true`. The opaque mode prevents transparency sorting issues that made folded fingers disappear behind the palm; the double-sided flag covers the back faces revealed by the mirror scale on the right hand.
Two additional glove variants exist on disk:
- `public/models/gant_l_pad/model.gltf`
- `public/models/gant_r_pad/model.gltf`
They are intended for future swap-by-state usage but are **not yet rigged**. They cannot be animated by MediaPipe landmarks in their current form — re-exporting them from Blender with the same armature structure as `gant_l` is a prerequisite.
## Known Limitations ## Known Limitations
- Production usage is currently limited to repair mission steps that explicitly need hands. - Production usage is currently limited to repair mission steps that explicitly need hands.
- MediaPipe depth is relative and currently not used for stable object depth control. - MediaPipe depth is relative and currently not used for stable object depth control.
- The virtual hit zone is an approximation based on multiple raycasts, not a real 3D collider. - The virtual hit zone is an approximation based on multiple raycasts, not a real 3D collider.
- There is no smoothing layer for hand position or depth yet. - The right glove is a mirrored copy of `gant_l` rather than its own mesh; in the future a dedicated right-hand model would give a better visual.
- The SVG hand visualization is a fallback, not the primary display when glove models load correctly. - The `_pad` glove variants are not rigged yet, so swap-by-state (normal ↔ pad) is not wired in.
- Finger bone animation is an approximate landmark-to-bone mapping; it still needs calibration for per-model twist, offsets, and smoothing. - Finger bone animation is an approximate landmark-to-bone mapping; it still needs calibration for per-model twist, offsets, and smoothing.
@@ -1,367 +0,0 @@
# WebGL Context Lost - Investigation
## Résumé court
Le projet subit des pertes de contexte WebGL pendant les phases où le jeu active
ou prépare le hand tracking, les interactions physiques ou le repair game.
Le symptôme visible côté console est :
```txt
THREE.WebGLRenderer: Context Lost.
[ERROR] [WebGL] Context lost - attempting auto-restore
THREE.WebGLRenderer: Context Restored.
```
Le problème est bloquant parce que le hand tracking et le repair game sont au
coeur de l'expérience. Quand le contexte WebGL saute, la scène Three.js peut se
remonter, le joueur peut revenir au spawn, le pointer lock peut être perdu, et
les tests de gameplay deviennent instables.
## Ce qui fonctionne aujourd'hui
La page principale monte un `<Canvas>` React Three Fiber dans
`src/pages/page.tsx`.
`src/world/World.tsx` compose ensuite :
- la scène de jeu ou la scène de test physique ;
- le player ;
- les systèmes visuels de monde ;
- les gants de hand tracking ;
- les systèmes de debug.
Le hand tracking est centralisé dans
`src/providers/gameplay/HandTrackingProvider.tsx`.
Il peut utiliser deux sources :
- `browser` : MediaPipe JS dans le navigateur ;
- `backend` : backend Python local via WebSocket.
L'activation est déclenchée par :
- certaines étapes du repair game ;
- les zones d'interaction qui demandent explicitement les mains ;
- la scène Physique en debug, selon les objets présents.
## Problème observé
Les context lost arrivent dans plusieurs situations :
- entrée dans une zone d'interaction ;
- lancement du hand tracking ;
- lancement d'un repair game ;
- scène Physique avec `TestMap`, `Physics`, `AnimatedModel`, waypoints GPS et
objets interactifs ;
- source browser JS ;
- source backend.
Le fait que le crash existe avec les deux sources indique que le problème n'est
probablement pas limité au backend Python ni à MediaPipe JS seul. Le hand
tracking semble être un déclencheur fort, mais il arrive au moment où plusieurs
ressources GPU et systèmes runtime se réveillent ensemble.
## Pourquoi c'est bloquant
Ce bug bloque la feature principale du projet :
- le repair game dépend du hand tracking pour valider certaines actions ;
- les interactions main sont nécessaires pour tester les objets grabbables ;
- un context lost casse la continuité du gameplay ;
- le joueur peut être replacé au spawn après reconstruction ;
- le pointer lock peut être perdu ;
- les logs deviennent difficiles à lire parce que le jeu tente de restaurer la
scène en boucle ;
- le comportement n'est pas fiable pour une démo ou un déploiement.
Tant que ce problème n'est pas stable, on ne peut pas valider correctement :
- la mission e-bike ;
- la mission pylône ;
- la mission ferme ;
- les interactions main ;
- le switch browser/backend ;
- le comportement en build de production.
## Hypothèses principales
### 1. Pression GPU au lancement du hand tracking
MediaPipe browser peut créer ses propres ressources GPU. Si Three.js charge
déjà beaucoup de géométries, textures, ombres et modèles, l'ajout du hand
tracking peut faire passer le navigateur au-dessus d'une limite GPU.
Le stash contient une tentative de mitigation en forçant MediaPipe browser et le
backend à utiliser le CPU.
### 2. Activation trop brusque du runtime mains
Les logs montrent des transitions rapides :
```txt
Browser JS runtime starting
Runtime source selected
Runtime snapshot changed
Browser JS runtime stopped
Browser JS runtime starting
```
Ce type de start/stop rapide peut provoquer :
- création webcam ;
- création MediaPipe ;
- montage des gants ;
- update du state React ;
- re-render du monde ;
- stress GPU au même moment.
### 3. Les gants 3D sont montés trop tôt
Si les gants de hand tracking sont montés avant d'avoir de vraies mains
détectées, le jeu charge et prépare des modèles GPU sans utilité immédiate.
Le stash contient une tentative pour ne rendre les gants que lorsqu'une main
existe réellement dans le snapshot.
### 4. Re-upload textures / GLTF trop agressif
`src/utils/three/optimizeGLTFScene.ts` modifie des textures GLTF. Si cette
optimisation force trop souvent `needsUpdate`, mipmaps ou anisotropy, le
navigateur peut recharger beaucoup de textures vers le GPU.
Le stash limite cette pression en évitant de forcer les mipmaps et en abaissant
l'anisotropy.
### 5. Permission caméra au mauvais moment
Demander la caméra au moment exact où le joueur entre dans une interaction ou
lance le repair game ajoute un gros événement runtime au pire moment.
Le stash contient une tentative de warmup caméra pour obtenir la permission plus
tôt et réutiliser le stream au moment où le hand tracking devient nécessaire.
### 6. La scène Physique ajoute du bruit
La scène Physique est une scène de test volontairement riche :
- `Physics` Rapier ;
- `GrabbableObject` ;
- `TriggerObject` ;
- `RepairGame` ;
- `AnimatedModel` ;
- GPS preview ;
- waypoints verts ;
- player ;
- debug overlay.
Cette richesse est normale pour une scène de test, mais elle complique
l'investigation parce qu'elle active beaucoup de systèmes à la fois.
## Fichiers modifiés dans le stash
Le stash `stash@{0}` contient 28 fichiers modifiés, environ `+530 / -152`.
Il ne contient pas de fichiers untracked.
| Fichier | Rôle dans l'investigation |
| --------------------------------------------------------- | ----------------------------------------------------------------------------------------- |
| `README.md` | Note sur les commandes backend depuis la racine du repo. |
| `backend/README.md` | Documentation plus claire pour lancer le backend et réparer un `.venv` cassé. |
| `backend/hand_tracker.py` | Force le backend MediaPipe en CPU. |
| `docs/user/main-feature.md` | Ajustements de documentation utilisateur. |
| `public/sounds/dialogue/subtitles/fr/electricienne.srt` | Ajustements de sous-titres, pas central pour le context lost. |
| `public/sounds/dialogue/subtitles/fr/narrateur.srt` | Ajustements de sous-titres, pas central pour le context lost. |
| `src/components/debug/DebugPlayerModel.tsx` | Ajustements de modèle debug player. |
| `src/components/three/handTracking/HandTrackingGlove.tsx` | Retire le preload automatique des gants pour réduire la pression GPU. |
| `src/components/three/interaction/GrabbableObject.tsx` | Marque les grabbables qui nécessitent vraiment le hand tracking. |
| `src/components/three/interaction/InteractableObject.tsx` | Ajoute le flag `handTracking` aux interactables. |
| `src/data/debug/testSceneConfig.ts` | Stabilise la scène Physique : sol, GPS, hauteur des waypoints. |
| `src/data/handTrackingConfig.ts` | Ajoute délai d'activation, TTL warmup caméra, delegate CPU browser. |
| `src/data/player/playerConfig.ts` | Corrige le spawn Physique avec `PLAYER_EYE_HEIGHT`. |
| `src/hooks/debug/useSceneMode.ts` | Force `game` hors debug actif pour éviter des scènes debug en prod. |
| `src/hooks/handTracking/useBothFistsHold.ts` | Sort le hold des deux poings de `useFrame` R3F vers `requestAnimationFrame`. |
| `src/hooks/handTracking/useBrowserHandTracking.ts` | Encadre `detectForVideo`, release MediaPipe en cleanup, gère les erreurs. |
| `src/hooks/three/useTerrainHeight.ts` | Ajustements terrain, liés au snap/player. |
| `src/lib/handTracking/browserHandTracking.ts` | Force delegate CPU, garde une instance MediaPipe, ajoute `releaseBrowserHandLandmarker`. |
| `src/lib/handTracking/handTrackingSession.ts` | Ajoute warmup caméra, cache stream, timeout et consommation du stream préparé. |
| `src/managers/InteractionManager.ts` | Ajoute `handTrackingNearby` pour ne pas activer les mains sur toute interaction. |
| `src/pages/page.tsx` | Gestion WebGL context lost/restored, DPR fixe, antialias off, release MediaPipe au crash. |
| `src/providers/gameplay/HandTrackingProvider.tsx` | Ajoute activation différée, snapshot queued, warmup runtime. |
| `src/types/interaction/interaction.ts` | Ajoute `handTracking` et `handTrackingNearby` aux types interaction. |
| `src/utils/debug/Debug.ts` | Synchronise l'affichage du controller hand tracking source. |
| `src/utils/three/optimizeGLTFScene.ts` | Réduit la pression GPU des textures GLTF. |
| `src/world/World.tsx` | Ne rend les gants que si une main correspondante est détectée. |
| `src/world/debug/TestMap.tsx` | Nettoie les logs, stabilise waypoints/GPS/scène Physique. |
| `src/world/player/PlayerCamera.tsx` | Ajustements pointer lock/canvas ciblé. |
## Fichiers actuellement modifiés dans le worktree
Etat observé au moment de cette note :
| Fichier | Statut |
| --------------------------------------------------------- | --------------------------------------------------------- |
| `public/models/talkie/*` | Beaucoup d'anciennes textures/fichiers `.gltf` supprimés. |
| `public/models/talkie/model.glb` | Nouveau fichier non suivi. |
| `src/components/three/handTracking/HandTrackingGlove.tsx` | Modifié. |
| `src/data/debug/testSceneConfig.ts` | Modifié. |
| `src/data/gameplay/repairMissions.ts` | Modifié. |
| `src/data/handTrackingConfig.ts` | Modifié. |
| `src/data/player/playerConfig.ts` | Modifié. |
| `src/data/world/mapLodConfig.ts` | Modifié. |
| `src/hooks/handTracking/useBrowserHandTracking.ts` | Modifié. |
| `src/hooks/handTracking/useRemoteHandTracking.ts` | Modifié. |
| `src/lib/handTracking/browserHandTracking.ts` | Modifié. |
| `src/lib/handTracking/handTrackingSession.ts` | Modifié. |
| `src/pages/page.tsx` | Modifié. |
| `src/providers/gameplay/HandTrackingProvider.tsx` | Modifié. |
| `src/utils/debug/Debug.ts` | Modifié. |
| `src/utils/three/optimizeGLTFScene.ts` | Modifié. |
| `src/world/World.tsx` | Modifié. |
| `src/world/debug/TestMap.tsx` | Modifié. |
| `src/world/player/Player.tsx` | Modifié. |
| `src/world/player/PlayerCamera.tsx` | Modifié. |
| `src/world/player/PlayerController.tsx` | Modifié. |
| `src/components/ui/RuntimeLoadingIndicator.tsx` | Nouveau fichier non suivi. |
| `src/hooks/handTracking/useHandTrackingRuntimeWarmup.ts` | Nouveau fichier non suivi. |
| `src/world/player/playerRuntimeSnapshot.ts` | Nouveau fichier non suivi. |
Attention : les fichiers supprimés/nouveaux du talkie semblent être un sujet
séparé du context lost. Il faut les garder séparés dans les commits.
## Fichiers directement impactés par le bug
### Canvas et WebGL
- `src/pages/page.tsx`
- `src/world/World.tsx`
- `src/utils/three/optimizeGLTFScene.ts`
Ces fichiers influencent directement la charge GPU, la configuration du canvas,
les ressources GLTF et le comportement au context lost/restored.
### Hand tracking
- `src/providers/gameplay/HandTrackingProvider.tsx`
- `src/hooks/handTracking/useBrowserHandTracking.ts`
- `src/hooks/handTracking/useRemoteHandTracking.ts`
- `src/hooks/handTracking/useBothFistsHold.ts`
- `src/hooks/handTracking/useHandTrackingRuntimeWarmup.ts`
- `src/lib/handTracking/browserHandTracking.ts`
- `src/lib/handTracking/handTrackingSession.ts`
- `src/data/handTrackingConfig.ts`
- `src/components/three/handTracking/HandTrackingGlove.tsx`
- `backend/hand_tracker.py`
Ces fichiers contrôlent le déclenchement, la source, la caméra, MediaPipe, le
backend et le rendu visuel des mains.
### Interactions et repair game
- `src/components/three/interaction/GrabbableObject.tsx`
- `src/components/three/interaction/InteractableObject.tsx`
- `src/managers/InteractionManager.ts`
- `src/types/interaction/interaction.ts`
- `src/components/three/gameplay/RepairGame.tsx`
- `src/hooks/gameplay/useRepairMissionStep.ts`
- `src/hooks/gameplay/useRepairMovementLocked.ts`
Ces fichiers sont impactés parce que l'entrée dans une zone ou une étape repair
peut déclencher le hand tracking.
### Player et restauration après crash
- `src/world/player/Player.tsx`
- `src/world/player/PlayerCamera.tsx`
- `src/world/player/PlayerController.tsx`
- `src/world/player/playerRuntimeSnapshot.ts`
- `src/data/player/playerConfig.ts`
Ces fichiers influencent le spawn, la caméra, le pointer lock, et la possibilité
de récupérer la dernière position après un context lost.
### Scène Physique / debug
- `src/world/debug/TestMap.tsx`
- `src/data/debug/testSceneConfig.ts`
- `src/components/debug/DebugPlayerModel.tsx`
- `src/hooks/debug/useSceneMode.ts`
- `src/utils/debug/Debug.ts`
Ces fichiers ne sont pas forcément la cause racine, mais ils créent une scène de
stress utile pour reproduire le bug.
## Ce que le stash essayait de corriger
Le stash essaye de réduire le risque de context lost avec plusieurs leviers :
1. passer MediaPipe browser/backend en CPU ;
2. libérer MediaPipe quand le runtime s'arrête ou quand WebGL saute ;
3. éviter de monter les gants sans mains détectées ;
4. retarder l'activation du hand tracking pour éviter les start/stop violents ;
5. demander la caméra plus tôt et réutiliser le stream ;
6. réduire la charge GPU du canvas avec DPR fixe et antialias off ;
7. limiter les re-uploads de textures GLTF ;
8. distinguer les interactions qui demandent vraiment le hand tracking ;
9. restaurer WebGL avec une limite pour éviter les boucles infinies ;
10. conserver la position du joueur après restauration.
## Ce qui reste à prouver
Il faut encore isoler le déclencheur exact :
- crash avec hand tracking désactivé complètement ;
- crash avec source browser JS seulement ;
- crash avec source backend seulement ;
- crash avec gants 3D désactivés ;
- crash avec MediaPipe CPU ;
- crash avec `AnimatedModel` de TestMap désactivé ;
- crash avec GPS preview/waypoints désactivés ;
- crash avec shadows/antialias/DPR réduits ;
- crash en scène game réelle, pas seulement scène Physique.
## Plan d'investigation recommandé
1. Stabiliser le worktree et ne pas mélanger assets talkie, LOD, docs backend et
context lost dans le même commit.
2. Garder le stash tant que le fix final n'est pas validé.
3. Créer un commit ou patch isolé pour les logs context lost seulement.
4. Ajouter un switch debug qui permet de couper séparément :
- hand tracking runtime ;
- gants 3D ;
- MediaPipe browser ;
- backend ;
- GPS preview ;
- AnimatedModel de TestMap.
5. Reproduire le bug avec une matrice claire.
6. Garder les changements qui diminuent réellement les context lost.
7. Supprimer les logs temporaires une fois le diagnostic terminé.
## Recommandation Git
Ne pas supprimer le stash maintenant.
Il contient du travail réel sur le context lost. Même s'il n'est pas parfait, il
sert de trace d'investigation et contient des morceaux utiles.
Avant de le supprimer, sauvegarder le patch :
```bash
git stash show -p stash@{0} > context-lost-stash.patch
```
Ensuite seulement, si tout a été repris dans des commits propres :
```bash
git stash drop stash@{0}
```
## Commits logiques proposés
Séparer en plusieurs commits pour éviter un gros commit illisible :
1. `docs: document webgl context lost investigation`
2. `fix: reduce handtracking gpu pressure`
3. `fix: delay handtracking activation`
4. `fix: preserve player state after webgl restore`
5. `fix: stabilize physics debug scene`
6. `docs: clarify backend handtracking setup`
LFS Regular → Executable
BIN
View File
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -15,11 +15,15 @@ import {
REPAIR_CASE_OPEN_ROTATION_OFFSET_DEGREES, REPAIR_CASE_OPEN_ROTATION_OFFSET_DEGREES,
REPAIR_CASE_CLOSE_SOUND_PATH, REPAIR_CASE_CLOSE_SOUND_PATH,
REPAIR_CASE_OPEN_SOUND_PATH, REPAIR_CASE_OPEN_SOUND_PATH,
REPAIR_CASE_PART_ANCHOR_FALLBACK_QUATERNION,
REPAIR_CASE_PART_ANCHOR_FALLBACKS,
REPAIR_CASE_PART_ANCHOR_NAMES,
REPAIR_CASE_PLACEHOLDER_NAME_PREFIX, REPAIR_CASE_PLACEHOLDER_NAME_PREFIX,
REPAIR_CASE_POP_DURATION, REPAIR_CASE_POP_DURATION,
REPAIR_CASE_POP_Y_OFFSET, REPAIR_CASE_POP_Y_OFFSET,
REPAIR_CASE_ROTATION_AMPLITUDE_DEGREES, REPAIR_CASE_ROTATION_AMPLITUDE_DEGREES,
REPAIR_CASE_ROTATION_RESET_SPEED, REPAIR_CASE_ROTATION_RESET_SPEED,
type RepairCasePartAnchorName,
} from "@/data/gameplay/repairCaseConfig"; } from "@/data/gameplay/repairCaseConfig";
import { useClonedObject } from "@/hooks/three/useClonedObject"; import { useClonedObject } from "@/hooks/three/useClonedObject";
import { useLoggedGLTF } from "@/hooks/three/useLoggedGLTF"; import { useLoggedGLTF } from "@/hooks/three/useLoggedGLTF";
@@ -32,6 +36,10 @@ export interface RepairCasePlaceholder {
position: Vector3Tuple; position: Vector3Tuple;
} }
export type RepairCasePartAnchors = Partial<
Record<RepairCasePartAnchorName, Vector3Tuple>
>;
interface RepairCaseModelProps extends ModelTransformProps { interface RepairCaseModelProps extends ModelTransformProps {
modelPath: string; modelPath: string;
open: boolean; open: boolean;
@@ -40,6 +48,7 @@ interface RepairCaseModelProps extends ModelTransformProps {
onPlaceholdersChange?: onPlaceholdersChange?:
| ((placeholders: readonly RepairCasePlaceholder[]) => void) | ((placeholders: readonly RepairCasePlaceholder[]) => void)
| undefined; | undefined;
onAnchorsChange?: ((anchors: RepairCasePartAnchors) => void) | undefined;
onExitComplete?: (() => void) | undefined; onExitComplete?: (() => void) | undefined;
} }
@@ -59,6 +68,7 @@ export function RepairCaseModel({
exiting = false, exiting = false,
floating = true, floating = true,
onPlaceholdersChange, onPlaceholdersChange,
onAnchorsChange,
onExitComplete, onExitComplete,
position = [0, 0, 0], position = [0, 0, 0],
rotation = [0, 0, 0], rotation = [0, 0, 0],
@@ -81,6 +91,7 @@ export function RepairCaseModel({
const pop = useRef({ scale: 0.001, yOffset: REPAIR_CASE_POP_Y_OFFSET }); const pop = useRef({ scale: 0.001, yOffset: REPAIR_CASE_POP_Y_OFFSET });
const onExitCompleteRef = useRef(onExitComplete); const onExitCompleteRef = useRef(onExitComplete);
const onPlaceholdersChangeRef = useRef(onPlaceholdersChange); const onPlaceholdersChangeRef = useRef(onPlaceholdersChange);
const onAnchorsChangeRef = useRef(onAnchorsChange);
const initialOpen = useRef(open); const initialOpen = useRef(open);
const previousOpen = useRef(open); const previousOpen = useRef(open);
const openedRotationZ = useRef(0); const openedRotationZ = useRef(0);
@@ -89,6 +100,12 @@ export function RepairCaseModel({
const placeholderSignature = useRef("__initial__"); const placeholderSignature = useRef("__initial__");
const placeholderPosition = useRef(new THREE.Vector3()); const placeholderPosition = useRef(new THREE.Vector3());
const placeholderLocalPosition = useRef(new THREE.Vector3()); const placeholderLocalPosition = useRef(new THREE.Vector3());
const anchorNodes = useRef<Map<RepairCasePartAnchorName, THREE.Object3D>>(
new Map(),
);
const anchorSignature = useRef("__initial__");
const anchorWorldPosition = useRef(new THREE.Vector3());
const anchorLocalPosition = useRef(new THREE.Vector3());
useEffect(() => { useEffect(() => {
onExitCompleteRef.current = onExitComplete; onExitCompleteRef.current = onExitComplete;
@@ -98,6 +115,10 @@ export function RepairCaseModel({
onPlaceholdersChangeRef.current = onPlaceholdersChange; onPlaceholdersChangeRef.current = onPlaceholdersChange;
}, [onPlaceholdersChange]); }, [onPlaceholdersChange]);
useEffect(() => {
onAnchorsChangeRef.current = onAnchorsChange;
}, [onAnchorsChange]);
useEffect(() => { useEffect(() => {
const popAnimation = pop.current; const popAnimation = pop.current;
@@ -153,6 +174,37 @@ export function RepairCaseModel({
} }
}); });
// Resolve part anchor nodes (cabledroit, cablegauche, pucehaut, pucebas,
// refroidisseur). Existing GLTF nodes are reused and their meshes are
// hidden so the standalone model injected at the same position becomes
// the only visible representation. Missing nodes are created on the fly
// at the configured fallback case-local position.
anchorNodes.current = new Map();
REPAIR_CASE_PART_ANCHOR_NAMES.forEach((anchorName) => {
let node = model.getObjectByName(anchorName);
if (node) {
node.traverse((descendant) => {
if ((descendant as THREE.Mesh).isMesh) {
descendant.visible = false;
}
});
} else {
const placeholder = new THREE.Object3D();
placeholder.name = anchorName;
const fallback = REPAIR_CASE_PART_ANCHOR_FALLBACKS[anchorName];
placeholder.position.set(fallback[0], fallback[1], fallback[2]);
placeholder.quaternion.set(
REPAIR_CASE_PART_ANCHOR_FALLBACK_QUATERNION[0],
REPAIR_CASE_PART_ANCHOR_FALLBACK_QUATERNION[1],
REPAIR_CASE_PART_ANCHOR_FALLBACK_QUATERNION[2],
REPAIR_CASE_PART_ANCHOR_FALLBACK_QUATERNION[3],
);
model.add(placeholder);
node = placeholder;
}
anchorNodes.current.set(anchorName, node);
});
if (lid) { if (lid) {
lid.rotation.z = lid.rotation.z =
openedRotationZ.current + openedRotationZ.current +
@@ -250,6 +302,31 @@ export function RepairCaseModel({
} }
} }
if (anchorNodes.current.size > 0) {
const anchors: RepairCasePartAnchors = {};
const signatureParts: string[] = [];
anchorNodes.current.forEach((node, anchorName) => {
node.getWorldPosition(anchorWorldPosition.current);
anchorLocalPosition.current.copy(anchorWorldPosition.current);
group.parent?.worldToLocal(anchorLocalPosition.current);
const tuple: Vector3Tuple = [
anchorLocalPosition.current.x,
anchorLocalPosition.current.y,
anchorLocalPosition.current.z,
];
anchors[anchorName] = tuple;
signatureParts.push(
`${anchorName}:${tuple.map((value) => value.toFixed(3)).join(",")}`,
);
});
signatureParts.sort();
const nextAnchorSignature = signatureParts.join("|");
if (nextAnchorSignature !== anchorSignature.current) {
anchorSignature.current = nextAnchorSignature;
onAnchorsChangeRef.current?.(anchors);
}
}
animationActiveRef.current = isNear; animationActiveRef.current = isNear;
if (animationActiveRef.current) { if (animationActiveRef.current) {
+41 -7
View File
@@ -1,7 +1,11 @@
import { Suspense, useEffect, useMemo, useState } from "react"; import { Suspense, useEffect, useMemo, useState } from "react";
import { useGLTF } from "@react-three/drei"; import { useGLTF } from "@react-three/drei";
import { ExplodableModel } from "@/components/three/models/ExplodableModel"; import { ExplodableModel } from "@/components/three/models/ExplodableModel";
import type { RepairCasePlaceholder } from "@/components/three/gameplay/RepairCaseModel"; import type { ExplodedNodeAnchors } from "@/components/three/models/ExplodableModel";
import type {
RepairCasePartAnchors,
RepairCasePlaceholder,
} from "@/components/three/gameplay/RepairCaseModel";
import { RepairCompletionStep } from "@/components/three/gameplay/RepairCompletionStep"; import { RepairCompletionStep } from "@/components/three/gameplay/RepairCompletionStep";
import { RepairInspectionObject } from "@/components/three/gameplay/RepairInspectionObject"; import { RepairInspectionObject } from "@/components/three/gameplay/RepairInspectionObject";
import { RepairMissionCase } from "@/components/three/gameplay/RepairMissionCase"; import { RepairMissionCase } from "@/components/three/gameplay/RepairMissionCase";
@@ -63,12 +67,15 @@ export function RepairGame({
const [casePlaceholders, setCasePlaceholders] = useState< const [casePlaceholders, setCasePlaceholders] = useState<
readonly RepairCasePlaceholder[] readonly RepairCasePlaceholder[]
>([]); >([]);
const [caseAnchors, setCaseAnchors] = useState<RepairCasePartAnchors>({});
const [brokenAnchors, setBrokenAnchors] = useState<ExplodedNodeAnchors>({});
const [scannedBrokenParts, setScannedBrokenParts] = useState< const [scannedBrokenParts, setScannedBrokenParts] = useState<
readonly RepairScannedBrokenPart[] readonly RepairScannedBrokenPart[]
>([]); >([]);
const parsedScale = toVector3Scale(scale); const parsedScale = toVector3Scale(scale);
const snappedPosition = useTerrainSnappedPosition(position); const snappedPosition = useTerrainSnappedPosition(position);
const readyForFragmentation = step === "inspected"; const readyForFragmentation = step === "inspected";
const brokenNodeNames = useMemo(() => getBrokenNodeNames(config), [config]);
useRepairFragmentationInput({ useRepairFragmentationInput({
enabled: mainState === mission && readyForFragmentation, enabled: mainState === mission && readyForFragmentation,
@@ -81,6 +88,8 @@ export function RepairGame({
const timeoutId = window.setTimeout(() => { const timeoutId = window.setTimeout(() => {
setCasePlaceholders([]); setCasePlaceholders([]);
setCaseAnchors({});
setBrokenAnchors({});
setScannedBrokenParts([]); setScannedBrokenParts([]);
}, 0); }, 0);
@@ -136,12 +145,24 @@ export function RepairGame({
/> />
) : null} ) : null}
{step === "repairing" ? ( {step === "repairing" ? (
<RepairRepairingStep <>
brokenParts={scannedBrokenParts} <ExplodableModel
config={config} modelPath={config.modelPath}
placeholders={casePlaceholders} scale={config.modelScale ?? 1}
onRepair={() => setMissionStep(mission, "reassembling")} split
/> hideNodeNames={brokenNodeNames}
nodeAnchorNames={brokenNodeNames}
onNodeAnchorsChange={setBrokenAnchors}
/>
<RepairRepairingStep
anchors={caseAnchors}
brokenAnchors={brokenAnchors}
brokenParts={scannedBrokenParts}
config={config}
placeholders={casePlaceholders}
onRepair={() => setMissionStep(mission, "reassembling")}
/>
</>
) : null} ) : null}
{step === "reassembling" ? ( {step === "reassembling" ? (
<RepairReassemblyStep <RepairReassemblyStep
@@ -159,6 +180,7 @@ export function RepairGame({
<RepairMissionCase <RepairMissionCase
config={config} config={config}
onPlaceholdersChange={setCasePlaceholders} onPlaceholdersChange={setCasePlaceholders}
onAnchorsChange={setCaseAnchors}
open={step === "repairing"} open={step === "repairing"}
zoomed={step === "repairing"} zoomed={step === "repairing"}
showFragmentationPrompt={readyForFragmentation} showFragmentationPrompt={readyForFragmentation}
@@ -188,3 +210,15 @@ function getRepairMissionModelPaths(config: RepairMissionConfig): string[] {
]), ]),
]; ];
} }
function getBrokenNodeNames(config: RepairMissionConfig): readonly string[] {
const names = new Set<string>();
config.brokenParts.forEach((part) => {
if (part.targetNodeName) names.add(part.targetNodeName);
else if (part.nodeName) names.add(part.nodeName);
});
config.replacementParts.forEach((part) => {
if (part.targetNodeName) names.add(part.targetNodeName);
});
return Array.from(names);
}
@@ -1,5 +1,6 @@
import { import {
RepairCaseModel, RepairCaseModel,
type RepairCasePartAnchors,
type RepairCasePlaceholder, type RepairCasePlaceholder,
} from "@/components/three/gameplay/RepairCaseModel"; } from "@/components/three/gameplay/RepairCaseModel";
import { RepairPromptVideo } from "@/components/three/gameplay/RepairPromptVideo"; import { RepairPromptVideo } from "@/components/three/gameplay/RepairPromptVideo";
@@ -19,6 +20,7 @@ interface RepairMissionCaseProps {
onPlaceholdersChange?: onPlaceholdersChange?:
| ((placeholders: readonly RepairCasePlaceholder[]) => void) | ((placeholders: readonly RepairCasePlaceholder[]) => void)
| undefined; | undefined;
onAnchorsChange?: ((anchors: RepairCasePartAnchors) => void) | undefined;
onExitComplete?: (() => void) | undefined; onExitComplete?: (() => void) | undefined;
open?: boolean; open?: boolean;
zoomed?: boolean; zoomed?: boolean;
@@ -30,6 +32,7 @@ export function RepairMissionCase({
config, config,
exiting = false, exiting = false,
onPlaceholdersChange, onPlaceholdersChange,
onAnchorsChange,
onExitComplete, onExitComplete,
open = false, open = false,
zoomed = false, zoomed = false,
@@ -57,6 +60,7 @@ export function RepairMissionCase({
exiting={exiting} exiting={exiting}
onExitComplete={onExitComplete} onExitComplete={onExitComplete}
onPlaceholdersChange={onPlaceholdersChange} onPlaceholdersChange={onPlaceholdersChange}
onAnchorsChange={onAnchorsChange}
open={open} open={open}
floating={!zoomed} floating={!zoomed}
position={modelPosition} position={modelPosition}
@@ -70,6 +74,7 @@ export function RepairMissionCase({
exiting={exiting} exiting={exiting}
onExitComplete={onExitComplete} onExitComplete={onExitComplete}
onPlaceholdersChange={onPlaceholdersChange} onPlaceholdersChange={onPlaceholdersChange}
onAnchorsChange={onAnchorsChange}
open={open} open={open}
floating={!zoomed} floating={!zoomed}
position={modelPosition} position={modelPosition}
@@ -8,6 +8,7 @@ import { toVector3Scale } from "@/utils/three/scale";
interface RepairObjectModelProps extends ModelTransformProps { interface RepairObjectModelProps extends ModelTransformProps {
label: string; label: string;
modelPath: string; modelPath: string;
ghosted?: boolean;
} }
interface RepairObjectModelBoundaryProps extends RepairObjectModelProps { interface RepairObjectModelBoundaryProps extends RepairObjectModelProps {
@@ -73,6 +74,7 @@ export function RepairObjectModel({
position = [0, 0, 0], position = [0, 0, 0],
rotation = [0, 0, 0], rotation = [0, 0, 0],
scale = 1, scale = 1,
ghosted = false,
}: RepairObjectModelProps): React.JSX.Element { }: RepairObjectModelProps): React.JSX.Element {
return ( return (
<RepairObjectModelBoundary <RepairObjectModelBoundary
@@ -87,6 +89,7 @@ export function RepairObjectModel({
position={position} position={position}
rotation={rotation} rotation={rotation}
scale={scale} scale={scale}
opacity={ghosted ? 0.35 : 1}
/> />
</RepairObjectModelBoundary> </RepairObjectModelBoundary>
); );
@@ -1,6 +1,10 @@
import { useEffect, useRef, useState } from "react"; import { useEffect, useRef, useState } from "react";
import * as THREE from "three"; import * as THREE from "three";
import type { RepairCasePlaceholder } from "@/components/three/gameplay/RepairCaseModel"; import type {
RepairCasePartAnchors,
RepairCasePlaceholder,
} from "@/components/three/gameplay/RepairCaseModel";
import type { ExplodedNodeAnchors } from "@/components/three/models/ExplodableModel";
import { RepairObjectModel } from "@/components/three/gameplay/RepairObjectModel"; import { RepairObjectModel } from "@/components/three/gameplay/RepairObjectModel";
import { RepairPromptVideo } from "@/components/three/gameplay/RepairPromptVideo"; import { RepairPromptVideo } from "@/components/three/gameplay/RepairPromptVideo";
import { GrabbableObject } from "@/components/three/interaction/GrabbableObject"; import { GrabbableObject } from "@/components/three/interaction/GrabbableObject";
@@ -38,6 +42,8 @@ const STORED_BROKEN_PART_COLOR = "#38bdf8";
let hasWarnedMissingPlaceholders = false; let hasWarnedMissingPlaceholders = false;
interface RepairRepairingStepProps { interface RepairRepairingStepProps {
anchors?: RepairCasePartAnchors;
brokenAnchors?: ExplodedNodeAnchors;
brokenParts: readonly RepairScannedBrokenPart[]; brokenParts: readonly RepairScannedBrokenPart[];
config: RepairMissionConfig; config: RepairMissionConfig;
placeholders: readonly RepairCasePlaceholder[]; placeholders: readonly RepairCasePlaceholder[];
@@ -63,6 +69,8 @@ interface RepairPartPlacementFeedbackProps {
} }
export function RepairRepairingStep({ export function RepairRepairingStep({
anchors = {},
brokenAnchors = {},
brokenParts, brokenParts,
config, config,
placeholders, placeholders,
@@ -76,12 +84,15 @@ export function RepairRepairingStep({
const [depositedBrokenPartIds, setDepositedBrokenPartIds] = useState< const [depositedBrokenPartIds, setDepositedBrokenPartIds] = useState<
Record<string, boolean> Record<string, boolean>
>({}); >({});
const [heldPartByLockGroup, setHeldPartByLockGroup] = useState<
Record<string, string>
>({});
const [showBlockedInstallFeedback, setShowBlockedInstallFeedback] = const [showBlockedInstallFeedback, setShowBlockedInstallFeedback] =
useState(false); useState(false);
const replacementParts = getReplacementParts(config); const replacementParts = getReplacementParts(config);
const brokenPartsToDeposit = getBrokenPartsToDeposit(config, brokenParts); const brokenPartsToDeposit = getBrokenPartsToDeposit(config, brokenParts);
const requiredReplacementPart = replacementParts.find( const requiredReplacementPart = replacementParts.find((part) =>
(part) => part.id === config.requiredReplacementPartId, config.requiredReplacementPartIds.includes(part.id),
); );
const requiredReplacementLabel = const requiredReplacementLabel =
requiredReplacementPart?.label ?? config.label; requiredReplacementPart?.label ?? config.label;
@@ -89,15 +100,16 @@ export function RepairRepairingStep({
const placeholderPositions = placeholderTargets.map( const placeholderPositions = placeholderTargets.map(
(target) => target.position, (target) => target.position,
); );
const hasCorrectPartPlaced = Boolean( const hasCorrectPartPlaced = config.requiredReplacementPartIds.some(
placedPartIds[config.requiredReplacementPartId], (id) => placedPartIds[id],
); );
const hasDepositedBrokenParts = brokenPartsToDeposit.every( const hasDepositedBrokenParts = brokenPartsToDeposit.every(
(part) => depositedBrokenPartIds[part.id], (part) => depositedBrokenPartIds[part.id],
); );
const hasWrongPartPlaced = replacementParts.some( const hasWrongPartPlaced = replacementParts.some(
(part) => (part) =>
part.id !== config.requiredReplacementPartId && placedPartIds[part.id], !config.requiredReplacementPartIds.includes(part.id) &&
placedPartIds[part.id],
); );
const isReadyToInstall = hasCorrectPartPlaced && hasDepositedBrokenParts; const isReadyToInstall = hasCorrectPartPlaced && hasDepositedBrokenParts;
const installColor = isReadyToInstall const installColor = isReadyToInstall
@@ -177,6 +189,24 @@ export function RepairRepairingStep({
}); });
} }
function handleReplacementGrabChange(
part: RepairMissionPartConfig,
held: boolean,
): void {
if (!part.caseLockGroup) return;
const group = part.caseLockGroup;
setHeldPartByLockGroup((current) => {
if (held) {
if (current[group] === part.id) return current;
return { ...current, [group]: part.id };
}
if (current[group] !== part.id) return current;
const next = { ...current };
delete next[group];
return next;
});
}
return ( return (
<group ref={groupRef}> <group ref={groupRef}>
<RepairInstallTarget <RepairInstallTarget
@@ -192,15 +222,23 @@ export function RepairRepairingStep({
<RepairPlaceholderMarkers positions={placeholderPositions} /> <RepairPlaceholderMarkers positions={placeholderPositions} />
{replacementParts.map((part, index) => { {replacementParts.map((part, index) => {
const anchorPosition = part.caseAnchor
? anchors[part.caseAnchor]
: undefined;
const placeholderPosition = const placeholderPosition =
anchorPosition ??
placeholderPositions[index % placeholderPositions.length] ?? placeholderPositions[index % placeholderPositions.length] ??
placeholderPositions[0]!; placeholderPositions[0]!;
const isPlaced = Boolean(placedPartIds[part.id]); const isPlaced = Boolean(placedPartIds[part.id]);
const feedbackState = getReplacementFeedbackState( const feedbackState = getReplacementFeedbackState(
part.id, part.id,
config.requiredReplacementPartId, config.requiredReplacementPartIds,
isPlaced, isPlaced,
); );
const lockedByOther =
part.caseLockGroup !== undefined &&
heldPartByLockGroup[part.caseLockGroup] !== undefined &&
heldPartByLockGroup[part.caseLockGroup] !== part.id;
return ( return (
<GrabbableObject <GrabbableObject
@@ -208,7 +246,11 @@ export function RepairRepairingStep({
position={placeholderPosition} position={placeholderPosition}
colliders="ball" colliders="ball"
handControlled handControlled
disabled={lockedByOther}
label={`Prendre ${part.label}`} label={`Prendre ${part.label}`}
onGrabChange={(held) => {
handleReplacementGrabChange(part, held);
}}
onPositionChange={(position) => { onPositionChange={(position) => {
handleReplacementPosition(part.id, position); handleReplacementPosition(part.id, position);
}} }}
@@ -224,6 +266,7 @@ export function RepairRepairingStep({
label={part.label} label={part.label}
modelPath={part.modelPath ?? config.modelPath} modelPath={part.modelPath ?? config.modelPath}
scale={0.36} scale={0.36}
ghosted={lockedByOther}
/> />
<RepairPartPlacementFeedback state={feedbackState} /> <RepairPartPlacementFeedback state={feedbackState} />
</group> </group>
@@ -232,14 +275,18 @@ export function RepairRepairingStep({
})} })}
{brokenPartsToDeposit.map((part, index) => { {brokenPartsToDeposit.map((part, index) => {
const startOffset = const fallbackOffset =
BROKEN_PART_START_OFFSETS[index % BROKEN_PART_START_OFFSETS.length] ?? BROKEN_PART_START_OFFSETS[index % BROKEN_PART_START_OFFSETS.length] ??
BROKEN_PART_START_OFFSETS[0]!; BROKEN_PART_START_OFFSETS[0]!;
const startPosition: Vector3Tuple = [ const fallbackPosition: Vector3Tuple = [
REPAIR_CASE_FOCUS_POSITION[0] + startOffset[0], REPAIR_CASE_FOCUS_POSITION[0] + fallbackOffset[0],
REPAIR_CASE_FOCUS_POSITION[1] + startOffset[1], REPAIR_CASE_FOCUS_POSITION[1] + fallbackOffset[1],
REPAIR_CASE_FOCUS_POSITION[2] + startOffset[2], REPAIR_CASE_FOCUS_POSITION[2] + fallbackOffset[2],
]; ];
const anchorPosition = part.targetNodeName
? brokenAnchors[part.targetNodeName]
: undefined;
const startPosition: Vector3Tuple = anchorPosition ?? fallbackPosition;
const targetPositions = getBrokenPartTargetPositions( const targetPositions = getBrokenPartTargetPositions(
part, part,
placeholderTargets, placeholderTargets,
@@ -387,12 +434,12 @@ function getPlacementFeedbackColor(
function getReplacementFeedbackState( function getReplacementFeedbackState(
partId: string, partId: string,
requiredPartId: string, requiredPartIds: readonly string[],
isPlaced: boolean, isPlaced: boolean,
): RepairPartPlacementFeedbackProps["state"] { ): RepairPartPlacementFeedbackProps["state"] {
if (!isPlaced) return null; if (!isPlaced) return null;
return partId === requiredPartId ? "valid" : "invalid"; return requiredPartIds.includes(partId) ? "valid" : "invalid";
} }
function getPlaceholderTargets( function getPlaceholderTargets(
@@ -466,9 +513,12 @@ function getReplacementParts(
): readonly RepairMissionPartConfig[] { ): readonly RepairMissionPartConfig[] {
if (config.replacementParts.length > 0) return config.replacementParts; if (config.replacementParts.length > 0) return config.replacementParts;
const fallbackId =
config.requiredReplacementPartIds[0] ?? `${config.id}-replacement`;
return [ return [
{ {
id: config.requiredReplacementPartId, id: fallbackId,
label: config.label, label: config.label,
modelPath: config.modelPath, modelPath: config.modelPath,
}, },
@@ -486,5 +536,6 @@ function getBrokenPartsToDeposit(
label: part.label, label: part.label,
modelPath: part.modelPath ?? config.modelPath, modelPath: part.modelPath ?? config.modelPath,
...(part.caseSlotName ? { caseSlotName: part.caseSlotName } : {}), ...(part.caseSlotName ? { caseSlotName: part.caseSlotName } : {}),
...(part.targetNodeName ? { targetNodeName: part.targetNodeName } : {}),
})); }));
} }
@@ -97,6 +97,9 @@ function getScannedBrokenParts(
...(match.config.caseSlotName ...(match.config.caseSlotName
? { caseSlotName: match.config.caseSlotName } ? { caseSlotName: match.config.caseSlotName }
: {}), : {}),
...(match.config.targetNodeName
? { targetNodeName: match.config.targetNodeName }
: {}),
}; };
}); });
} }
@@ -12,6 +12,11 @@ import { useLoggedGLTF } from "@/hooks/three/useLoggedGLTF";
import type { HandTrackingLandmark } from "@/types/handTracking/handTracking"; import type { HandTrackingLandmark } from "@/types/handTracking/handTracking";
import { logModelLoadError } from "@/utils/three/modelLoadLogger"; import { logModelLoadError } from "@/utils/three/modelLoadLogger";
// Both gloves share the same source mesh (gant_l). The right glove is
// rendered by mirroring scale.x at the group level — this is more
// reliable than the historical gant_r GLTF, which embeds multiple
// skeletons (Hand_l, Hand_l_pad, Hand_r) and was breaking the finger
// rig.
const GLOVE_CONFIGS: Record< const GLOVE_CONFIGS: Record<
HandTrackingGloveHandedness, HandTrackingGloveHandedness,
{ {
@@ -24,8 +29,8 @@ const GLOVE_CONFIGS: Record<
rootNodeName: "Armature", rootNodeName: "Armature",
}, },
right: { right: {
modelPath: "/models/gant_r/model.gltf", modelPath: "/models/gant_l/model.gltf",
rootNodeName: "Hand_r", rootNodeName: "Armature",
}, },
}; };
@@ -226,7 +231,10 @@ function applyFingerPose(
_boneTargetQuaternion _boneTargetQuaternion
.copy(_boneDeltaQuaternion) .copy(_boneDeltaQuaternion)
.multiply(pose.restQuaternion); .multiply(pose.restQuaternion);
pose.bone.quaternion.slerp(_boneTargetQuaternion, 0.45); // Lower slerp factor = smoother but more latency. MediaPipe at
// ~10fps produces noisy landmark frames; smoothing cuts the
// jitter the user sees on every finger bone.
pose.bone.quaternion.slerp(_boneTargetQuaternion, 0.3);
} }
} }
} }
@@ -334,12 +342,18 @@ function HandTrackingGloveModel({
_matrix.makeBasis(_xAxis, _yAxis, _zAxis); _matrix.makeBasis(_xAxis, _yAxis, _zAxis);
_targetQuaternion.setFromRotationMatrix(_matrix); _targetQuaternion.setFromRotationMatrix(_matrix);
group.position.lerp(_targetPosition, Math.min(1, delta * 18)); // Lower factor (was 18) damps the glove jitter caused by noisy
group.quaternion.slerp(_targetQuaternion, Math.min(1, delta * 18)); // landmarks while keeping a responsive feel.
group.position.lerp(_targetPosition, Math.min(1, delta * 12));
group.quaternion.slerp(_targetQuaternion, Math.min(1, delta * 12));
const palmLength = _wristPosition.distanceTo(_middlePosition); const palmLength = _wristPosition.distanceTo(_middlePosition);
const scale = palmLength * GLOVE_MODEL_SCALE; const scale = palmLength * GLOVE_MODEL_SCALE;
group.scale.setScalar(scale); // Both gloves use the gant_l mesh; flip X for the right hand so the
// thumb ends up on the correct side instead of being a left-glove
// clone on the right hand.
const mirrorSignX = handedness === "right" ? -1 : 1;
group.scale.set(scale * mirrorSignX, scale, scale);
group.updateMatrixWorld(true); group.updateMatrixWorld(true);
applyFingerPose(fingerPoseChains, trackedHand.landmarks, camera); applyFingerPose(fingerPoseChains, trackedHand.landmarks, camera);
}); });
@@ -34,6 +34,8 @@ interface GrabbableObjectProps {
colliders?: ColliderShape; colliders?: ColliderShape;
label?: string; label?: string;
handControlled?: boolean; handControlled?: boolean;
disabled?: boolean;
onGrabChange?: (held: boolean) => void;
onPositionChange?: (position: THREE.Vector3) => void; onPositionChange?: (position: THREE.Vector3) => void;
onSnap?: (position: THREE.Vector3) => void; onSnap?: (position: THREE.Vector3) => void;
snapDuration?: number; snapDuration?: number;
@@ -131,6 +133,8 @@ export function GrabbableObject({
colliders = GRAB_DEFAULT_COLLIDERS, colliders = GRAB_DEFAULT_COLLIDERS,
label = GRAB_DEFAULT_LABEL, label = GRAB_DEFAULT_LABEL,
handControlled = false, handControlled = false,
disabled = false,
onGrabChange,
onPositionChange, onPositionChange,
onSnap, onSnap,
snapDuration = 0.25, snapDuration = 0.25,
@@ -152,6 +156,19 @@ export function GrabbableObject({
}; };
}, []); }, []);
useEffect(() => {
if (!disabled) return;
if (isHolding.current) {
isHolding.current = false;
onGrabChange?.(false);
}
if (isHandHolding.current) {
isHandHolding.current = false;
InteractionManager.getInstance().setHandHolding(false);
onGrabChange?.(false);
}
}, [disabled, onGrabChange]);
function snapToNearestTarget(): void { function snapToNearestTarget(): void {
const body = rbRef.current; const body = rbRef.current;
if (!body || snapTargets.length === 0 || snapRadius <= 0) return; if (!body || snapTargets.length === 0 || snapRadius <= 0) return;
@@ -242,14 +259,16 @@ export function GrabbableObject({
useFrame(() => { useFrame(() => {
if (!rbRef.current) return; if (!rbRef.current) return;
const fistHand = handControlled
? hands.find((hand) => hand.isFist)
: undefined;
const t = rbRef.current.translation(); const t = rbRef.current.translation();
_currentPos.set(t.x, t.y, t.z); _currentPos.set(t.x, t.y, t.z);
onPositionChange?.(_currentPos); onPositionChange?.(_currentPos);
if (disabled) return;
const fistHand = handControlled
? hands.find((hand) => hand.isFist)
: undefined;
if (fistHand) { if (fistHand) {
const handCenter = getHandCenterPoint(fistHand); const handCenter = getHandCenterPoint(fistHand);
@@ -267,15 +286,20 @@ export function GrabbableObject({
? getHandHit(groupRef.current, camera, _cameraPos, handCenter) ? getHandHit(groupRef.current, camera, _cameraPos, handCenter)
: null; : null;
isHandHolding.current = Boolean(hit); const hadHit = Boolean(hit);
InteractionManager.getInstance().setHandHolding(isHandHolding.current); if (hadHit) {
isHandHolding.current = true;
InteractionManager.getInstance().setHandHolding(true);
onGrabChange?.(true);
}
} }
} else { } else {
if (isHandHolding.current) { if (isHandHolding.current) {
snapToNearestTarget(); snapToNearestTarget();
isHandHolding.current = false;
InteractionManager.getInstance().setHandHolding(false);
onGrabChange?.(false);
} }
isHandHolding.current = false;
InteractionManager.getInstance().setHandHolding(false);
} }
if (!isHolding.current && !isHandHolding.current) return; if (!isHolding.current && !isHandHolding.current) return;
@@ -311,35 +335,41 @@ export function GrabbableObject({
position={position} position={position}
> >
<group ref={groupRef}> <group ref={groupRef}>
<InteractableObject {disabled ? (
kind="grab" children
label={label} ) : (
position={position} <InteractableObject
bodyRef={rbRef} kind="grab"
onPress={() => { label={label}
isHolding.current = true; position={position}
}} bodyRef={rbRef}
onRelease={() => { onPress={() => {
isHolding.current = false; isHolding.current = true;
snapToNearestTarget(); onGrabChange?.(true);
if ( }}
!rbRef.current || onRelease={() => {
grabDebugParams.throwBoost === GRAB_THROW_BOOST_DEFAULT isHolding.current = false;
) onGrabChange?.(false);
return; snapToNearestTarget();
const v = rbRef.current.linvel(); if (
rbRef.current.setLinvel( !rbRef.current ||
{ grabDebugParams.throwBoost === GRAB_THROW_BOOST_DEFAULT
x: v.x * grabDebugParams.throwBoost, )
y: v.y * grabDebugParams.throwBoost, return;
z: v.z * grabDebugParams.throwBoost, const v = rbRef.current.linvel();
}, rbRef.current.setLinvel(
true, {
); x: v.x * grabDebugParams.throwBoost,
}} y: v.y * grabDebugParams.throwBoost,
> z: v.z * grabDebugParams.throwBoost,
{children} },
</InteractableObject> true,
);
}}
>
{children}
</InteractableObject>
)}
</group> </group>
</RigidBody> </RigidBody>
</group> </group>
@@ -1,5 +1,6 @@
import type { ReactNode } from "react"; import type { ReactNode } from "react";
import { Component, useEffect, useMemo } from "react"; import { Component, useEffect, useMemo, useRef } from "react";
import * as THREE from "three";
import { useFrame } from "@react-three/fiber"; import { useFrame } from "@react-three/fiber";
import { useLoggedGLTF } from "@/hooks/three/useLoggedGLTF"; import { useLoggedGLTF } from "@/hooks/three/useLoggedGLTF";
import { useClonedObject } from "@/hooks/three/useClonedObject"; import { useClonedObject } from "@/hooks/three/useClonedObject";
@@ -9,6 +10,10 @@ import type { ModelTransformProps, Vector3Tuple } from "@/types/three/three";
import { logModelLoadError } from "@/utils/three/modelLoadLogger"; import { logModelLoadError } from "@/utils/three/modelLoadLogger";
import { toVector3Scale } from "@/utils/three/scale"; import { toVector3Scale } from "@/utils/three/scale";
export type ExplodedNodeAnchors = Readonly<Record<string, Vector3Tuple>>;
const _anchorWorld = new THREE.Vector3();
interface ModelErrorBoundaryProps { interface ModelErrorBoundaryProps {
children: ReactNode; children: ReactNode;
modelPath: string; modelPath: string;
@@ -67,6 +72,9 @@ interface ExplodableModelInnerProps extends ModelTransformProps {
split: boolean; split: boolean;
splitDistance?: number; splitDistance?: number;
onPartsReady?: (parts: readonly ExplodedPart[]) => void; onPartsReady?: (parts: readonly ExplodedPart[]) => void;
hideNodeNames?: readonly string[];
nodeAnchorNames?: readonly string[];
onNodeAnchorsChange?: (anchors: ExplodedNodeAnchors) => void;
} }
export function ExplodableModel( export function ExplodableModel(
@@ -93,6 +101,9 @@ function ExplodableModelInner({
scale = 1, scale = 1,
splitDistance = 1.2, splitDistance = 1.2,
onPartsReady, onPartsReady,
hideNodeNames,
nodeAnchorNames,
onNodeAnchorsChange,
}: ExplodableModelInnerProps): React.JSX.Element { }: ExplodableModelInnerProps): React.JSX.Element {
const { scene } = useLoggedGLTF(modelPath, { const { scene } = useLoggedGLTF(modelPath, {
scope: "ExplodableModel", scope: "ExplodableModel",
@@ -106,6 +117,24 @@ function ExplodableModelInner({
[model, splitDistance], [model, splitDistance],
); );
const parsedScale = toVector3Scale(scale); const parsedScale = toVector3Scale(scale);
const anchorSignatureRef = useRef("");
useEffect(() => {
if (!hideNodeNames || hideNodeNames.length === 0) return;
const hidden: THREE.Object3D[] = [];
model.traverse((child) => {
if (hideNodeNames.includes(child.name)) {
hidden.push(child);
child.visible = false;
}
});
return () => {
hidden.forEach((object) => {
object.visible = true;
});
};
}, [hideNodeNames, model]);
useEffect(() => { useEffect(() => {
explodedModel.setSplit(split); explodedModel.setSplit(split);
@@ -117,6 +146,35 @@ function ExplodableModelInner({
useFrame((_, delta) => { useFrame((_, delta) => {
explodedModel.update(delta); explodedModel.update(delta);
if (
!onNodeAnchorsChange ||
!nodeAnchorNames ||
nodeAnchorNames.length === 0
) {
return;
}
const anchors: Record<string, Vector3Tuple> = {};
nodeAnchorNames.forEach((name) => {
const node = model.getObjectByName(name);
if (!node) return;
node.getWorldPosition(_anchorWorld);
anchors[name] = [_anchorWorld.x, _anchorWorld.y, _anchorWorld.z];
});
const signature = nodeAnchorNames
.map((name) => {
const a = anchors[name];
return a
? `${name}:${a[0].toFixed(3)},${a[1].toFixed(3)},${a[2].toFixed(3)}`
: `${name}:?`;
})
.join("|");
if (signature === anchorSignatureRef.current) return;
anchorSignatureRef.current = signature;
onNodeAnchorsChange(anchors);
}); });
return ( return (
@@ -17,10 +17,29 @@ function applyShadowSettings(
}); });
} }
function applyOpacity(object: THREE.Object3D, opacity: number): void {
object.traverse((child) => {
if (!(child instanceof THREE.Mesh)) return;
const materials = Array.isArray(child.material)
? child.material
: [child.material];
materials.forEach((material) => {
if (!(material instanceof THREE.Material)) return;
material.transparent = opacity < 1;
material.opacity = opacity;
material.depthWrite = opacity >= 1;
material.needsUpdate = true;
});
});
}
interface SimpleModelConfig extends ModelTransformProps { interface SimpleModelConfig extends ModelTransformProps {
modelPath: string; modelPath: string;
castShadow?: boolean; castShadow?: boolean;
receiveShadow?: boolean; receiveShadow?: boolean;
opacity?: number;
} }
interface SimpleModelProps extends SimpleModelConfig { interface SimpleModelProps extends SimpleModelConfig {
@@ -34,6 +53,7 @@ export function SimpleModel({
scale = 1, scale = 1,
castShadow = true, castShadow = true,
receiveShadow = true, receiveShadow = true,
opacity = 1,
children, children,
}: SimpleModelProps): React.JSX.Element { }: SimpleModelProps): React.JSX.Element {
const { scene } = useLoggedGLTF(modelPath, { const { scene } = useLoggedGLTF(modelPath, {
@@ -48,6 +68,10 @@ export function SimpleModel({
applyShadowSettings(model, castShadow, receiveShadow); applyShadowSettings(model, castShadow, receiveShadow);
}, [castShadow, model, receiveShadow]); }, [castShadow, model, receiveShadow]);
useEffect(() => {
applyOpacity(model, opacity);
}, [model, opacity]);
const parsedScale = const parsedScale =
typeof scale === "number" ? ([scale, scale, scale] as Vector3Tuple) : scale; typeof scale === "number" ? ([scale, scale, scale] as Vector3Tuple) : scale;
+2
View File
@@ -1,6 +1,7 @@
import { Crosshair } from "@/components/ui/Crosshair"; import { Crosshair } from "@/components/ui/Crosshair";
import { DebugOverlayLayout } from "@/components/ui/debug/DebugOverlayLayout"; import { DebugOverlayLayout } from "@/components/ui/debug/DebugOverlayLayout";
import { GameSettingsMenu } from "@/components/ui/GameSettingsMenu"; import { GameSettingsMenu } from "@/components/ui/GameSettingsMenu";
import { HandTrackingFallback } from "@/components/ui/HandTrackingFallback";
import { HandTrackingVisualizer } from "@/components/ui/HandTrackingVisualizer"; import { HandTrackingVisualizer } from "@/components/ui/HandTrackingVisualizer";
import { InteractPrompt } from "@/components/ui/InteractPrompt"; import { InteractPrompt } from "@/components/ui/InteractPrompt";
import { RepairMovementLockIndicator } from "@/components/ui/RepairMovementLockIndicator"; import { RepairMovementLockIndicator } from "@/components/ui/RepairMovementLockIndicator";
@@ -15,6 +16,7 @@ export function GameUI(): React.JSX.Element {
<RepairMovementLockIndicator /> <RepairMovementLockIndicator />
<InteractPrompt /> <InteractPrompt />
<HandTrackingVisualizer /> <HandTrackingVisualizer />
<HandTrackingFallback />
<Subtitles /> <Subtitles />
<TalkieDialogueOverlay /> <TalkieDialogueOverlay />
<GameSettingsMenu /> <GameSettingsMenu />
@@ -0,0 +1,82 @@
import { useHandTrackingSnapshot } from "@/hooks/handTracking/useHandTrackingSnapshot";
import {
useHandTrackingGloveStatus,
type HandTrackingGloveHandedness,
} from "@/hooks/handTracking/useHandTrackingGloveStatus";
// Simple schematic silhouettes used as a last-resort fallback when the
// rigged glove model has failed to load. Both icons share the same
// 48x48 viewBox and the same stroke/fill rules from the .css.
const OpenHandShape = (): React.JSX.Element => (
<>
<ellipse cx="9" cy="30" rx="3" ry="6" transform="rotate(-25 9 30)" />
<rect x="14" y="8" width="4" height="22" rx="2" />
<rect x="20" y="4" width="4" height="26" rx="2" />
<rect x="26" y="6" width="4" height="24" rx="2" />
<rect x="32" y="10" width="4" height="20" rx="2" />
<rect x="10" y="26" width="28" height="18" rx="6" />
</>
);
const FistShape = (): React.JSX.Element => (
<>
<ellipse cx="8" cy="26" rx="3" ry="5" />
<rect x="10" y="14" width="28" height="30" rx="10" />
<circle cx="15" cy="14" r="3" />
<circle cx="21" cy="13" r="3" />
<circle cx="27" cy="13" r="3" />
<circle cx="33" cy="14" r="3" />
</>
);
function getHandedness(raw: string): HandTrackingGloveHandedness | null {
const lower = raw.toLowerCase();
if (lower === "left" || lower === "right") return lower;
return null;
}
export function HandTrackingFallback(): React.JSX.Element | null {
const { hands } = useHandTrackingSnapshot();
const gloveStatus = useHandTrackingGloveStatus((state) => state.gloves);
const visibleHands = hands.flatMap((hand, index) => {
const handedness = getHandedness(hand.handedness);
if (!handedness) return [];
if (gloveStatus[handedness] !== "error") return [];
const wrist = hand.landmarks[0];
if (!wrist) return [];
return [{ hand, handedness, wrist, index }];
});
if (visibleHands.length === 0) return null;
return (
<div className="hand-tracking-fallback" aria-hidden="true">
{visibleHands.map(({ hand, handedness, wrist, index }) => {
// MediaPipe coords are mirrored (selfie cam), keep the same
// mapping the SVG visualizer uses.
const leftPercent = (1 - wrist.x) * 100;
const topPercent = wrist.y * 100;
const flipX = handedness === "right" ? -1 : 1;
return (
<svg
key={`${handedness}-${index}`}
className="hand-tracking-fallback__icon"
viewBox="0 0 48 48"
style={{
left: `${leftPercent}%`,
top: `${topPercent}%`,
transform: `translate(-50%, -50%) scaleX(${flipX})`,
}}
>
{hand.isFist ? <FistShape /> : <OpenHandShape />}
</svg>
);
})}
</div>
);
}
+15 -5
View File
@@ -26,6 +26,12 @@ const HAND_CONNECTIONS: Array<[number, number]> = [
[0, 17], [0, 17],
]; ];
const LANDMARK_FILL = "#67e8f9"; // cyan-300, opaque interior
const LANDMARK_STROKE = "#0c4a6e"; // sky-900, dark blue outline
const LANDMARK_STROKE_FIST = "#1e3a8a"; // blue-900, thicker accent when fist
const CONNECTION_STROKE = "#ffffff"; // white bones
const INDEX_TIP_LANDMARK = 8;
export function HandTrackingVisualizer(): React.JSX.Element | null { export function HandTrackingVisualizer(): React.JSX.Element | null {
const { hands, status } = useHandTrackingSnapshot(); const { hands, status } = useHandTrackingSnapshot();
const showHandTrackingSvg = useDebugStore((debug) => const showHandTrackingSvg = useDebugStore((debug) =>
@@ -50,7 +56,9 @@ export function HandTrackingVisualizer(): React.JSX.Element | null {
const landmarks = hand.landmarks; const landmarks = hand.landmarks;
if (landmarks.length === 0) return null; if (landmarks.length === 0) return null;
const color = hand.isFist ? "#facc15" : "#38bdf8"; const landmarkStroke = hand.isFist
? LANDMARK_STROKE_FIST
: LANDMARK_STROKE;
return ( return (
<g key={`${hand.handedness}-${handIndex}`}> <g key={`${hand.handedness}-${handIndex}`}>
@@ -66,8 +74,8 @@ export function HandTrackingVisualizer(): React.JSX.Element | null {
y1={`${fromPoint.y * 100}%`} y1={`${fromPoint.y * 100}%`}
x2={`${(1 - toPoint.x) * 100}%`} x2={`${(1 - toPoint.x) * 100}%`}
y2={`${toPoint.y * 100}%`} y2={`${toPoint.y * 100}%`}
stroke={color} stroke={CONNECTION_STROKE}
strokeWidth="2" strokeWidth="2.5"
strokeLinecap="round" strokeLinecap="round"
/> />
); );
@@ -78,8 +86,10 @@ export function HandTrackingVisualizer(): React.JSX.Element | null {
key={landmarkIndex} key={landmarkIndex}
cx={`${(1 - landmark.x) * 100}%`} cx={`${(1 - landmark.x) * 100}%`}
cy={`${landmark.y * 100}%`} cy={`${landmark.y * 100}%`}
r={landmarkIndex === 8 ? 5 : 3} r={landmarkIndex === INDEX_TIP_LANDMARK ? 6 : 4}
fill={landmarkIndex === 8 ? "#ffffff" : color} fill={LANDMARK_FILL}
stroke={landmarkStroke}
strokeWidth={hand.isFist ? 2.5 : 2}
/> />
))} ))}
</g> </g>
+1 -1
View File
@@ -135,7 +135,7 @@ export const galleryModels: GalleryModel[] = [
}, },
{ id: "potager", name: "Potager", path: "/models/potager/potager.gltf" }, { id: "potager", name: "Potager", path: "/models/potager/potager.gltf" },
{ id: "puce", name: "Puce", path: "/models/puce/model.gltf" }, { id: "puce", name: "Puce", path: "/models/puce/model.gltf" },
{ id: "pylone", name: "Pylône", path: "/models/pylone/model.gltf" }, { id: "pylone", name: "Pylône", path: "/models/pylone/model.glb" },
{ {
id: "refroidisseur", id: "refroidisseur",
name: "Refroidisseur", name: "Refroidisseur",
+48 -1
View File
@@ -4,7 +4,7 @@ export const REPAIR_CASE_MODEL_PATH = "/models/packderelance/model.gltf";
export const REPAIR_CASE_OPEN_SOUND_PATH = "/sounds/effect/open-malette.mp3"; export const REPAIR_CASE_OPEN_SOUND_PATH = "/sounds/effect/open-malette.mp3";
export const REPAIR_CASE_CLOSE_SOUND_PATH = "/sounds/effect/close-malette.mp3"; export const REPAIR_CASE_CLOSE_SOUND_PATH = "/sounds/effect/close-malette.mp3";
export const REPAIR_CASE_LID_NODE_NAME = "partiesup"; export const REPAIR_CASE_LID_NODE_NAME = "partsup";
export const REPAIR_CASE_CLOSED_ROTATION_OFFSET_DEGREES = 0; export const REPAIR_CASE_CLOSED_ROTATION_OFFSET_DEGREES = 0;
export const REPAIR_CASE_OPEN_ROTATION_OFFSET_DEGREES = 115; export const REPAIR_CASE_OPEN_ROTATION_OFFSET_DEGREES = 115;
export const REPAIR_CASE_ANIMATION_DURATION = 0.8; export const REPAIR_CASE_ANIMATION_DURATION = 0.8;
@@ -27,3 +27,50 @@ export const REPAIR_CASE_FOCUS_SCALE = 2.25;
export const REPAIR_CASE_PLACEHOLDER_NAME_PREFIX = "placeholder_"; export const REPAIR_CASE_PLACEHOLDER_NAME_PREFIX = "placeholder_";
export const REPAIR_CASE_PLACEHOLDER_SNAP_RADIUS = 0.65; export const REPAIR_CASE_PLACEHOLDER_SNAP_RADIUS = 0.65;
export const REPAIR_CASE_PLACEHOLDER_SNAP_DURATION = 0.25; export const REPAIR_CASE_PLACEHOLDER_SNAP_DURATION = 0.25;
/**
* Names of nodes inside the packderelance GLTF where standalone part models
* are anchored (visually injected). The original meshes under these nodes are
* hidden at runtime so the standalone model takes their place.
*
* Some entries (e.g. `refroidisseur`) do not exist as nodes in the GLTF; an
* empty Object3D is created at mount time at the corresponding case-local
* fallback position so the anchoring pipeline is uniform.
*/
export const REPAIR_CASE_PART_ANCHOR_NAMES = [
"cabledroit",
"cablegauche",
"pucehaut",
"pucebas",
"refroidisseur",
] as const;
export type RepairCasePartAnchorName =
(typeof REPAIR_CASE_PART_ANCHOR_NAMES)[number];
/**
* Case-local positions used when an anchor node is missing from the GLTF.
* Values are expressed in the case model's local coordinate system (the case
* is rendered at small intrinsic scale; magnitudes are in the 0.01-0.25 range
* to match the existing nodes such as `cabledroit`).
*/
export const REPAIR_CASE_PART_ANCHOR_FALLBACKS: Record<
RepairCasePartAnchorName,
Vector3Tuple
> = {
cabledroit: [0.0087, 0.0139, 0.1921],
cablegauche: [0.0087, 0.0139, 0.2477],
pucehaut: [-0.0207, 0.009, -0.0479],
pucebas: [0.0987, 0.009, -0.0479],
refroidisseur: [0.05, 0.014, 0.05],
};
/**
* Quaternion applied to anchor nodes that are created at runtime (because
* the corresponding node is absent from the GLTF). Matches the rotation of
* the existing part nodes in packderelance to keep visual orientation
* consistent.
*/
export const REPAIR_CASE_PART_ANCHOR_FALLBACK_QUATERNION = [
0.7071068286895752, 0, 0, 0.7071068286895752,
] as const satisfies readonly [number, number, number, number];
+60 -29
View File
@@ -25,26 +25,48 @@ export const REPAIR_MISSIONS: Record<RepairMissionId, RepairMissionConfig> = {
interactUiPath: REPAIR_INTERACT_UI_PATH, interactUiPath: REPAIR_INTERACT_UI_PATH,
brokenUiPath: REPAIR_BROKEN_UI_PATH, brokenUiPath: REPAIR_BROKEN_UI_PATH,
case: DEFAULT_REPAIR_CASE, case: DEFAULT_REPAIR_CASE,
requiredReplacementPartId: "ebike-cooling-core-replacement", requiredReplacementPartIds: ["ebike-cooling-core-replacement"],
brokenParts: [ brokenParts: [
{ {
id: "ebike-cooling-core", id: "ebike-cooling-core",
label: "Cooling core", label: "Cooling core",
modelPath: "/models/refroidisseur/model.gltf", modelPath: "/models/refroidisseur/model.gltf",
nodeName: "refroidisseur", nodeName: "refroidisseur",
targetNodeName: "refroidisseur",
caseSlotName: "placeholder_1", caseSlotName: "placeholder_1",
}, },
], ],
replacementParts: [ replacementParts: [
{ {
id: "ebike-cooling-core-replacement", id: "ebike-cooling-core-replacement",
label: "Replacement cooling core", label: "Refroidisseur",
modelPath: "/models/refroidisseur/model.gltf", modelPath: "/models/refroidisseur/model.gltf",
caseAnchor: "refroidisseur",
targetNodeName: "refroidisseur",
}, },
{ {
id: "ebike-glove-distractor", id: "ebike-cable-right-distractor",
label: "Insulation glove", label: "Câble droit",
modelPath: "/models/gant_l/model.gltf", modelPath: "/models/cable1/model.gltf",
caseAnchor: "cabledroit",
},
{
id: "ebike-cable-left-distractor",
label: "Câble gauche",
modelPath: "/models/cable2/model.gltf",
caseAnchor: "cablegauche",
},
{
id: "ebike-puce-haut-distractor",
label: "Puce haute",
modelPath: "/models/puce/model.gltf",
caseAnchor: "pucehaut",
},
{
id: "ebike-puce-bas-distractor",
label: "Puce basse",
modelPath: "/models/puce/model.gltf",
caseAnchor: "pucebas",
}, },
], ],
}, },
@@ -53,43 +75,52 @@ export const REPAIR_MISSIONS: Record<RepairMissionId, RepairMissionConfig> = {
label: "Power pylon", label: "Power pylon",
description: description:
"Restore the pylon lamp relay and damaged panel before reconnecting the grid", "Restore the pylon lamp relay and damaged panel before reconnecting the grid",
modelPath: "/models/pylone/model.gltf", modelPath: "/models/pylone/model.glb",
stageUiPath: "/assets/world/UI/pylon-mission-notification.webm", stageUiPath: "/assets/world/UI/pylon-mission-notification.webm",
interactUiPath: REPAIR_INTERACT_UI_PATH, interactUiPath: REPAIR_INTERACT_UI_PATH,
brokenUiPath: REPAIR_BROKEN_UI_PATH, brokenUiPath: REPAIR_BROKEN_UI_PATH,
case: DEFAULT_REPAIR_CASE, case: DEFAULT_REPAIR_CASE,
reassemblySeconds: 1.8, reassemblySeconds: 1.8,
requiredReplacementPartId: "pylon-grid-relay-replacement", requiredReplacementPartIds: [
scanPartSeconds: 1.4, "pylon-cable-right-replacement",
brokenParts: [ "pylon-cable-left-replacement",
{
id: "pylon-grid-relay",
label: "Grid relay",
nodeName: "lampe",
caseSlotName: "placeholder_1",
},
{
id: "pylon-damaged-panel",
label: "Damaged solar panel",
nodeName: "panneau2",
caseSlotName: "placeholder_2",
},
], ],
scanPartSeconds: 1.4,
brokenParts: [],
replacementParts: [ replacementParts: [
{ {
id: "pylon-grid-relay-replacement", id: "pylon-cable-right-replacement",
label: "Replacement grid relay", label: "Câble droit",
modelPath: "/models/pylone/model.gltf", modelPath: "/models/cable1/model.gltf",
caseAnchor: "cabledroit",
caseLockGroup: "pylon-cable",
targetNodeName: "cable2",
}, },
{ {
id: "pylon-stone-distractor", id: "pylon-cable-left-replacement",
label: "Stone counterweight", label: "Câble gauche",
modelPath: "/models/galet/model.gltf", modelPath: "/models/cable2/model.gltf",
caseAnchor: "cablegauche",
caseLockGroup: "pylon-cable",
targetNodeName: "cable2",
}, },
{ {
id: "pylon-cooling-distractor", id: "pylon-cooling-distractor",
label: "Cooling core", label: "Refroidisseur",
modelPath: "/models/refroidisseur/model.gltf", modelPath: "/models/refroidisseur/model.gltf",
caseAnchor: "refroidisseur",
},
{
id: "pylon-puce-haut-distractor",
label: "Puce haute",
modelPath: "/models/puce/model.gltf",
caseAnchor: "pucehaut",
},
{
id: "pylon-puce-bas-distractor",
label: "Puce basse",
modelPath: "/models/puce/model.gltf",
caseAnchor: "pucebas",
}, },
], ],
}, },
@@ -104,7 +135,7 @@ export const REPAIR_MISSIONS: Record<RepairMissionId, RepairMissionConfig> = {
brokenUiPath: REPAIR_BROKEN_UI_PATH, brokenUiPath: REPAIR_BROKEN_UI_PATH,
case: DEFAULT_REPAIR_CASE, case: DEFAULT_REPAIR_CASE,
reassemblySeconds: 1.2, reassemblySeconds: 1.2,
requiredReplacementPartId: "farm-irrigation-pump-replacement", requiredReplacementPartIds: ["farm-irrigation-pump-replacement"],
scanPartSeconds: 0.9, scanPartSeconds: 0.9,
brokenParts: [ brokenParts: [
{ {
+19 -1
View File
@@ -1,5 +1,11 @@
export const HAND_TRACKING_FRAME_WIDTH = 320; export const HAND_TRACKING_FRAME_WIDTH = 320;
export const HAND_TRACKING_FRAME_HEIGHT = 240; export const HAND_TRACKING_FRAME_HEIGHT = 240;
// The browser MediaPipe model (hand_landmarker.task float16) is more
// sensitive than the backend Python model and needs a higher-resolution
// frame to detect hands reliably. The backend keeps 320x240 because that
// is the JPEG payload size sent over the WebSocket.
export const HAND_TRACKING_BROWSER_CAMERA_WIDTH = 640;
export const HAND_TRACKING_BROWSER_CAMERA_HEIGHT = 480;
export const HAND_TRACKING_TARGET_FPS = 10; export const HAND_TRACKING_TARGET_FPS = 10;
export const HAND_TRACKING_JPEG_QUALITY = 0.55; export const HAND_TRACKING_JPEG_QUALITY = 0.55;
export const HAND_TRACKING_CAMERA_TIMEOUT_MS = 8_000; export const HAND_TRACKING_CAMERA_TIMEOUT_MS = 8_000;
@@ -8,9 +14,21 @@ export const HAND_TRACKING_BROWSER_WASM_URL =
"https://cdn.jsdelivr.net/npm/@mediapipe/tasks-vision@0.10.35/wasm"; "https://cdn.jsdelivr.net/npm/@mediapipe/tasks-vision@0.10.35/wasm";
export const HAND_TRACKING_BROWSER_MODEL_URL = export const HAND_TRACKING_BROWSER_MODEL_URL =
"https://storage.googleapis.com/mediapipe-models/hand_landmarker/hand_landmarker/float16/1/hand_landmarker.task"; "https://storage.googleapis.com/mediapipe-models/hand_landmarker/hand_landmarker/float16/1/hand_landmarker.task";
export const HAND_TRACKING_BROWSER_DELEGATE: "CPU" | "GPU" = "CPU"; export const HAND_TRACKING_BROWSER_DELEGATE: "CPU" | "GPU" = "GPU";
// Delay before the runtime actually starts after `enabled` flips to true. // Delay before the runtime actually starts after `enabled` flips to true.
// Absorbs React StrictMode's mount/unmount/mount cycle in dev and rapid // Absorbs React StrictMode's mount/unmount/mount cycle in dev and rapid
// `nearby` toggles at trigger borders. Invisible to the user (~5 frames). // `nearby` toggles at trigger borders. Invisible to the user (~5 frames).
export const HAND_TRACKING_RUNTIME_START_DELAY_MS = 80; export const HAND_TRACKING_RUNTIME_START_DELAY_MS = 80;
// How long the hand tracking stays active after the trigger condition
// (nearby / holding / repair step) turns off. Gives MediaPipe enough time
// to initialize webcam + model + first frame inference before we cleanup,
// so the user actually sees their hands when entering a zone briefly.
export const HAND_TRACKING_LINGER_MS = 2000;
// EMA weight applied to the latest landmark frame. Lower = smoother but
// laggier; higher = more responsive but more jitter from raw MediaPipe
// noise. 0.4 keeps the glove and grabbed objects from trembling without
// feeling sluggish.
export const HAND_TRACKING_LANDMARK_SMOOTHING = 0.4;
+1 -1
View File
@@ -9,7 +9,7 @@ export const MAP_INSTANCING_ASSETS = {
}, },
pylone: { pylone: {
mapName: "pylone", mapName: "pylone",
modelPath: "/models/pylone/model.gltf", modelPath: "/models/pylone/model.glb",
scaleMultiplier: 1, scaleMultiplier: 1,
castShadow: true, castShadow: true,
receiveShadow: true, receiveShadow: true,
@@ -1,7 +1,8 @@
import { useEffect, useRef, useState } from "react"; import { useEffect, useRef, useState } from "react";
import { import {
HAND_TRACKING_FRAME_HEIGHT, HAND_TRACKING_BROWSER_CAMERA_HEIGHT,
HAND_TRACKING_FRAME_WIDTH, HAND_TRACKING_BROWSER_CAMERA_WIDTH,
HAND_TRACKING_LANDMARK_SMOOTHING,
HAND_TRACKING_RUNTIME_START_DELAY_MS, HAND_TRACKING_RUNTIME_START_DELAY_MS,
HAND_TRACKING_TARGET_FPS, HAND_TRACKING_TARGET_FPS,
} from "@/data/handTrackingConfig"; } from "@/data/handTrackingConfig";
@@ -10,11 +11,15 @@ import {
getBrowserHandLandmarker, getBrowserHandLandmarker,
releaseBrowserHandLandmarker, releaseBrowserHandLandmarker,
} from "@/lib/handTracking/browserHandTracking"; } from "@/lib/handTracking/browserHandTracking";
import { smoothHands } from "@/lib/handTracking/handSmoothing";
import { import {
INITIAL_HAND_TRACKING_SNAPSHOT, INITIAL_HAND_TRACKING_SNAPSHOT,
getCameraStreamWithTimeout, getCameraStreamWithTimeout,
} from "@/lib/handTracking/handTrackingSession"; } from "@/lib/handTracking/handTrackingSession";
import type { HandTrackingSnapshot } from "@/types/handTracking/handTracking"; import type {
HandTrackingHand,
HandTrackingSnapshot,
} from "@/types/handTracking/handTracking";
import { logger } from "@/utils/core/Logger"; import { logger } from "@/utils/core/Logger";
interface UseBrowserHandTrackingOptions { interface UseBrowserHandTrackingOptions {
@@ -30,6 +35,7 @@ export function useBrowserHandTracking({
const videoRef = useRef<HTMLVideoElement | null>(null); const videoRef = useRef<HTMLVideoElement | null>(null);
const streamRef = useRef<MediaStream | null>(null); const streamRef = useRef<MediaStream | null>(null);
const intervalRef = useRef<number | null>(null); const intervalRef = useRef<number | null>(null);
const previousHandsRef = useRef<HandTrackingHand[]>([]);
useEffect(() => { useEffect(() => {
if (!enabled) { if (!enabled) {
@@ -51,6 +57,7 @@ export function useBrowserHandTracking({
streamRef.current?.getTracks().forEach((track) => track.stop()); streamRef.current?.getTracks().forEach((track) => track.stop());
streamRef.current = null; streamRef.current = null;
videoRef.current = null; videoRef.current = null;
previousHandsRef.current = [];
releaseBrowserHandLandmarker(); releaseBrowserHandLandmarker();
}; };
@@ -66,8 +73,8 @@ export function useBrowserHandTracking({
try { try {
const stream = await getCameraStreamWithTimeout({ const stream = await getCameraStreamWithTimeout({
video: { video: {
width: HAND_TRACKING_FRAME_WIDTH, width: HAND_TRACKING_BROWSER_CAMERA_WIDTH,
height: HAND_TRACKING_FRAME_HEIGHT, height: HAND_TRACKING_BROWSER_CAMERA_HEIGHT,
facingMode: "user", facingMode: "user",
}, },
audio: false, audio: false,
@@ -124,7 +131,13 @@ export function useBrowserHandTracking({
video, video,
performance.now(), performance.now(),
); );
const hands = convertBrowserHandResult(result); const rawHands = convertBrowserHandResult(result);
const hands = smoothHands(
previousHandsRef.current,
rawHands,
HAND_TRACKING_LANDMARK_SMOOTHING,
);
previousHandsRef.current = hands;
setSnapshot((current) => ({ setSnapshot((current) => ({
...current, ...current,
@@ -3,10 +3,12 @@ import {
HAND_TRACKING_FRAME_HEIGHT, HAND_TRACKING_FRAME_HEIGHT,
HAND_TRACKING_FRAME_WIDTH, HAND_TRACKING_FRAME_WIDTH,
HAND_TRACKING_JPEG_QUALITY, HAND_TRACKING_JPEG_QUALITY,
HAND_TRACKING_LANDMARK_SMOOTHING,
HAND_TRACKING_RESPONSE_TIMEOUT_MS, HAND_TRACKING_RESPONSE_TIMEOUT_MS,
HAND_TRACKING_RUNTIME_START_DELAY_MS, HAND_TRACKING_RUNTIME_START_DELAY_MS,
HAND_TRACKING_TARGET_FPS, HAND_TRACKING_TARGET_FPS,
} from "@/data/handTrackingConfig"; } from "@/data/handTrackingConfig";
import { smoothHands } from "@/lib/handTracking/handSmoothing";
import { getHandTrackingWsUrl } from "@/utils/handTracking/handTrackingEndpoint"; import { getHandTrackingWsUrl } from "@/utils/handTracking/handTrackingEndpoint";
import { import {
INITIAL_HAND_TRACKING_SNAPSHOT, INITIAL_HAND_TRACKING_SNAPSHOT,
@@ -95,6 +97,7 @@ export function useRemoteHandTracking({
const sendIntervalRef = useRef<number | null>(null); const sendIntervalRef = useRef<number | null>(null);
const responseTimeoutRef = useRef<number | null>(null); const responseTimeoutRef = useRef<number | null>(null);
const waitingForResponseRef = useRef(false); const waitingForResponseRef = useRef(false);
const previousHandsRef = useRef<HandTrackingHand[]>([]);
useEffect(() => { useEffect(() => {
if (!enabled) { if (!enabled) {
@@ -128,6 +131,7 @@ export function useRemoteHandTracking({
streamRef.current = null; streamRef.current = null;
videoRef.current = null; videoRef.current = null;
canvasRef.current = null; canvasRef.current = null;
previousHandsRef.current = [];
}; };
const markResponseReceived = (): void => { const markResponseReceived = (): void => {
@@ -259,10 +263,16 @@ export function useRemoteHandTracking({
} }
if (data.type === "hands") { if (data.type === "hands") {
const smoothedHands = smoothHands(
previousHandsRef.current,
data.hands,
HAND_TRACKING_LANDMARK_SMOOTHING,
);
previousHandsRef.current = smoothedHands;
setSnapshot((current) => ({ setSnapshot((current) => ({
...current, ...current,
hands: data.hands, hands: smoothedHands,
usageStatus: data.hands.some((hand) => hand.isFist) usageStatus: smoothedHands.some((hand) => hand.isFist)
? "active" ? "active"
: "available", : "available",
serverStatus: null, serverStatus: null,
+20
View File
@@ -1789,6 +1789,26 @@ canvas {
filter: drop-shadow(0 0 8px rgba(56, 189, 248, 0.55)); filter: drop-shadow(0 0 8px rgba(56, 189, 248, 0.55));
} }
.hand-tracking-fallback {
position: fixed;
inset: 0;
z-index: 14;
width: 100vw;
height: 100vh;
pointer-events: none;
}
.hand-tracking-fallback__icon {
position: absolute;
width: 96px;
height: 96px;
fill: #67e8f9;
stroke: #0c4a6e;
stroke-width: 2;
stroke-linejoin: round;
filter: drop-shadow(0 0 8px rgba(56, 189, 248, 0.55));
}
/* Zustand game state debug UI */ /* Zustand game state debug UI */
.game-state-debug-panel { .game-state-debug-panel {
display: grid; display: grid;
+64
View File
@@ -0,0 +1,64 @@
import type {
HandTrackingHand,
HandTrackingLandmark,
} from "@/types/handTracking/handTracking";
function lerp(previous: number, next: number, factor: number): number {
return previous * (1 - factor) + next * factor;
}
function smoothLandmark(
previous: HandTrackingLandmark,
next: HandTrackingLandmark,
factor: number,
): HandTrackingLandmark {
return {
x: lerp(previous.x, next.x, factor),
y: lerp(previous.y, next.y, factor),
z: lerp(previous.z, next.z, factor),
};
}
function smoothHand(
previous: HandTrackingHand,
next: HandTrackingHand,
factor: number,
): HandTrackingHand {
return {
...next,
x: lerp(previous.x, next.x, factor),
y: lerp(previous.y, next.y, factor),
z: lerp(previous.z, next.z, factor),
landmarks: next.landmarks.map((landmark, index) => {
const previousLandmark = previous.landmarks[index];
if (!previousLandmark) return landmark;
return smoothLandmark(previousLandmark, landmark, factor);
}),
};
}
/**
* Apply an exponential moving average to the landmark positions of each
* detected hand. MediaPipe lands per-frame positions with noticeable
* jitter (especially at ~10fps), and feeding those raw values into the
* scene makes both the glove rig and any grabbed object tremble.
*
* `factor` is the weight given to the latest sample (0 = previous frame
* only, 1 = no smoothing). Hands are matched between frames by
* handedness so left/right don't bleed into each other.
*/
export function smoothHands(
previousHands: HandTrackingHand[],
nextHands: HandTrackingHand[],
factor: number,
): HandTrackingHand[] {
if (factor >= 1) return nextHands;
return nextHands.map((next) => {
const previous = previousHands.find(
(candidate) => candidate.handedness === next.handedness,
);
if (!previous) return next;
return smoothHand(previous, next, factor);
});
}
+53 -14
View File
@@ -1,4 +1,6 @@
import type { ReactNode } from "react"; import type { ReactNode } from "react";
import { useEffect, useState } from "react";
import { HAND_TRACKING_LINGER_MS } from "@/data/handTrackingConfig";
import { useSceneMode } from "@/hooks/debug/useSceneMode"; import { useSceneMode } from "@/hooks/debug/useSceneMode";
import { useDebugStore } from "@/hooks/debug/useDebugStore"; import { useDebugStore } from "@/hooks/debug/useDebugStore";
import { useInteraction } from "@/hooks/interaction/useInteraction"; import { useInteraction } from "@/hooks/interaction/useInteraction";
@@ -38,37 +40,74 @@ export function HandTrackingProvider({
} }
}); });
const { nearby, holding, handHolding } = useInteraction(); const { nearby, holding, handHolding } = useInteraction();
const enabled = const requested =
repairNeedsHands || repairNeedsHands ||
(sceneMode === "physics" && (nearby || holding || handHolding)); (sceneMode === "physics" && (nearby || holding || handHolding));
if (!enabled) { // Keep the runtime active a little after `requested` turns off so
return ( // MediaPipe has time to initialize the webcam + model + first frame
<HandTrackingContext value={HAND_TRACKING_IDLE_SNAPSHOT}> // before being torn down. Without this, a quick walk-through of a
{children} // trigger zone never produces a detected hand and the user sees
</HandTrackingContext> // nothing.
); const enabled = useLingeredFlag(requested, HAND_TRACKING_LINGER_MS);
}
return <ActiveHandTrackingProvider>{children}</ActiveHandTrackingProvider>; // Always render the same JSX root (HandTrackingRuntime). Returning
// different element types from this provider would force React to
// remount its entire subtree — including the <Canvas> below — every
// time `enabled` toggles, which destroys the WebGL context.
return (
<HandTrackingRuntime enabled={enabled}>{children}</HandTrackingRuntime>
);
} }
function ActiveHandTrackingProvider({ function useLingeredFlag(value: boolean, lingerMs: number): boolean {
const [latched, setLatched] = useState(value);
// Asymmetric sync: snap up immediately when `value` becomes true,
// debounce the down transition by `lingerMs`. The setLatched(true)
// call below is intentionally a direct setState inside an effect
// because that is exactly the pattern we want (mirror upward edge,
// delay downward edge), and there is no equivalent without it.
useEffect(() => {
if (value) {
// eslint-disable-next-line react-hooks/set-state-in-effect -- intentional upward edge sync, see hook comment
setLatched(true);
return undefined;
}
const timer = window.setTimeout(() => {
setLatched(false);
}, lingerMs);
return () => {
window.clearTimeout(timer);
};
}, [value, lingerMs]);
return latched;
}
function HandTrackingRuntime({
enabled,
children, children,
}: { }: {
enabled: boolean;
children: ReactNode; children: ReactNode;
}): React.JSX.Element { }): React.JSX.Element {
const handTrackingSource = useDebugStore((debug) => const handTrackingSource = useDebugStore((debug) =>
debug.getHandTrackingSource(), debug.getHandTrackingSource(),
); );
const backendSnapshot = useRemoteHandTracking({ const backendSnapshot = useRemoteHandTracking({
enabled: handTrackingSource === "backend", enabled: enabled && handTrackingSource === "backend",
}); });
const browserSnapshot = useBrowserHandTracking({ const browserSnapshot = useBrowserHandTracking({
enabled: handTrackingSource === "browser", enabled: enabled && handTrackingSource === "browser",
}); });
const snapshot = const snapshot = !enabled
handTrackingSource === "browser" ? browserSnapshot : backendSnapshot; ? HAND_TRACKING_IDLE_SNAPSHOT
: handTrackingSource === "browser"
? browserSnapshot
: backendSnapshot;
return <HandTrackingContext value={snapshot}>{children}</HandTrackingContext>; return <HandTrackingContext value={snapshot}>{children}</HandTrackingContext>;
} }
+30 -1
View File
@@ -3,6 +3,7 @@ import type {
Vector3Scale, Vector3Scale,
Vector3Tuple, Vector3Tuple,
} from "@/types/three/three"; } from "@/types/three/three";
import type { RepairCasePartAnchorName } from "@/data/gameplay/repairCaseConfig";
export const REPAIR_MISSION_IDS = ["ebike", "pylon", "farm"] as const; export const REPAIR_MISSION_IDS = ["ebike", "pylon", "farm"] as const;
@@ -24,7 +25,28 @@ export interface RepairMissionPartConfig {
id: string; id: string;
label: string; label: string;
nodeName?: string; nodeName?: string;
/**
* Name of a node inside the broken model where this part should snap on
* install. Used by replacement parts that target a slot in the broken
* model itself (e.g. pylon cable installs at the world-position of the
* pylon's `cable2` node), and by broken parts that should spawn at their
* original location on the broken model rather than a static offset.
*/
targetNodeName?: string;
caseSlotName?: string; caseSlotName?: string;
/**
* Anchor name in the packderelance case where this replacement part is
* visually injected. When set, the part spawns at the world-position of
* that anchor instead of a generic placeholder slot.
*/
caseAnchor?: RepairCasePartAnchorName;
/**
* Group identifier for mutually exclusive replacement parts (e.g. pylon
* cables: only one cable can be held/installed at a time). When one part
* of the group is held, others in the same group are visually ghosted
* and non-interactive.
*/
caseLockGroup?: string;
modelPath?: string; modelPath?: string;
} }
@@ -33,6 +55,7 @@ export interface RepairScannedBrokenPart {
label: string; label: string;
modelPath: string; modelPath: string;
caseSlotName?: string; caseSlotName?: string;
targetNodeName?: string;
} }
export interface RepairMissionConfig { export interface RepairMissionConfig {
@@ -46,7 +69,13 @@ export interface RepairMissionConfig {
brokenUiPath: string; brokenUiPath: string;
case: RepairMissionCaseConfig; case: RepairMissionCaseConfig;
reassemblySeconds?: number; reassemblySeconds?: number;
requiredReplacementPartId: string; /**
* Replacement part IDs accepted as the correct install. Multiple values
* are used when several alternatives are valid (e.g. pylon accepts either
* cable model). Install validation succeeds when any one of these parts
* is snapped into a placeholder slot.
*/
requiredReplacementPartIds: readonly string[];
scanPartSeconds?: number; scanPartSeconds?: number;
brokenParts: readonly RepairMissionPartConfig[]; brokenParts: readonly RepairMissionPartConfig[];
replacementParts: readonly RepairMissionPartConfig[]; replacementParts: readonly RepairMissionPartConfig[];