Merge branch 'develop' into feat/polish-mission-2

src/managers/stores/useDebugVisualsStore.ts

@@ -0,0 +1,35 @@
+import { create } from "zustand";
+
+interface DebugVisualsStore {
+  showPlayerModel: boolean;
+  setShowPlayerModel: (value: boolean) => void;
+  showOctree: boolean;
+  setShowOctree: (value: boolean) => void;
+  octreeMaxDepth: number;
+  setOctreeMaxDepth: (value: number) => void;
+  octreeMinDepth: number;
+  setOctreeMinDepth: (value: number) => void;
+  octreeLeavesOnly: boolean;
+  setOctreeLeavesOnly: (value: boolean) => void;
+  octreeOpacity: number;
+  setOctreeOpacity: (value: number) => void;
+  octreeFabrikOnly: boolean;
+  setOctreeFabrikOnly: (value: boolean) => void;
+}
+
+export const useDebugVisualsStore = create<DebugVisualsStore>((set) => ({
+  showPlayerModel: false,
+  setShowPlayerModel: (showPlayerModel) => set({ showPlayerModel }),
+  showOctree: false,
+  setShowOctree: (showOctree) => set({ showOctree }),
+  octreeMaxDepth: 8,
+  setOctreeMaxDepth: (octreeMaxDepth) => set({ octreeMaxDepth }),
+  octreeMinDepth: 4,
+  setOctreeMinDepth: (octreeMinDepth) => set({ octreeMinDepth }),
+  octreeLeavesOnly: true,
+  setOctreeLeavesOnly: (octreeLeavesOnly) => set({ octreeLeavesOnly }),
+  octreeOpacity: 0.35,
+  setOctreeOpacity: (octreeOpacity) => set({ octreeOpacity }),
+  octreeFabrikOnly: false,
+  setOctreeFabrikOnly: (octreeFabrikOnly) => set({ octreeFabrikOnly }),
+}));

src/managers/stores/useSettingsStore.ts

@@ -1,4 +1,5 @@
 import { create } from "zustand";
+import { createJSONStorage, persist } from "zustand/middleware";
 import { AudioManager } from "@/managers/AudioManager";
 import type { AudioCategory } from "@/managers/AudioManager";
 import type { SubtitleLanguage } from "@/types/settings/settings";
@@ -33,6 +34,8 @@ const DEFAULT_SETTINGS: SettingsState = {
   subtitleLanguage: "fr",
 };
 
+const SETTINGS_STORAGE_KEY = "la-fabrik-settings";
+
 function clampVolume(volume: number): number {
   return Math.max(0, Math.min(1, volume));
 }
@@ -46,36 +49,50 @@ function setAudioCategoryVolume(
   return nextVolume;
 }
 
