Merge branch 'develop' into feat/e-bike

src/data/debug/testSceneConfig.ts

@@ -1,13 +1,15 @@
 import type { Vector3Tuple } from "@/types/three/three";
 import type { RepairMissionId } from "@/types/gameplay/repairMission";
 
+const DEG_TO_RAD = Math.PI / 180;
+
 export const TEST_SCENE_FLOOR_POSITION: Vector3Tuple = [0, -0.5, 0];
 export const TEST_SCENE_FLOOR_SIZE: Vector3Tuple = [200, 1, 200];
 export const TEST_SCENE_FLOOR_COLLIDER_HALF_EXTENTS: Vector3Tuple = [
   100, 0.5, 100,
 ];
 
-export const TEST_SCENE_GRABBABLE_POSITION: Vector3Tuple = [0, 1, -3];
+export const TEST_SCENE_GRABBABLE_POSITION: Vector3Tuple = [0, 0.25, -3];
 export const TEST_SCENE_GRABBABLE_BOX_SIZE: Vector3Tuple = [0.5, 0.5, 0.5];
 export const TEST_SCENE_GRABBABLE_COLOR = "#e07b39";
 export const TEST_SCENE_GRABBABLE_ROUGHNESS = 0.6;
@@ -23,6 +25,12 @@ export const TEST_SCENE_TRIGGER_METALNESS = 0.5;
 
 export const TEST_SCENE_REPAIR_ZONE_MARKER_RADIUS = 1.65;
 export const TEST_SCENE_REPAIR_ZONE_MARKER_TUBE_RADIUS = 0.045;
