Compare commits
No commits in common. "c81dc68c0b99b6026ab36da00b6894a71ae97298" and "d6ad49d9cb5e95753162fdd7a23bcf0434c73275" have entirely different histories.
c81dc68c0b
...
d6ad49d9cb
1 changed files with 2 additions and 7 deletions
|
|
@ -296,17 +296,12 @@ const COLOUR_TOLERANCE = 50; // keeps #000000 and #161616 (~66 apart) distinct
|
|||
// The maker's name for a colour, when the palette has one that close. The
|
||||
// threshold is deliberately tight: this is identification, not substitution.
|
||||
function paletteName(hex, material) {
|
||||
// Seventeen PLA filaments are #000000. Whichever matched first would win, so
|
||||
// prefer the everyday product — Basic, then Matte — over specialist ones.
|
||||
const rank = (type) => (type === 'Basic' ? 0 : type === 'Matte' ? 1 : 2);
|
||||
let best = null;
|
||||
for (const f of palette) {
|
||||
if (material && filamentType(f.material) !== filamentType(material)) continue;
|
||||
for (const c of f.colours || []) {
|
||||
const d = colourDistance(hex, c);
|
||||
if (d === null || d > 12) continue;
|
||||
const better = !best || rank(f.type) < rank(best.type) || (rank(f.type) === rank(best.type) && d < best.d);
|
||||
if (better) best = { d, name: f.name, type: f.type };
|
||||
if (d !== null && d <= 12 && (!best || d < best.d)) best = { d, name: f.name, type: f.type };
|
||||
}
|
||||
}
|
||||
return best ? `${best.type} ${best.name}` : null;
|
||||
|
|
|
|||
Loading…
Reference in a new issue