From 947eb7280b6dfa8de02d5cad175847522eda43a0 Mon Sep 17 00:00:00 2001 From: Paul C Roberts Date: Thu, 11 Jul 2024 13:52:22 -0700 Subject: [PATCH] Improve default uniform settings heuristic --- src/components/uniform.tsx | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/components/uniform.tsx b/src/components/uniform.tsx index 3b94431..bc0e336 100644 --- a/src/components/uniform.tsx +++ b/src/components/uniform.tsx @@ -177,16 +177,24 @@ export const getDefaultUniform = (name: string, value: number = 0): Uniform => { name === "theta" || name === "alpha" || name === "beta" || - name === "phi" + name === "phi" || + name.includes("angle") ) { return makeUniform(kPresetsMap.get("theta"), value); - } else if (name.startsWith("rgb-")) { + } else if (name.startsWith("rgb-") || name.startsWith("xyz-")) { return makeUniform(kPresetsMap.get("one"), value); - } - for (const settings of kPresetsMap.values()) { - if (value >= settings.min && value <= settings.max) { - return makeUniform(settings, value); - } + } else if (name.startsWith("lab-")) { + return makeUniform(kPresetsMap.get("hundred"), value); + } else if (name.startsWith("lch-")) { + return makeUniform( + kPresetsMap.get(name.endsWith(".z") ? "theta" : "hundred"), + value + ); + } else if (name.match(/\.[xyz]$/)) { + return makeUniform( + kPresetsMap.get(name.endsWith(".y") ? "five" : "pm_five"), + value + ); } return kDefaultUniform; };