partforge 0.149.0 → 0.149.1

package/docs/AUTHORING-PARTS.md

@@ -391,7 +391,9 @@ meta: { title: "…", units: "mm", environment: "studio" },
   treated as declaring one.
 - `color` — the base colour (`0xRRGGBB`). With a preset it is the TINT. Presets
   marked tintable are normally coloured this way (anodizing, plastic, paint);
-  the others have an intrinsic colour (brass) but still accept one.
+  the others have an intrinsic colour (brass) but still accept one. (A viewer
+  user PICKING an untintable preset drops an authored tint for that pick — see
+  the runtime section below.)
 - Overrides — each clamped to its range: `roughness` (0–1), `metalness` (0–1),
   `clearcoat` (0–1), `clearcoatRoughness` (0–1), `anisotropy` (0–1), `textureScale` (0.01–1000).
   Transmission, index of refraction, sheen and iridescence come only from a preset.
@@ -3316,7 +3318,11 @@ drive the same state:
 
 - `runtime.setSubPartDisplay(name, patch)` — merges `patch` over the sub-part's
   override and returns the override now held (`null` when nothing is left, or
-  for an unknown `name`). Appearance keys (`material`, `color`, `roughness`,
+  for an unknown `name`). An override `material` that names an untintable
+  preset (brass, oak, …) with no override `color` beside it drops the authored
+  `color` from the effective look — picking brass means brass, not red brass —
+  while a tintable pick keeps the authored colour; a host saving the pick into
+  source should remove `color` alongside writing `material`. Appearance keys (`material`, `color`, `roughness`,
   `metalness`, `clearcoat`, `clearcoatRoughness`, `anisotropy`, `textureScale`)
   merge over the authored `display` for every render — CAD, realistic and the
   `captureView` thumbnail — so a tile picked here is drawn exactly as if it had

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "partforge",
-  "version": "0.149.0",
+  "version": "0.149.1",
   "description": "Turn a declarative part definition into a parametric-CAD web app (three.js + Manifold/Replicad). Requires a Vite-based consumer.",
   "type": "module",
   "license": "MIT",

package/src/framework/materials/overrides.js

@@ -12,6 +12,7 @@
 //     animation opacity already uses), so a ghost can be faded further but not
 //     made solid from here.
 import { DISPLAY_KEYS, OVERRIDE_RANGES } from "./resolve.js";
+import { PRESETS } from "./presets.js";
 
 export const APPEARANCE_OVERRIDE_KEYS = DISPLAY_KEYS.filter((k) => k !== "opacity");
 export const VIEWING_KEYS = ["hidden", "opacity"];
@@ -65,19 +66,33 @@ export function mergeOverride(current, patch) {
   return Object.keys(next).length ? next : null;
 }
 
+// A preset whose colour is its own (brass, oak): an authored `color` still
+// tints it (resolve.js's contract), but a USER picking such a preset means
+// "make it look like that", so the pick drops the authored tint — red PLA
+// picked as brass is brass, not red brass. A tintable pick keeps the colour
+// (red PLA picked as PETG stays red). An explicit override colour wins either
+// way; the card only offers one for tintable presets.
+const untintable = (material) => typeof material === "string" && Object.hasOwn(PRESETS, material) && PRESETS[material].tintable !== true;
+
 // The display every material read sees: authored, with the override's
 // APPEARANCE keys on top. Viewing keys are never in it.
 export function effectiveDisplay(authored, override) {
   const out = isObject(authored) ? { ...authored } : {};
   if (!isObject(override)) return out;
   for (const key of APPEARANCE_OVERRIDE_KEYS) if (key in override) out[key] = override[key];
+  if ("material" in override && untintable(override.material) && !("color" in override)) delete out.color;
   return out;
 }
 
+const sameAppearance = (a, b) => APPEARANCE_OVERRIDE_KEYS.every((key) => a[key] === b[key]);
+
+// True when the override changes nothing about how the part is drawn — judged
+// on the EFFECTIVE display, not key by key, because an untintable material pick
+// with no colour of its own changes the look (the authored tint goes) while
+// naming the authored material.
 export function isAppearanceNoop(authored, override) {
   if (!isObject(override)) return true;
-  const a = isObject(authored) ? authored : {};
-  return APPEARANCE_OVERRIDE_KEYS.every((key) => !(key in override) || override[key] === a[key]);
+  return sameAppearance(effectiveDisplay(authored, null), effectiveDisplay(authored, override));
 }
 
 // A carried map, made safe for THIS part (spec A.4): names the part no longer
@@ -96,8 +111,17 @@ export function pruneOverrides(map, part) {
     if (!sp) continue;
     const clean = mergeOverride(null, sanitizeDisplayPatch(raw));
     if (!clean) continue;
+    // An appearance key goes when dropping it leaves the effective display as
+    // it is — which is "equals the authored value", except that an untintable
+    // material naming the authored material still earns its keep when it is
+    // what drops the authored tint.
     const authored = isObject(sp.display) ? sp.display : {};
-    for (const key of APPEARANCE_OVERRIDE_KEYS) if (key in clean && clean[key] === authored[key]) delete clean[key];
+    for (const key of APPEARANCE_OVERRIDE_KEYS) {
+      if (!(key in clean)) continue;
+      const without = { ...clean };
+      delete without[key];
+      if (sameAppearance(effectiveDisplay(authored, clean), effectiveDisplay(authored, without))) delete clean[key];
+    }
     if (Object.keys(clean).length) out[name] = clean;
   }
   return out;