+export const TEST_SCENE_GPS_PREVIEW_POSITION: Vector3Tuple = [0, 5, -4.8];
+export const TEST_SCENE_GPS_PREVIEW_ROTATION: Vector3Tuple = [
+  -33 * DEG_TO_RAD,
+  0,
+  0,
+];
 
 export const GAME_REPAIR_ZONES = [
   {

src/data/galleryModels.ts

@@ -143,7 +143,7 @@ export const galleryModels: GalleryModel[] = [
   },
   { id: "sapin", name: "Sapin", path: "/models/sapin/model.gltf" },
   { id: "skybox", name: "Skybox", path: "/models/skybox/skybox.gltf" },
-  { id: "talkie", name: "Talkie", path: "/models/talkie/model.gltf" },
+  { id: "talkie", name: "Talkie", path: "/models/talkie/model.glb" },
   { id: "terrain", name: "Terrain", path: "/models/terrain/model.gltf" },
   {
     id: "tuyauxlac",

src/data/gameplay/repairMissions.ts

@@ -41,11 +41,6 @@ export const REPAIR_MISSIONS: Record<RepairMissionId, RepairMissionConfig> = {
         label: "Replacement cooling core",
         modelPath: "/models/refroidisseur/model.gltf",
       },
-      {
-        id: "ebike-radio-distractor",
-        label: "Radio module",
-        modelPath: "/models/talkie/model.gltf",
-      },
       {
         id: "ebike-glove-distractor",
         label: "Insulation glove",
@@ -134,11 +129,6 @@ export const REPAIR_MISSIONS: Record<RepairMissionId, RepairMissionConfig> = {
         label: "Tree sensor",
         modelPath: "/models/sapin/model.gltf",
       },
-      {
-        id: "farm-radio-distractor",
-        label: "Radio module",
-        modelPath: "/models/talkie/model.gltf",
-      },
     ],
   },
 };

src/data/handTrackingConfig.ts

@@ -8,3 +8,9 @@ export const HAND_TRACKING_BROWSER_WASM_URL =
   "https://cdn.jsdelivr.net/npm/@mediapipe/tasks-vision@0.10.35/wasm";
 export const HAND_TRACKING_BROWSER_MODEL_URL =
   "https://storage.googleapis.com/mediapipe-models/hand_landmarker/hand_landmarker/float16/1/hand_landmarker.task";
+export const HAND_TRACKING_BROWSER_DELEGATE: "CPU" | "GPU" = "CPU";
+
+// Delay before the runtime actually starts after `enabled` flips to true.
+// Absorbs React StrictMode's mount/unmount/mount cycle in dev and rapid
+// `nearby` toggles at trigger borders. Invisible to the user (~5 frames).
+export const HAND_TRACKING_RUNTIME_START_DELAY_MS = 80;

src/data/player/playerConfig.ts

@@ -20,4 +20,8 @@ export const PLAYER_SPAWN_POSITION_GAME: Vector3Tuple = [
   LA_FABRIK_PLAYER_SPAWN[1],
   LA_FABRIK_PLAYER_SPAWN[2] - 1,
 ];
-export const PLAYER_SPAWN_POSITION_PHYSICS: Vector3Tuple = [0, 3, 0];
+export const PLAYER_SPAWN_POSITION_PHYSICS: Vector3Tuple = [
+  0,
+  PLAYER_EYE_HEIGHT,
+  0,
+];

src/data/world/graphicsConfig.ts

@@ -1,9 +1,16 @@
-export const GRAPHICS_PRESET_KEYS = ["low", "medium", "high", "ultra"] as const;
+export const GRAPHICS_PRESET_KEYS = [
+  "low",
+  "medium",
+  "high",
+  "ultra",
+  "max",
+] as const;
 
 export type GraphicsPreset = (typeof GRAPHICS_PRESET_KEYS)[number];
 
 export interface GraphicsPresetConfig {
   chunkLoadRadius: number;
+  chunkStreamingEnabled: boolean;
   chunkUnloadRadius: number;
   fogEnabled: boolean;
   forceLodModels: boolean;
@@ -16,6 +23,7 @@ export const GRAPHICS_PRESETS = {
     label: "Basse",
     chunkLoadRadius: 10,
     chunkUnloadRadius: 18,
+    chunkStreamingEnabled: true,
     fogEnabled: true,
     forceLodModels: true,
     lodHighDetailDistance: 0,
@@ -24,25 +32,37 @@ export const GRAPHICS_PRESETS = {
     label: "Moyenne",
     chunkLoadRadius: 20,
     chunkUnloadRadius: 30,
+    chunkStreamingEnabled: true,
     fogEnabled: true,
     forceLodModels: true,
     lodHighDetailDistance: 0,
   },
   high: {
     label: "High",
-    chunkLoadRadius: 35,
-    chunkUnloadRadius: 45,
+    chunkLoadRadius: 30,
+    chunkUnloadRadius: 40,
+    chunkStreamingEnabled: true,
     fogEnabled: false,
     forceLodModels: false,
-    lodHighDetailDistance: 10,
+    lodHighDetailDistance: 20,
   },
   ultra: {
     label: "Ultra",
     chunkLoadRadius: 50,
     chunkUnloadRadius: 65,
+    chunkStreamingEnabled: true,
     fogEnabled: false,
     forceLodModels: false,
-    lodHighDetailDistance: 20,
+    lodHighDetailDistance: 30,
+  },
+  max: {
+    label: "Max",
+    chunkLoadRadius: 50,
+    chunkUnloadRadius: 65,
+    chunkStreamingEnabled: false,
+    fogEnabled: false,
+    forceLodModels: false,
+    lodHighDetailDistance: 50,
   },
 } as const satisfies Record<GraphicsPreset, GraphicsPresetConfig>;
 

src/data/world/lightingConfig.ts

@@ -3,9 +3,9 @@ const SUN_LIGHT_COLOR = "#ffe2bf";
 
 export const LIGHTING_DEFAULTS = {
   ambientColor: AMBIENT_LIGHT_COLOR,
-  ambientIntensity: 0.9,
+  ambientIntensity: 0.7,
   sunColor: SUN_LIGHT_COLOR,
-  sunIntensity: 2.2,
+  sunIntensity: 1.9,
   sunX: 70,
   sunY: 45,
   sunZ: 35,

src/data/world/mapLodConfig.ts

@@ -13,7 +13,9 @@ export const MAP_LOD_MODEL_PATHS = {
   lafabrik: "/models/lafabrik-LOD/model.gltf",
   maison1: "/models/maison1-LOD/model.gltf",
   panneauaffichage: "/models/panneauaffichage-LOD/model.gltf",
-  talkie: "/models/talkie-LOD/model.gltf",
+  arbre: "/models/arbre-LOD/model.glb",
+  buisson: "/models/buisson-LOD/model.glb",
+  sapin: "/models/sapin-LOD/model.glb",
 } as const satisfies Record<string, string>;
 
 export function getMapLodModelPath(modelName: string): string | null {
@@ -22,6 +24,19 @@ export function getMapLodModelPath(modelName: string): string | null {
   );
 }
 
+export const MAP_LOD_SCALE_MULTIPLIERS = {
+  sapin: 0.35,
+  buisson: 0.7,
+} as const satisfies Partial<Record<keyof typeof MAP_LOD_MODEL_PATHS, number>>;
+
+export function getMapLodScaleMultiplier(modelName: string): number {
+  return (
+    MAP_LOD_SCALE_MULTIPLIERS[
+      modelName as keyof typeof MAP_LOD_SCALE_MULTIPLIERS
+    ] ?? 1
+  );
+}
+
 export function selectMapModelPathByDistance({
   distance,
   modelName,