Optimise

src/settings.ts

@@ -1,32 +1,63 @@
-import { appConfig, type GardenRuntimeSettings } from './config';
+import {
+  appConfig,
+  normalizeRuntimeSettings,
+  type GardenRuntimeSettings,
+} from './config';
 import { writeBrowserStorage } from './utils/browser-storage';
 import { getInitialVibe, type VibePreset } from './vibes';
 
-const buildSettings = (vibe: VibePreset): GardenRuntimeSettings => ({
-  ...appConfig.defaultSettings,
-  eraserSize: appConfig.toolbar.eraser.default,
-  mirrorSegmentCount: appConfig.toolbar.mirror.default,
-  ...vibe.settings,
+const preservedRuntimeSettingKeys = [
+  'eraserSize',
+  'adaptiveCapInitial',
+  'adaptiveCapMin',
+  'internalRenderAreaMegapixels',
+  'maxAgentCount',
+  'mirrorSegmentCount',
+] satisfies ReadonlyArray<keyof GardenRuntimeSettings>;
+
+const cloneRgbColor = <T extends [number, number, number]>(color: T): T =>
+  [...color] as T;
+
+const cloneVibePreset = (vibe: VibePreset): VibePreset => ({
+  ...vibe,
+  colors: vibe.colors.map(cloneRgbColor) as VibePreset['colors'],
+  backgroundColor: cloneRgbColor(vibe.backgroundColor),
+  settings: { ...vibe.settings },
+  audio: { ...vibe.audio },
 });
 
-export let activeVibe = getInitialVibe();
+const buildSettings = (vibe: VibePreset): GardenRuntimeSettings =>
+  normalizeRuntimeSettings(
+    {
+      ...appConfig.defaultSettings,
+      eraserSize: appConfig.toolbar.eraser.default,
+      mirrorSegmentCount: appConfig.toolbar.mirror.default,
+      ...vibe.settings,
+    },
+    appConfig.runtimeSettings.controls
+  );
+
+export let activeVibe = cloneVibePreset(getInitialVibe());
 
 export const settings: GardenRuntimeSettings = {
   ...buildSettings(activeVibe),
 };
 
 export const applyVibeSettings = (vibe: VibePreset) => {
-  activeVibe = vibe;
-  Object.assign(settings, {
-    ...buildSettings(vibe),
-    eraserSize: settings.eraserSize,
-    adaptiveCapInitial: settings.adaptiveCapInitial,
-    adaptiveCapMin: settings.adaptiveCapMin,
-    internalRenderAreaMegapixels: settings.internalRenderAreaMegapixels,
-    maxAgentCount: settings.maxAgentCount,
-    mirrorSegmentCount: settings.mirrorSegmentCount,
-    selectedColorIndex: Math.min(settings.selectedColorIndex, vibe.colors.length - 1),
+  activeVibe = cloneVibePreset(vibe);
+  const nextSettings = buildSettings(activeVibe);
+  preservedRuntimeSettingKeys.forEach((key) => {
+    nextSettings[key] = settings[key];
   });
+  nextSettings.selectedColorIndex = Math.min(
+    settings.selectedColorIndex,
+    activeVibe.colors.length - 1
+  );
+
+  Object.assign(
+    settings,
+    normalizeRuntimeSettings(nextSettings, appConfig.runtimeSettings.controls)
+  );
 
   writeBrowserStorage(appConfig.storage.vibeKey, vibe.id);