-function applyDefaultAudioSettings(): void {
-  AudioManager.getInstance().setCategoryVolume(
-    "music",
-    DEFAULT_SETTINGS.musicVolume,
-  );
-  AudioManager.getInstance().setCategoryVolume(
-    "sfx",
-    DEFAULT_SETTINGS.sfxVolume,
-  );
+function applyAudioSettings(
+  settings: Pick<SettingsState, "musicVolume" | "sfxVolume" | "dialogueVolume">,
+): void {
+  AudioManager.getInstance().setCategoryVolume("music", settings.musicVolume);
+  AudioManager.getInstance().setCategoryVolume("sfx", settings.sfxVolume);
   AudioManager.getInstance().setCategoryVolume(
     "dialogue",
-    DEFAULT_SETTINGS.dialogueVolume,
+    settings.dialogueVolume,
   );
 }
 
-applyDefaultAudioSettings();
+applyAudioSettings(DEFAULT_SETTINGS);
 
-export const useSettingsStore = create<SettingsStore>()((set) => ({
-  ...DEFAULT_SETTINGS,
-  setSettingsMenuOpen: (isSettingsMenuOpen) => set({ isSettingsMenuOpen }),
-  setMusicVolume: (volume) =>
-    set({ musicVolume: setAudioCategoryVolume("music", volume) }),
-  setSfxVolume: (volume) =>
-    set({ sfxVolume: setAudioCategoryVolume("sfx", volume) }),
-  setDialogueVolume: (volume) =>
-    set({ dialogueVolume: setAudioCategoryVolume("dialogue", volume) }),
-  setSubtitlesEnabled: (subtitlesEnabled) => set({ subtitlesEnabled }),
-  setSubtitleLanguage: (subtitleLanguage) => set({ subtitleLanguage }),
-  resetSettings: () => {
-    applyDefaultAudioSettings();
-    set(DEFAULT_SETTINGS);
-  },
-}));
+export const useSettingsStore = create<SettingsStore>()(
+  persist(
+    (set) => ({
+      ...DEFAULT_SETTINGS,
+      setSettingsMenuOpen: (isSettingsMenuOpen) => set({ isSettingsMenuOpen }),
+      setMusicVolume: (volume) =>
+        set({ musicVolume: setAudioCategoryVolume("music", volume) }),
+      setSfxVolume: (volume) =>
+        set({ sfxVolume: setAudioCategoryVolume("sfx", volume) }),
+      setDialogueVolume: (volume) =>
+        set({ dialogueVolume: setAudioCategoryVolume("dialogue", volume) }),
+      setSubtitlesEnabled: (subtitlesEnabled) => set({ subtitlesEnabled }),
+      setSubtitleLanguage: (subtitleLanguage) => set({ subtitleLanguage }),
+      resetSettings: () => {
+        applyAudioSettings(DEFAULT_SETTINGS);
+        set(DEFAULT_SETTINGS);
+      },
+    }),
+    {
+      name: SETTINGS_STORAGE_KEY,
+      storage: createJSONStorage(() => window.localStorage),
+      partialize: (state) => ({
+        dialogueVolume: state.dialogueVolume,
+        musicVolume: state.musicVolume,
+        sfxVolume: state.sfxVolume,
+        subtitleLanguage: state.subtitleLanguage,
+        subtitlesEnabled: state.subtitlesEnabled,
+      }),
+      onRehydrateStorage: () => (state) => {
+        if (state) applyAudioSettings(state);
+      },
+    },
+  ),
+);

src/managers/stores/useWorldSettingsStore.ts

@@ -1,4 +1,5 @@
 import { create } from "zustand";
+import { createJSONStorage, persist } from "zustand/middleware";
 import { CLOUD_DEFAULTS, type CloudState } from "@/data/world/cloudConfig";
 import { FOG_CONFIG, type FogState } from "@/data/world/fogConfig";
 import { WIND_DEFAULTS, type WindState } from "@/data/world/windConfig";
@@ -46,73 +47,89 @@ const DEFAULT_STATE: WorldSettingsState = {
   graphics: { ...GRAPHICS_DEFAULTS },
 };
 
-export const useWorldSettingsStore = create<WorldSettingsStore>()((set) => ({
-  ...DEFAULT_STATE,
+const WORLD_SETTINGS_STORAGE_KEY = "la-fabrik-world-settings";
 
-  setClouds: (cloudsUpdate) =>
-    set((state) => ({
-      clouds: { ...state.clouds, ...cloudsUpdate },
-    })),
+export const useWorldSettingsStore = create<WorldSettingsStore>()(
+  persist(
+    (set) => ({
+      ...DEFAULT_STATE,
 
-  setFog: (fogUpdate) =>
-    set((state) => ({
-      fog: { ...state.fog, ...fogUpdate },
-    })),
+      setClouds: (cloudsUpdate) =>
+        set((state) => ({
+          clouds: { ...state.clouds, ...cloudsUpdate },
+        })),
 
-  setWind: (windUpdate) =>
-    set((state) => ({
-      wind: { ...state.wind, ...windUpdate },
-    })),
+      setFog: (fogUpdate) =>
+        set((state) => ({
+          fog: { ...state.fog, ...fogUpdate },
+        })),
 
-  setWindSpeed: (speed) =>
-    set((state) => ({
-      wind: { ...state.wind, speed },
-    })),
+      setWind: (windUpdate) =>
+        set((state) => ({
+          wind: { ...state.wind, ...windUpdate },
+        })),
 
-  setWindDirection: (direction) =>
-    set((state) => ({
-      wind: { ...state.wind, direction },
-    })),
+      setWindSpeed: (speed) =>
+        set((state) => ({
+          wind: { ...state.wind, speed },
+        })),
 
-  setWindStrength: (strength) =>
-    set((state) => ({
-      wind: { ...state.wind, strength },
-    })),
+      setWindDirection: (direction) =>
+        set((state) => ({
+          wind: { ...state.wind, direction },
+        })),
 
-  setGraphics: (graphicsUpdate) =>
-    set((state) => ({
-      graphics: { ...state.graphics, ...graphicsUpdate },
-    })),
+      setWindStrength: (strength) =>
+        set((state) => ({
+          wind: { ...state.wind, strength },
+        })),
 
-  setGraphicsPreset: (preset) =>
-    set((state) => ({
-      graphics: { ...state.graphics, preset },
-    })),
+      setGraphics: (graphicsUpdate) =>
+        set((state) => ({
+          graphics: { ...state.graphics, ...graphicsUpdate },
+        })),
 
-  setDynamicGrass: (dynamicGrass) =>
-    set((state) => ({
-      graphics: { ...state.graphics, dynamicGrass },
-    })),
+      setGraphicsPreset: (preset) =>
+        set((state) => ({
+          graphics: { ...state.graphics, preset },
+        })),
 
-  setDynamicTrees: (dynamicTrees) =>
-    set((state) => ({
-      graphics: { ...state.graphics, dynamicTrees },
-    })),
+      setDynamicGrass: (dynamicGrass) =>
+        set((state) => ({
+          graphics: { ...state.graphics, dynamicGrass },
+        })),
 
-  setDynamicClouds: (dynamicClouds) =>
-    set((state) => ({
-      graphics: { ...state.graphics, dynamicClouds },
-    })),
+      setDynamicTrees: (dynamicTrees) =>
+        set((state) => ({
+          graphics: { ...state.graphics, dynamicTrees },
+        })),
 
-  setShadowsEnabled: (shadowsEnabled) =>
-    set((state) => ({
-      graphics: { ...state.graphics, shadowsEnabled },
-    })),
+      setDynamicClouds: (dynamicClouds) =>
+        set((state) => ({
+          graphics: { ...state.graphics, dynamicClouds },
+        })),
 
-  setGrassDensity: (grassDensity) =>
-    set((state) => ({
-      graphics: { ...state.graphics, grassDensity },
-    })),
+      setShadowsEnabled: (shadowsEnabled) =>
+        set((state) => ({
+          graphics: { ...state.graphics, shadowsEnabled },
+        })),
 
-  resetToDefaults: () => set(DEFAULT_STATE),
-}));
+      setGrassDensity: (grassDensity) =>
+        set((state) => ({
+          graphics: { ...state.graphics, grassDensity },
+        })),
+
+      resetToDefaults: () => set(DEFAULT_STATE),
+    }),
+    {
+      name: WORLD_SETTINGS_STORAGE_KEY,
+      storage: createJSONStorage(() => window.localStorage),
+      partialize: (state) => ({
+        clouds: state.clouds,
+        fog: state.fog,
+        graphics: state.graphics,
+        wind: state.wind,
+      }),
+    },
+  ),
+);