jscad-electronics 0.0.187 → 0.0.189

package/dist/vanilla.js

@@ -22,6 +22,18 @@ function h(type, props, ...restChildren) {
 import { mp } from "@tscircuit/modelprinter";
 import { fp } from "@tscircuit/footprinter";
 
+// lib/materials.ts
+var componentMaterials = {
+  moldedPlastic: { metalness: 0, roughness: 0.7 },
+  rubber: { metalness: 0, roughness: 0.9 },
+  sleeve: { metalness: 0, roughness: 0.45 },
+  tinnedLead: { metalness: 0.8, roughness: 0.55 },
+  goldContact: { metalness: 1, roughness: 0.25 },
+  copper: { metalness: 1, roughness: 0.35 },
+  brushedMetal: { metalness: 1, roughness: 0.4 },
+  steel: { metalness: 1, roughness: 0.25 }
+};
+
 // lib/vanilla/primitives.ts
 var Cuboid = /* @__PURE__ */ Symbol("Cuboid");
 var Cube = /* @__PURE__ */ Symbol("Cube");
@@ -52,7 +64,7 @@ var FootprintPad = ({
 }) => {
   const color = isPin1 ? [0, 255, 0] : [255, 0, 0];
   if (pad.shape === "rect" || pad.shape === "rotated_rect") {
-    return /* @__PURE__ */ jsx(Colorize, { color, children: /* @__PURE__ */ jsx(Translate, { offset: [pad.x, pad.y, -5e-3], children: /* @__PURE__ */ jsx(
+    return /* @__PURE__ */ jsx(Colorize, { color, material: componentMaterials.copper, children: /* @__PURE__ */ jsx(Translate, { offset: [pad.x, pad.y, -5e-3], children: /* @__PURE__ */ jsx(
       Rotate,
       {
         angles: [
@@ -66,14 +78,14 @@ var FootprintPad = ({
   }
   if (pad.shape === "circle") {
     const radius = pad.radius ?? pad.r ?? 0.25;
-    return /* @__PURE__ */ jsx(Colorize, { color, children: /* @__PURE__ */ jsx(Translate, { offset: [pad.x, pad.y, -5e-3], children: /* @__PURE__ */ jsx(Cylinder, { radius, height: PAD_THICKNESS }) }) });
+    return /* @__PURE__ */ jsx(Colorize, { color, material: componentMaterials.copper, children: /* @__PURE__ */ jsx(Translate, { offset: [pad.x, pad.y, -5e-3], children: /* @__PURE__ */ jsx(Cylinder, { radius, height: PAD_THICKNESS }) }) });
   }
   if (pad.shape === "polygon") {
     const points = (pad.points ?? []).map(
       ({ x, y }) => [x, y]
     );
     if (points.length < 3) return null;
-    return /* @__PURE__ */ jsx(Colorize, { color, children: /* @__PURE__ */ jsx(Translate, { offset: [0, 0, -5e-3], children: /* @__PURE__ */ jsx(ExtrudeLinear, { height: PAD_THICKNESS, children: /* @__PURE__ */ jsx(Polygon, { points }) }) }) });
+    return /* @__PURE__ */ jsx(Colorize, { color, material: componentMaterials.copper, children: /* @__PURE__ */ jsx(Translate, { offset: [0, 0, -5e-3], children: /* @__PURE__ */ jsx(ExtrudeLinear, { height: PAD_THICKNESS, children: /* @__PURE__ */ jsx(Polygon, { points }) }) }) });
   }
   throw new Error("Shape not supported: " + pad.shape);
 };
@@ -85,13 +97,13 @@ var FootprintPlatedHole = ({
 }) => {
   const color = isPin1 ? "#00ff00" : "#b87333";
   if (hole.shape === "circle") {
-    return /* @__PURE__ */ jsx(Colorize, { color, children: /* @__PURE__ */ jsx(Translate, { offset: [hole.x, hole.y, -5e-3], children: /* @__PURE__ */ jsxs(Subtract, { children: [
+    return /* @__PURE__ */ jsx(Colorize, { color, material: componentMaterials.copper, children: /* @__PURE__ */ jsx(Translate, { offset: [hole.x, hole.y, -5e-3], children: /* @__PURE__ */ jsxs(Subtract, { children: [
       /* @__PURE__ */ jsx(Cylinder, { radius: hole.outer_diameter / 2, height: 0.01 }),
       /* @__PURE__ */ jsx(Cylinder, { radius: hole.hole_diameter / 2, height: 0.01 })
     ] }) }) });
   }
   if (hole.shape === "circular_hole_with_rect_pad") {
-    return /* @__PURE__ */ jsx(Colorize, { color, children: /* @__PURE__ */ jsx(Translate, { offset: [hole.x, hole.y, 0], children: /* @__PURE__ */ jsxs(Subtract, { children: [
+    return /* @__PURE__ */ jsx(Colorize, { color, material: componentMaterials.copper, children: /* @__PURE__ */ jsx(Translate, { offset: [hole.x, hole.y, 0], children: /* @__PURE__ */ jsxs(Subtract, { children: [
       /* @__PURE__ */ jsx(
         Cuboid,
         {
@@ -109,7 +121,7 @@ var FootprintPlatedHole = ({
     const isHorizontal = width10 > height10;
     const holeWidth = hole.hole_width ?? 0.8;
     const holeHeight = hole.hole_height ?? 0.8;
-    return /* @__PURE__ */ jsx(Colorize, { color, children: /* @__PURE__ */ jsx(Translate, { offset: [hole.x, hole.y, 0], children: /* @__PURE__ */ jsxs(Subtract, { children: [
+    return /* @__PURE__ */ jsx(Colorize, { color, material: componentMaterials.copper, children: /* @__PURE__ */ jsx(Translate, { offset: [hole.x, hole.y, 0], children: /* @__PURE__ */ jsxs(Subtract, { children: [
       /* @__PURE__ */ jsxs(Hull, { children: [
         /* @__PURE__ */ jsx(
           Cylinder,
@@ -175,6 +187,7 @@ var ExtrudedPads = ({
   if (!circuitJson && footprint && [
     "nema",
     "hexsocketbolt",
+    "hexbolt",
     "sheetmetal",
     "spurgear",
     "wormgear",
@@ -206,6 +219,132 @@ var ExtrudedPads = ({
   ] });
 };
 
+// lib/models/hexbolt/mesh.ts
+import {
+  hexBoltModelPropsSchema
+} from "@tscircuit/modelprinter";
+function createHexBoltMesh(input, options = {}) {
+  const p = hexBoltModelPropsSchema.parse(input);
+  const segments = options.radialSegments ?? 96;
+  const axial = options.threadStepsPerTurn ?? 24;
+  if (!Number.isInteger(segments) || segments < 24 || segments > 192 || segments % 24 !== 0 || !Number.isInteger(axial) || axial < 24 || axial > 96)
+    throw new Error(
+      "Screw mesh resolution requires 24..192 radial segments divisible by 24 and 24..96 thread steps"
+    );
+  const positions = [], indices = [];
+  const welded = /* @__PURE__ */ new Map();
+  const vertex = (x, y, z) => {
+    const key = [x, y, z].map((v) => Math.round(v * 1e10)).join(":");
+    const existing = welded.get(key);
+    if (existing !== void 0) return existing;
+    const index = positions.length / 3;
+    positions.push(x, y, z);
+    welded.set(key, index);
+    return index;
+  };
+  const triangle = (a, b, c) => {
+    if (a === b || b === c || c === a) return;
+    const point = (i) => positions.slice(3 * i, 3 * i + 3);
+    const A = point(a), B = point(b), C = point(c);
+    const u = B.map((v2, i) => v2 - A[i]), v = C.map((w, i) => w - A[i]);
+    const area = Math.hypot(
+      u[1] * v[2] - u[2] * v[1],
+      u[2] * v[0] - u[0] * v[2],
+      u[0] * v[1] - u[1] * v[0]
+    );
+    if (area > 1e-12) indices.push(a, b, c);
+  };
+  const ring = (radiusAt, zAt) => Array.from({ length: segments }, (_, i) => {
+    const theta = i * 2 * Math.PI / segments, r = radiusAt(theta);
+    return vertex(
+      r * Math.cos(theta),
+      r * Math.sin(theta),
+      typeof zAt === "number" ? zAt : zAt(theta)
+    );
+  });
+  const connect = (a, b) => {
+    for (let i = 0; i < segments; i++) {
+      const n = (i + 1) % segments;
+      triangle(a[i], a[n], b[n]);
+      triangle(a[i], b[n], b[i]);
+    }
+  };
+  const cap = (a, z, up) => {
+    const c = vertex(0, 0, z);
+    for (let i = 0; i < segments; i++) {
+      const n = (i + 1) % segments;
+      up ? triangle(c, a[i], a[n]) : triangle(c, a[n], a[i]);
+    }
+  };
+  let previous = [];
+  const add = (radiusAt, zAt) => {
+    const r = ring(radiusAt, zAt);
+    if (previous.length) connect(previous, r);
+    previous = r;
+    return r;
+  };
+  const major = p.diameter / 2, minor = p.threadRootDiameter / 2, pitch = p.threadPitch;
+  const shaftEnd = -p.underHeadRadius;
+  const steps = p.showThreads ? Math.ceil((shaftEnd + p.length) / pitch * axial) : 1;
+  if ((steps + 100) * segments > 4e5)
+    throw new Error("Screw exceeds mesh resolution limit");
+  const levels = /* @__PURE__ */ new Set([
+    -p.length,
+    -p.length + p.tipChamfer,
+    shaftEnd
+  ]);
+  if (p.showThreads)
+    for (let i = 0; i <= steps; i++)
+      levels.add(-p.length + (shaftEnd + p.length) * i / steps);
+  for (const z of [...levels].sort((a, b) => a - b)) {
+    const r = add((theta) => {
+      const phase = (((z + p.length) / pitch - (p.threadHand === "right" ? 1 : -1) * theta / (2 * Math.PI)) % 1 + 1) % 1;
+      const d = Math.min(phase, 1 - phase);
+      const groove = Math.min(
+        major - minor,
+        Math.max(0, (d - 1 / 16) * pitch * Math.sqrt(3))
+      );
+      const thread = p.showThreads ? major - groove : major;
+      return Math.min(
+        thread,
+        major - Math.max(0, p.tipChamfer - (z + p.length))
+      );
+    }, z);
+    if (z === -p.length) cap(r, z, false);
+  }
+  add(() => major, shaftEnd);
+  const filletCenterR = major + p.underHeadRadius;
+  const filletCenterZ = shaftEnd;
+  for (let i = 1; i <= 16; i++) {
+    const angle = Math.PI - (Math.PI - Math.PI / 2) * i / 16;
+    add(
+      () => filletCenterR + p.underHeadRadius * Math.cos(angle),
+      filletCenterZ + p.underHeadRadius * Math.sin(angle)
+    );
+  }
+  const hexRadius = (theta) => p.headAcrossFlats / 2 / Math.max(
+    Math.abs(Math.sin(theta)),
+    Math.abs(Math.sin(theta + 2 * Math.PI / 3)),
+    Math.abs(Math.sin(theta + 4 * Math.PI / 3))
+  );
+  add(hexRadius, 0);
+  const slope = Math.tan(p.headChamferAngle * Math.PI / 180);
+  const start = p.headHeight - (p.headCornerDiameter - p.headChamferDiameter) / 2 * slope;
+  add(hexRadius, start);
+  for (let i = 1; i <= 12; i++) {
+    const z = start + (p.headHeight - start) * i / 12;
+    add(
+      (theta) => Math.min(
+        hexRadius(theta),
+        p.headChamferDiameter / 2 + (p.headHeight - z) / slope
+      ),
+      z
+    );
+  }
+  cap(previous, p.headHeight, true);
+  return { positions, indices };
+}
+
 // lib/mechanical/indexedMeshToGeom3.ts
 import jscad from "@jscad/modeling";
 function indexedMeshToGeom3(mesh) {
@@ -221,6 +360,14 @@ function indexedMeshToGeom3(mesh) {
   return jscad.geometries.geom3.fromPoints(polygons);
 }
 
+// lib/models/hexbolt/HexBolt.tsx
+function createHexBoltGeom(input, options) {
+  return indexedMeshToGeom3(createHexBoltMesh(input, options));
+}
+function HexBolt({ color = "#737e8f", ...props }) {
+  return /* @__PURE__ */ jsx(Colorize, { color, children: /* @__PURE__ */ jsx(Custom, { geometry: createHexBoltGeom(props) }) });
+}
+
 // lib/mechanical/helical-gear-mesh.ts
 import {
   getHelicalGearDimensions,
@@ -522,7 +669,7 @@ function HexSocketBolt({
   color = "#737e8f",
   ...props
 }) {
-  return /* @__PURE__ */ jsx(Colorize, { color, children: /* @__PURE__ */ jsx(Custom, { geometry: createHexSocketBoltGeom(props) }) });
+  return /* @__PURE__ */ jsx(Colorize, { color, material: componentMaterials.steel, children: /* @__PURE__ */ jsx(Custom, { geometry: createHexSocketBoltGeom(props) }) });
 }
 
 // lib/mechanical/sheet-metal-mesh.ts
@@ -675,7 +822,7 @@ function createSheetMetalGeom(input) {
   return indexedMeshToGeom3(createSheetMetalMesh(input));
 }
 function SheetMetal({ color = "#737e8f", ...props }) {
-  return /* @__PURE__ */ jsx(Colorize, { color, children: /* @__PURE__ */ jsx(Custom, { geometry: createSheetMetalGeom(props) }) });
+  return /* @__PURE__ */ jsx(Colorize, { color, material: componentMaterials.brushedMetal, children: /* @__PURE__ */ jsx(Custom, { geometry: createSheetMetalGeom(props) }) });
 }
 
 // lib/SpurGear.tsx
@@ -1078,23 +1225,40 @@ function NemaMotor({
       return /* @__PURE__ */ jsx(
         Colorize,
         {
+          material: section.name === "body" ? componentMaterials.moldedPlastic : section.name === "shaft" ? componentMaterials.steel : componentMaterials.brushedMetal,
           color: section.name === "body" ? bodyColor : section.name === "shaft" ? shaftColor : capColor,
           children: /* @__PURE__ */ jsx(Custom, { geometry: generalize({ simplify: true }, geometry) })
         },
         `${section.name}-${index}`
       );
     }),
-    createNemaMotorWireGeometry(p).map(({ geometry, color }, index) => /* @__PURE__ */ jsx(Colorize, { color, children: /* @__PURE__ */ jsx(Custom, { geometry: generalize({ simplify: true }, geometry) }) }, `wire-${index}`)),
+    createNemaMotorWireGeometry(p).map(({ geometry, color }, index) => /* @__PURE__ */ jsx(
+      Colorize,
+      {
+        material: componentMaterials.rubber,
+        color,
+        children: /* @__PURE__ */ jsx(Custom, { geometry: generalize({ simplify: true }, geometry) })
+      },
+      `wire-${index}`
+    )),
     screw && [-halfPitch, halfPitch].flatMap(
-      (x) => [-halfPitch, halfPitch].map((y) => /* @__PURE__ */ jsx(Colorize, { color: screwColor, children: /* @__PURE__ */ jsx(
-        Custom,
+      (x) => [-halfPitch, halfPitch].map((y) => /* @__PURE__ */ jsx(
+        Colorize,
         {
-          geometry: jscad3.transforms.translate(
-            [x, y, -p.bodyLength],
-            generalize({ simplify: true }, screw)
+          material: componentMaterials.steel,
+          color: screwColor,
+          children: /* @__PURE__ */ jsx(
+            Custom,
+            {
+              geometry: jscad3.transforms.translate(
+                [x, y, -p.bodyLength],
+                generalize({ simplify: true }, screw)
+              )
+            }
           )
-        }
-      ) }, `rear-screw-${x}-${y}`))
+        },
+        `rear-screw-${x}-${y}`
+      ))
     )
   ] });
 }
@@ -1464,7 +1628,7 @@ var ChipBody = ({
       chamferCutout(-xOffset, -yOffset)
     ] });
   }
-  return /* @__PURE__ */ jsx(Colorize, { color, children: /* @__PURE__ */ jsx(Translate, { offset: center, children: /* @__PURE__ */ jsx(Translate, { offset: { x: 0, y: 0, z: heightAboveSurface2 }, children: includeNotch ? /* @__PURE__ */ jsxs(Subtract, { children: [
+  return /* @__PURE__ */ jsx(Colorize, { color, material: componentMaterials.moldedPlastic, children: /* @__PURE__ */ jsx(Translate, { offset: center, children: /* @__PURE__ */ jsx(Translate, { offset: { x: 0, y: 0, z: heightAboveSurface2 }, children: includeNotch ? /* @__PURE__ */ jsxs(Subtract, { children: [
     finalBody,
     /* @__PURE__ */ jsx(Translate, { offset: actualNotchPosition, children: /* @__PURE__ */ jsx(Rotate, { rotation: notchRotation, children: /* @__PURE__ */ jsx(Cylinder, { radius: actualNotchRadius, height: notchWidth }) }) })
   ] }) : finalBody }) }) });
@@ -1562,12 +1726,19 @@ var heightAboveSurface = 0.5;
 var DipPinLeg = ({ x, y, z }) => {
   const isRotated = x > 0;
   return /* @__PURE__ */ jsxs(Fragment2, { children: [
-    /* @__PURE__ */ jsx(Translate, { offset: { x: x + 0.25 / 2, y, z }, children: /* @__PURE__ */ jsx(Rotate, { rotation: ["-90deg", 0, "90deg"], children: /* @__PURE__ */ jsx(ExtrudeLinear, { height: 0.25, children: /* @__PURE__ */ jsx(
-      Polygon,
+    /* @__PURE__ */ jsx(
+      Translate,
       {
-        points: svgPathPoints.slice().reverse().map((p) => [p.x, p.y])
+        material: componentMaterials.tinnedLead,
+        offset: { x: x + 0.25 / 2, y, z },
+        children: /* @__PURE__ */ jsx(Rotate, { rotation: ["-90deg", 0, "90deg"], children: /* @__PURE__ */ jsx(ExtrudeLinear, { height: 0.25, children: /* @__PURE__ */ jsx(
+          Polygon,
+          {
+            points: svgPathPoints.slice().reverse().map((p) => [p.x, p.y])
+          }
+        ) }) })
       }
-    ) }) }) }),
+    ),
     /* @__PURE__ */ jsx(
       Translate,
       {
@@ -1655,7 +1826,7 @@ var SmdChipLead = (props) => {
   const N = 15;
   const points = Array.from({ length: N }).map((_, i) => i / (N - 1) * bodyDistance).map((x) => [x, calculateSCurve(x, props)]);
   const polygon = getExpandedStroke(points, thickness);
-  return /* @__PURE__ */ jsx(Colorize, { color: "#fff", children: /* @__PURE__ */ jsx(Translate, { offset: { z: 0, y: 0, x: 0, ...props.position }, children: /* @__PURE__ */ jsx(Rotate, { rotation: ["90deg", 0, rotation ?? 0], children: /* @__PURE__ */ jsx(Translate, { offset: { x: 0, y: 0, z: -width10 / 2 }, children: /* @__PURE__ */ jsx(ExtrudeLinear, { height: width10, children: /* @__PURE__ */ jsx(Polygon, { points: polygon.map((p) => [p.x, p.y]) }) }) }) }) }) });
+  return /* @__PURE__ */ jsx(Colorize, { color: "#c4c7ca", material: componentMaterials.tinnedLead, children: /* @__PURE__ */ jsx(Translate, { offset: { z: 0, y: 0, x: 0, ...props.position }, children: /* @__PURE__ */ jsx(Rotate, { rotation: ["90deg", 0, rotation ?? 0], children: /* @__PURE__ */ jsx(Translate, { offset: { x: 0, y: 0, z: -width10 / 2 }, children: /* @__PURE__ */ jsx(ExtrudeLinear, { height: width10, children: /* @__PURE__ */ jsx(Polygon, { points: polygon.map((p) => [p.x, p.y]) }) }) }) }) }) });
 };
 
 // lib/Tssop.tsx
@@ -1813,6 +1984,7 @@ var A0402 = ({ color = "#333" }) => {
       {
         size: [bodyLength, width, height],
         offset: [0, 0, height / 2],
+        material: componentMaterials.moldedPlastic,
         color
       }
     ),
@@ -1821,6 +1993,7 @@ var A0402 = ({ color = "#333" }) => {
       {
         size: [terminatorWidth, height, width],
         offset: [fullLength / 2 - terminatorWidth / 2, 0, height / 2],
+        material: componentMaterials.tinnedLead,
         color: "#ccc"
       }
     ),
@@ -1829,6 +2002,7 @@ var A0402 = ({ color = "#333" }) => {
       {
         size: [terminatorWidth, height, width],
         offset: [-fullLength / 2 + terminatorWidth / 2, 0, height / 2],
+        material: componentMaterials.tinnedLead,
         color: "#ccc"
       }
     )
@@ -1848,6 +2022,7 @@ var A0603 = ({ color = "#333" }) => {
       {
         size: [bodyLength2, width2, height2],
         offset: [0, 0, height2 / 2],
+        material: componentMaterials.moldedPlastic,
         color
       }
     ),
@@ -1856,6 +2031,7 @@ var A0603 = ({ color = "#333" }) => {
       {
         size: [terminatorLength, width2, height2],
         offset: [fullLength2 / 2 - terminatorLength / 2, 0, height2 / 2],
+        material: componentMaterials.tinnedLead,
         color: "#ccc"
       }
     ),
@@ -1864,6 +2040,7 @@ var A0603 = ({ color = "#333" }) => {
       {
         size: [terminatorLength, width2, height2],
         offset: [-fullLength2 / 2 + terminatorLength / 2, 0, height2 / 2],
+        material: componentMaterials.tinnedLead,
         color: "#ccc"
       }
     )
@@ -1943,6 +2120,7 @@ var A0805 = ({ color = "#333" }) => {
       {
         size: [bodyLength3, width3, height3],
         offset: [0, 0, height3 / 2],
+        material: componentMaterials.moldedPlastic,
         color
       }
     ),
@@ -1951,6 +2129,7 @@ var A0805 = ({ color = "#333" }) => {
       {
         size: [terminatorWidth2, width3, height3],
         offset: [fullLength3 / 2 - terminatorWidth2 / 2, 0, height3 / 2],
+        material: componentMaterials.tinnedLead,
         color: "#ccc"
       }
     ),
@@ -1959,6 +2138,7 @@ var A0805 = ({ color = "#333" }) => {
       {
         size: [terminatorWidth2, width3, height3],
         offset: [-fullLength3 / 2 + terminatorWidth2 / 2, 0, height3 / 2],
+        material: componentMaterials.tinnedLead,
         color: "#ccc"
       }
     )
@@ -2142,69 +2322,84 @@ var PinHeader = ({
       Cuboid,
       {
         color: "#222",
+        material: componentMaterials.moldedPlastic,
         size: [bodyLength10, bodyWidth, bodyHeight],
         center: [x, y, flipZ(bodyHeight / 2)]
       }
     ) }),
-    /* @__PURE__ */ jsx(Colorize, { color: PIN_METAL_COLOR, children: smd ? /* @__PURE__ */ jsx(
-      SmdChipLead,
+    /* @__PURE__ */ jsx(
+      Colorize,
       {
-        rotation: -Math.PI / 2,
-        position: {
-          x,
-          y: y + 1,
-          z: pinThickness / 2
-        },
-        thickness: pinThickness,
-        width: pinThickness,
-        height: pinThickness,
-        padContactLength: 2,
-        bodyDistance: 3
+        color: PIN_METAL_COLOR,
+        material: componentMaterials.goldContact,
+        children: smd ? /* @__PURE__ */ jsx(
+          SmdChipLead,
+          {
+            rotation: -Math.PI / 2,
+            position: {
+              x,
+              y: y + 1,
+              z: pinThickness / 2
+            },
+            thickness: pinThickness,
+            width: pinThickness,
+            height: pinThickness,
+            padContactLength: 2,
+            bodyDistance: 3
+          }
+        ) : /* @__PURE__ */ jsxs(Hull, { children: [
+          /* @__PURE__ */ jsx(
+            Cuboid,
+            {
+              color: PIN_METAL_COLOR,
+              size: [pinThickness, pinThickness, shortSidePinLength * 0.9],
+              center: [x, y, flipZ(bodyHeight * 0.9 + bodyHeight / 2)]
+            }
+          ),
+          /* @__PURE__ */ jsx(
+            Cuboid,
+            {
+              color: PIN_METAL_COLOR,
+              size: [
+                pinThickness / 1.8,
+                pinThickness / 1.8,
+                shortSidePinLength
+              ],
+              center: [x, y, flipZ(bodyHeight + bodyHeight / 2)]
+            }
+          )
+        ] })
       }
-    ) : /* @__PURE__ */ jsxs(Hull, { children: [
-      /* @__PURE__ */ jsx(
-        Cuboid,
-        {
-          color: PIN_METAL_COLOR,
-          size: [pinThickness, pinThickness, shortSidePinLength * 0.9],
-          center: [x, y, flipZ(bodyHeight * 0.9 + bodyHeight / 2)]
-        }
-      ),
-      /* @__PURE__ */ jsx(
-        Cuboid,
-        {
-          color: PIN_METAL_COLOR,
-          size: [
-            pinThickness / 1.8,
-            pinThickness / 1.8,
-            shortSidePinLength
-          ],
-          center: [x, y, flipZ(bodyHeight + bodyHeight / 2)]
-        }
-      )
-    ] }) }),
-    /* @__PURE__ */ jsx(Colorize, { color: PIN_METAL_COLOR, children: /* @__PURE__ */ jsx(Translate, { y: rightangle ? -3.9 : 0, z: rightangle ? 1 : 0, children: /* @__PURE__ */ jsx(Rotate, { rotation: rightangle ? [-Math.PI / 2, 0, 0] : [0, 0, 0], children: /* @__PURE__ */ jsxs(Hull, { children: [
-      /* @__PURE__ */ jsx(
-        Cuboid,
-        {
-          color: PIN_METAL_COLOR,
-          size: [pinThickness, pinThickness, longSidePinLength * 0.9],
-          center: [x, y, flipZ(-longSidePinLength / 2 * 0.9)]
-        }
-      ),
-      /* @__PURE__ */ jsx(
-        Cuboid,
-        {
-          color: PIN_METAL_COLOR,
-          size: [
-            pinThickness / 1.8,
-            pinThickness / 1.8,
-            longSidePinLength
-          ],
-          center: [x, y, flipZ(-longSidePinLength / 2)]
-        }
-      )
-    ] }) }) }) })
+    ),
+    /* @__PURE__ */ jsx(
+      Colorize,
+      {
+        color: PIN_METAL_COLOR,
+        material: componentMaterials.goldContact,
+        children: /* @__PURE__ */ jsx(Translate, { y: rightangle ? -3.9 : 0, z: rightangle ? 1 : 0, children: /* @__PURE__ */ jsx(Rotate, { rotation: rightangle ? [-Math.PI / 2, 0, 0] : [0, 0, 0], children: /* @__PURE__ */ jsxs(Hull, { children: [
+          /* @__PURE__ */ jsx(
+            Cuboid,
+            {
+              color: PIN_METAL_COLOR,
+              size: [pinThickness, pinThickness, longSidePinLength * 0.9],
+              center: [x, y, flipZ(-longSidePinLength / 2 * 0.9)]
+            }
+          ),
+          /* @__PURE__ */ jsx(
+            Cuboid,
+            {
+              color: PIN_METAL_COLOR,
+              size: [
+                pinThickness / 1.8,
+                pinThickness / 1.8,
+                longSidePinLength
+              ],
+              center: [x, y, flipZ(-longSidePinLength / 2)]
+            }
+          )
+        ] }) }) })
+      }
+    )
   ] });
 };
 
@@ -2479,7 +2674,7 @@ var LegacyQFN = ({
     pinPositions.push({ pn, x, y, pw, pl });
   }
   return /* @__PURE__ */ jsxs(Fragment2, { children: [
-    /* @__PURE__ */ jsx(Colorize, { color: "grey", children: /* @__PURE__ */ jsx(
+    /* @__PURE__ */ jsx(Colorize, { material: componentMaterials.tinnedLead, color: "grey", children: /* @__PURE__ */ jsx(
       Cuboid,
       {
         center: [0, 0, bodyThickness / 2],
@@ -2784,6 +2979,7 @@ var A0201 = ({ color = "#333" }) => {
       {
         size: [bodyLength4, width4, height4],
         offset: [0, 0, height4 / 2],
+        material: componentMaterials.moldedPlastic,
         color
       }
     ),
@@ -2792,6 +2988,7 @@ var A0201 = ({ color = "#333" }) => {
       {
         size: [terminatorWidth3, width4, height4],
         offset: [fullLength4 / 2 - terminatorWidth3 / 2, 0, height4 / 2],
+        material: componentMaterials.tinnedLead,
         color: "#ccc"
       }
     ),
@@ -2800,6 +2997,7 @@ var A0201 = ({ color = "#333" }) => {
       {
         size: [terminatorWidth3, width4, height4],
         offset: [-fullLength4 / 2 + terminatorWidth3 / 2, 0, height4 / 2],
+        material: componentMaterials.tinnedLead,
         color: "#ccc"
       }
     )
@@ -2819,6 +3017,7 @@ var A01005 = ({ color = "#333" }) => {
       {
         size: [bodyLength5, width5, height5],
         offset: [0, 0, height5 / 2],
+        material: componentMaterials.moldedPlastic,
         color
       }
     ),
@@ -2827,6 +3026,7 @@ var A01005 = ({ color = "#333" }) => {
       {
         size: [terminatorWidth4, width5, height5],
         offset: [fullLength5 / 2 - terminatorWidth4 / 2, 0, height5 / 2],
+        material: componentMaterials.tinnedLead,
         color: "#ccc"
       }
     ),
@@ -2835,6 +3035,7 @@ var A01005 = ({ color = "#333" }) => {
       {
         size: [terminatorWidth4, width5, height5],
         offset: [-fullLength5 / 2 + terminatorWidth4 / 2, 0, height5 / 2],
+        material: componentMaterials.tinnedLead,
         color: "#ccc"
       }
     )
@@ -2854,6 +3055,7 @@ var A1206 = ({ color = "#333" }) => {
       {
         size: [bodyLength6, width6, height6],
         offset: [0, 0, height6 / 2],
+        material: componentMaterials.moldedPlastic,
         color
       }
     ),
@@ -2862,6 +3064,7 @@ var A1206 = ({ color = "#333" }) => {
       {
         size: [terminatorWidth5, width6, height6],
         offset: [fullLength6 / 2 - terminatorWidth5 / 2, 0, height6 / 2],
+        material: componentMaterials.tinnedLead,
         color: "#ccc"
       }
     ),
@@ -2870,6 +3073,7 @@ var A1206 = ({ color = "#333" }) => {
       {
         size: [terminatorWidth5, width6, height6],
         offset: [-fullLength6 / 2 + terminatorWidth5 / 2, 0, height6 / 2],
+        material: componentMaterials.tinnedLead,
         color: "#ccc"
       }
     )
@@ -2889,6 +3093,7 @@ var A1210 = ({ color = "#333" }) => {
       {
         size: [bodyLength7, width7, height7],
         offset: [0, 0, height7 / 2],
+        material: componentMaterials.moldedPlastic,
         color
       }
     ),
@@ -2897,6 +3102,7 @@ var A1210 = ({ color = "#333" }) => {
       {
         size: [terminatorWidth6, width7, height7],
         offset: [fullLength7 / 2 - terminatorWidth6 / 2, 0, height7 / 2],
+        material: componentMaterials.tinnedLead,
         color: "#ccc"
       }
     ),
@@ -2905,6 +3111,7 @@ var A1210 = ({ color = "#333" }) => {
       {
         size: [terminatorWidth6, width7, height7],
         offset: [-fullLength7 / 2 + terminatorWidth6 / 2, 0, height7 / 2],
+        material: componentMaterials.tinnedLead,
         color: "#ccc"
       }
     )
@@ -2924,6 +3131,7 @@ var A2010 = ({ color = "#333" }) => {
       {
         size: [bodyLength8, width8, height8],
         offset: [0, 0, height8 / 2],
+        material: componentMaterials.moldedPlastic,
         color
       }
     ),
@@ -2932,6 +3140,7 @@ var A2010 = ({ color = "#333" }) => {
       {
         size: [terminatorWidth7, width8, height8],
         offset: [fullLength8 / 2 - terminatorWidth7 / 2, 0, height8 / 2],
+        material: componentMaterials.tinnedLead,
         color: "#ccc"
       }
     ),
@@ -2940,6 +3149,7 @@ var A2010 = ({ color = "#333" }) => {
       {
         size: [terminatorWidth7, width8, height8],
         offset: [-fullLength8 / 2 + terminatorWidth7 / 2, 0, height8 / 2],
+        material: componentMaterials.tinnedLead,
         color: "#ccc"
       }
     )
@@ -2959,6 +3169,7 @@ var A2512 = ({ color = "#333" }) => {
       {
         size: [bodyLength9, width9, height9],
         offset: [0, 0, height9 / 2],
+        material: componentMaterials.moldedPlastic,
         color
       }
     ),
@@ -2967,6 +3178,7 @@ var A2512 = ({ color = "#333" }) => {
       {
         size: [terminatorWidth8, width9, height9],
         offset: [fullLength9 / 2 - terminatorWidth8 / 2, 0, height9 / 2],
+        material: componentMaterials.tinnedLead,
         color: "#ccc"
       }
     ),
@@ -2975,6 +3187,7 @@ var A2512 = ({ color = "#333" }) => {
       {
         size: [terminatorWidth8, width9, height9],
         offset: [-fullLength9 / 2 + terminatorWidth8 / 2, 0, height9 / 2],
+        material: componentMaterials.tinnedLead,
         color: "#ccc"
       }
     )
@@ -4813,11 +5026,11 @@ var DFN = ({
       }
     );
     return /* @__PURE__ */ jsxs(Fragment2, { children: [
-      /* @__PURE__ */ jsx(Colorize, { color: "#25272a", children: pin1MarkWidth > 0 ? /* @__PURE__ */ jsxs(Subtract, { children: [
+      /* @__PURE__ */ jsx(Colorize, { material: componentMaterials.moldedPlastic, color: "#25272a", children: pin1MarkWidth > 0 ? /* @__PURE__ */ jsxs(Subtract, { children: [
         body,
         stripe
       ] }) : body }),
-      /* @__PURE__ */ jsx(Colorize, { color: "#c7c9cd", children: pinPositions.map(
+      /* @__PURE__ */ jsx(Colorize, { material: componentMaterials.tinnedLead, color: "#c7c9cd", children: pinPositions.map(
         (p) => p.pinNumber === 1 && pin1TerminalChamfer > 0 ? /* @__PURE__ */ jsxs(Hull, { children: [
           /* @__PURE__ */ jsx(
             Cuboid,
@@ -4857,6 +5070,7 @@ var DFN = ({
       thermalPadSize && /* @__PURE__ */ jsx(
         Cuboid,
         {
+          material: componentMaterials.tinnedLead,
           color: "#c7c9cd",
           size: [
             thermalPadSize.width,
@@ -6494,99 +6708,114 @@ var JSTZH1_5mm = ({
   const bodyWidth = (numPins - 1) * pitch + 4;
   const startX = -((numPins - 1) * pitch) / 2;
   return /* @__PURE__ */ jsxs(Fragment2, { children: [
-    /* @__PURE__ */ jsx(Translate, { offset: [0, 0, bodyHeight], children: /* @__PURE__ */ jsx(Rotate, { angles: [Math.PI, 0, 0], children: /* @__PURE__ */ jsx(Colorize, { color: bodyColor, children: /* @__PURE__ */ jsxs(Subtract, { children: [
-      /* @__PURE__ */ jsx(
-        Cuboid,
-        {
-          size: [bodyWidth, bodyDepth, bodyHeight],
-          center: [0, 0, bodyHeight / 2]
-        }
-      ),
-      /* @__PURE__ */ jsx(
-        Cuboid,
-        {
-          size: [
-            bodyWidth - wallThickness * 2,
-            bodyDepth - wallThickness * 2,
-            hollowHeight
-          ],
-          center: [0, 0, hollowHeight / 2]
-        }
-      ),
-      /* @__PURE__ */ jsx(
-        Cuboid,
-        {
-          size: [bodyWidth, bodyDepth / 3, hollowHeight],
-          center: [0, 0, hollowHeight / 6]
-        }
-      ),
-      /* @__PURE__ */ jsx(
-        Cuboid,
-        {
-          size: [
-            bodyWidth - wallThickness * 2,
-            wallThickness / 2,
-            hollowHeight
-          ],
-          center: [
-            0,
-            bodyDepth / 2 - wallThickness / 4,
-            hollowHeight / 2
-          ]
-        }
-      ),
-      /* @__PURE__ */ jsx(
-        Cuboid,
-        {
-          size: [
-            bodyWidth - wallThickness * 2,
-            wallThickness / 2,
-            hollowHeight
-          ],
-          center: [
-            0,
-            -bodyDepth / 2 + wallThickness / 4,
-            hollowHeight / 2
-          ]
-        }
-      ),
-      /* @__PURE__ */ jsx(
-        Cuboid,
-        {
-          size: [1, wallThickness + 2, 1],
-          center: [-bodyWidth / 4, bodyDepth / 2, bodyHeight / 2]
-        }
-      ),
-      /* @__PURE__ */ jsx(
-        Cuboid,
-        {
-          size: [1, wallThickness + 3, 1],
-          center: [bodyWidth / 4, bodyDepth / 2, bodyHeight / 2]
-        }
-      ),
-      /* @__PURE__ */ jsx(
-        Cuboid,
-        {
-          size: [1, wallThickness + 2, 1],
-          center: [-bodyWidth / 4, -bodyDepth / 2, bodyHeight / 2]
-        }
-      ),
-      /* @__PURE__ */ jsx(
-        Cuboid,
-        {
-          size: [1, wallThickness + 3, 1],
-          center: [bodyWidth / 4, -bodyDepth / 2, bodyHeight / 2]
-        }
-      )
-    ] }) }) }) }),
-    showPins && Array.from({ length: numPins }).map((_, i) => /* @__PURE__ */ jsx(Colorize, { color: pinColor, children: /* @__PURE__ */ jsx(
-      Cylinder,
+    /* @__PURE__ */ jsx(Translate, { offset: [0, 0, bodyHeight], children: /* @__PURE__ */ jsx(Rotate, { angles: [Math.PI, 0, 0], children: /* @__PURE__ */ jsx(
+      Colorize,
       {
-        height: pinLength,
-        radius: 0.35,
-        center: [startX + i * pitch, 0, 2.5]
+        material: componentMaterials.moldedPlastic,
+        color: bodyColor,
+        children: /* @__PURE__ */ jsxs(Subtract, { children: [
+          /* @__PURE__ */ jsx(
+            Cuboid,
+            {
+              size: [bodyWidth, bodyDepth, bodyHeight],
+              center: [0, 0, bodyHeight / 2]
+            }
+          ),
+          /* @__PURE__ */ jsx(
+            Cuboid,
+            {
+              size: [
+                bodyWidth - wallThickness * 2,
+                bodyDepth - wallThickness * 2,
+                hollowHeight
+              ],
+              center: [0, 0, hollowHeight / 2]
+            }
+          ),
+          /* @__PURE__ */ jsx(
+            Cuboid,
+            {
+              size: [bodyWidth, bodyDepth / 3, hollowHeight],
+              center: [0, 0, hollowHeight / 6]
+            }
+          ),
+          /* @__PURE__ */ jsx(
+            Cuboid,
+            {
+              size: [
+                bodyWidth - wallThickness * 2,
+                wallThickness / 2,
+                hollowHeight
+              ],
+              center: [
+                0,
+                bodyDepth / 2 - wallThickness / 4,
+                hollowHeight / 2
+              ]
+            }
+          ),
+          /* @__PURE__ */ jsx(
+            Cuboid,
+            {
+              size: [
+                bodyWidth - wallThickness * 2,
+                wallThickness / 2,
+                hollowHeight
+              ],
+              center: [
+                0,
+                -bodyDepth / 2 + wallThickness / 4,
+                hollowHeight / 2
+              ]
+            }
+          ),
+          /* @__PURE__ */ jsx(
+            Cuboid,
+            {
+              size: [1, wallThickness + 2, 1],
+              center: [-bodyWidth / 4, bodyDepth / 2, bodyHeight / 2]
+            }
+          ),
+          /* @__PURE__ */ jsx(
+            Cuboid,
+            {
+              size: [1, wallThickness + 3, 1],
+              center: [bodyWidth / 4, bodyDepth / 2, bodyHeight / 2]
+            }
+          ),
+          /* @__PURE__ */ jsx(
+            Cuboid,
+            {
+              size: [1, wallThickness + 2, 1],
+              center: [-bodyWidth / 4, -bodyDepth / 2, bodyHeight / 2]
+            }
+          ),
+          /* @__PURE__ */ jsx(
+            Cuboid,
+            {
+              size: [1, wallThickness + 3, 1],
+              center: [bodyWidth / 4, -bodyDepth / 2, bodyHeight / 2]
+            }
+          )
+        ] })
       }
-    ) }, i)),
+    ) }) }),
+    showPins && Array.from({ length: numPins }).map((_, i) => /* @__PURE__ */ jsx(
+      Colorize,
+      {
+        material: componentMaterials.tinnedLead,
+        color: pinColor,
+        children: /* @__PURE__ */ jsx(
+          Cylinder,
+          {
+            height: pinLength,
+            radius: 0.35,
+            center: [startX + i * pitch, 0, 2.5]
+          }
+        )
+      },
+      i
+    )),
     showFootprint && Array.from({ length: numPins }).map((_, i) => {
       const isPin1 = i === 0;
       const hole = isPin1 ? {
@@ -6652,120 +6881,135 @@ var JSTPH2_0mm = ({
   const topReliefWidth = 0.8;
   const topReliefDepth = 0.65;
   return /* @__PURE__ */ jsxs(Fragment2, { children: [
-    /* @__PURE__ */ jsx(Translate, { offset: [0, 0, bodyHeight], children: /* @__PURE__ */ jsx(Rotate, { angles: [Math.PI, 0, 0], children: /* @__PURE__ */ jsx(Colorize, { color: bodyColor, children: /* @__PURE__ */ jsxs(Subtract, { children: [
-      /* @__PURE__ */ jsx(
-        Cuboid,
-        {
-          size: [bodyWidth, bodyDepth, bodyHeight],
-          center: [0, 0, bodyHeight / 2]
-        }
-      ),
-      /* @__PURE__ */ jsx(
-        Cuboid,
-        {
-          size: [
-            bodyWidth - wallThickness * 2,
-            bodyDepth - wallThickness * 2,
-            hollowHeight
-          ],
-          center: [0, 0, hollowHeight / 2]
-        }
-      ),
-      /* @__PURE__ */ jsx(
-        Cuboid,
-        {
-          size: [bodyWidth, bodyDepth / 3, hollowHeight],
-          center: [0, 0, hollowHeight / 6]
-        }
-      ),
-      /* @__PURE__ */ jsx(
-        Cuboid,
-        {
-          size: [
-            bodyWidth - wallThickness * 2,
-            wallThickness / 2,
-            hollowHeight
-          ],
-          center: [
-            0,
-            bodyDepth / 2 - wallThickness / 4,
-            hollowHeight / 2
-          ]
-        }
-      ),
-      /* @__PURE__ */ jsx(
-        Cuboid,
-        {
-          size: [
-            bodyWidth - wallThickness * 2,
-            wallThickness / 2,
-            hollowHeight
-          ],
-          center: [
-            0,
-            -bodyDepth / 2 + wallThickness / 4,
-            hollowHeight / 2
-          ]
-        }
-      ),
-      /* @__PURE__ */ jsx(
-        Cuboid,
-        {
-          size: [
-            latchWindowWidth,
-            bodyDepth + wallThickness,
-            latchWindowHeight
-          ],
-          center: [-bodyWidth / 2 + latchWindowInset, 0, bodyHeight / 2]
-        }
-      ),
-      /* @__PURE__ */ jsx(
-        Cuboid,
-        {
-          size: [
-            latchWindowWidth,
-            bodyDepth + wallThickness,
-            latchWindowHeight
-          ],
-          center: [bodyWidth / 2 - latchWindowInset, 0, bodyHeight / 2]
-        }
-      ),
-      /* @__PURE__ */ jsx(
-        Cuboid,
-        {
-          size: [wallThickness * 3, topReliefWidth, topReliefDepth],
-          center: [-bodyWidth / 2, 0, topReliefDepth / 2]
-        }
-      ),
-      /* @__PURE__ */ jsx(Translate, { offset: [-bodyWidth / 2, 0, topReliefDepth], children: /* @__PURE__ */ jsx(Rotate, { angles: [0, Math.PI / 2, 0], children: /* @__PURE__ */ jsx(
-        Cylinder,
-        {
-          height: wallThickness * 3,
-          radius: topReliefWidth / 2
-        }
-      ) }) }),
-      /* @__PURE__ */ jsx(
-        Cuboid,
-        {
-          size: [wallThickness * 3, topReliefWidth, topReliefDepth],
-          center: [bodyWidth / 2, 0, topReliefDepth / 2]
-        }
-      ),
-      /* @__PURE__ */ jsx(Translate, { offset: [bodyWidth / 2, 0, topReliefDepth], children: /* @__PURE__ */ jsx(Rotate, { angles: [0, Math.PI / 2, 0], children: /* @__PURE__ */ jsx(
-        Cylinder,
-        {
-          height: wallThickness * 3,
-          radius: topReliefWidth / 2
-        }
-      ) }) })
-    ] }) }) }) }),
-    showPins && Array.from({ length: numPins }).map((_, i) => /* @__PURE__ */ jsx(Colorize, { color: pinColor, children: /* @__PURE__ */ jsx(
-      Cuboid,
+    /* @__PURE__ */ jsx(Translate, { offset: [0, 0, bodyHeight], children: /* @__PURE__ */ jsx(Rotate, { angles: [Math.PI, 0, 0], children: /* @__PURE__ */ jsx(
+      Colorize,
       {
-        size: [pinThickness, pinThickness, pinLength],
-        center: [startX + i * pitch, 0, (pinTop - pinTailLength) / 2]
+        color: bodyColor,
+        material: componentMaterials.moldedPlastic,
+        children: /* @__PURE__ */ jsxs(Subtract, { children: [
+          /* @__PURE__ */ jsx(
+            Cuboid,
+            {
+              size: [bodyWidth, bodyDepth, bodyHeight],
+              center: [0, 0, bodyHeight / 2]
+            }
+          ),
+          /* @__PURE__ */ jsx(
+            Cuboid,
+            {
+              size: [
+                bodyWidth - wallThickness * 2,
+                bodyDepth - wallThickness * 2,
+                hollowHeight
+              ],
+              center: [0, 0, hollowHeight / 2]
+            }
+          ),
+          /* @__PURE__ */ jsx(
+            Cuboid,
+            {
+              size: [bodyWidth, bodyDepth / 3, hollowHeight],
+              center: [0, 0, hollowHeight / 6]
+            }
+          ),
+          /* @__PURE__ */ jsx(
+            Cuboid,
+            {
+              size: [
+                bodyWidth - wallThickness * 2,
+                wallThickness / 2,
+                hollowHeight
+              ],
+              center: [
+                0,
+                bodyDepth / 2 - wallThickness / 4,
+                hollowHeight / 2
+              ]
+            }
+          ),
+          /* @__PURE__ */ jsx(
+            Cuboid,
+            {
+              size: [
+                bodyWidth - wallThickness * 2,
+                wallThickness / 2,
+                hollowHeight
+              ],
+              center: [
+                0,
+                -bodyDepth / 2 + wallThickness / 4,
+                hollowHeight / 2
+              ]
+            }
+          ),
+          /* @__PURE__ */ jsx(
+            Cuboid,
+            {
+              size: [
+                latchWindowWidth,
+                bodyDepth + wallThickness,
+                latchWindowHeight
+              ],
+              center: [-bodyWidth / 2 + latchWindowInset, 0, bodyHeight / 2]
+            }
+          ),
+          /* @__PURE__ */ jsx(
+            Cuboid,
+            {
+              size: [
+                latchWindowWidth,
+                bodyDepth + wallThickness,
+                latchWindowHeight
+              ],
+              center: [bodyWidth / 2 - latchWindowInset, 0, bodyHeight / 2]
+            }
+          ),
+          /* @__PURE__ */ jsx(
+            Cuboid,
+            {
+              size: [wallThickness * 3, topReliefWidth, topReliefDepth],
+              center: [-bodyWidth / 2, 0, topReliefDepth / 2]
+            }
+          ),
+          /* @__PURE__ */ jsx(Translate, { offset: [-bodyWidth / 2, 0, topReliefDepth], children: /* @__PURE__ */ jsx(Rotate, { angles: [0, Math.PI / 2, 0], children: /* @__PURE__ */ jsx(
+            Cylinder,
+            {
+              height: wallThickness * 3,
+              radius: topReliefWidth / 2
+            }
+          ) }) }),
+          /* @__PURE__ */ jsx(
+            Cuboid,
+            {
+              size: [wallThickness * 3, topReliefWidth, topReliefDepth],
+              center: [bodyWidth / 2, 0, topReliefDepth / 2]
+            }
+          ),
+          /* @__PURE__ */ jsx(Translate, { offset: [bodyWidth / 2, 0, topReliefDepth], children: /* @__PURE__ */ jsx(Rotate, { angles: [0, Math.PI / 2, 0], children: /* @__PURE__ */ jsx(
+            Cylinder,
+            {
+              height: wallThickness * 3,
+              radius: topReliefWidth / 2
+            }
+          ) }) })
+        ] })
       }
-    ) }, i)),
+    ) }) }),
+    showPins && Array.from({ length: numPins }).map((_, i) => /* @__PURE__ */ jsx(
+      Colorize,
+      {
+        color: pinColor,
+        material: componentMaterials.tinnedLead,
+        children: /* @__PURE__ */ jsx(
+          Cuboid,
+          {
+            size: [pinThickness, pinThickness, pinLength],
+            center: [startX + i * pitch, 0, (pinTop - pinTailLength) / 2]
+          }
+        )
+      },
+      i
+    )),
     showFootprint && Array.from({ length: numPins }).map((_, i) => {
       const isPin1 = i === 0;
       const hole = isPin1 ? {
@@ -6836,7 +7080,7 @@ var JSTXH2_5mm = ({
   );
   const lockNotchHeight = 2.4;
   return /* @__PURE__ */ jsxs(Fragment2, { children: [
-    /* @__PURE__ */ jsx(Translate, { offset: [0, 0, bodyHeight / 2], children: /* @__PURE__ */ jsx(Colorize, { color: bodyColor, children: /* @__PURE__ */ jsxs(Subtract, { children: [
+    /* @__PURE__ */ jsx(Translate, { offset: [0, 0, bodyHeight / 2], children: /* @__PURE__ */ jsx(Colorize, { material: componentMaterials.moldedPlastic, color: bodyColor, children: /* @__PURE__ */ jsxs(Subtract, { children: [
       /* @__PURE__ */ jsx(Cuboid, { size: [bodyWidth, bodyDepth, bodyHeight] }),
       /* @__PURE__ */ jsx(Translate, { offset: [0, 0, (bodyHeight - hollowHeight) / 2 + 0.1], children: /* @__PURE__ */ jsx(
         Cuboid,
@@ -6913,7 +7157,15 @@ var JSTXH2_5mm = ({
         `vent_${i}`
       ))
     ] }) }) }),
-    showPins && Array.from({ length: numPins }).map((_, i) => /* @__PURE__ */ jsx(Colorize, { color: pinColor, children: /* @__PURE__ */ jsx(Translate, { offset: [startX + i * pitch, 0, pinLength / 2 - 3.4], children: /* @__PURE__ */ jsx(Cuboid, { size: [0.64, 0.64, pinLength] }) }) }, i)),
+    showPins && Array.from({ length: numPins }).map((_, i) => /* @__PURE__ */ jsx(
+      Colorize,
+      {
+        material: componentMaterials.tinnedLead,
+        color: pinColor,
+        children: /* @__PURE__ */ jsx(Translate, { offset: [startX + i * pitch, 0, pinLength / 2 - 3.4], children: /* @__PURE__ */ jsx(Cuboid, { size: [0.64, 0.64, pinLength] }) })
+      },
+      i
+    )),
     showFootprint && (() => {
       try {
         const circuitJson = fp2.string(`jst${numPins}_xh`).circuitJson();
@@ -6966,7 +7218,7 @@ var JstSh = ({ footprint = "jst6_sh" }) => {
   const y = rowY + direction * 1.8, width10 = n + 2, depth = 2.9, height10 = 4.2;
   const pinY = y - direction * 0.25;
   return /* @__PURE__ */ jsxs(Rotate, { rotation: [0, 0, angle], children: [
-    /* @__PURE__ */ jsx(Colorize, { color: "#e4e1d6", children: /* @__PURE__ */ jsxs(Subtract, { children: [
+    /* @__PURE__ */ jsx(Colorize, { material: componentMaterials.moldedPlastic, color: "#e4e1d6", children: /* @__PURE__ */ jsxs(Subtract, { children: [
       /* @__PURE__ */ jsx(
         Cuboid,
         {
@@ -7002,7 +7254,7 @@ var JstSh = ({ footprint = "jst6_sh" }) => {
         side
       ))
     ] }) }),
-    /* @__PURE__ */ jsxs(Colorize, { color: "#c6c7c9", children: [
+    /* @__PURE__ */ jsxs(Colorize, { material: componentMaterials.tinnedLead, color: "#c6c7c9", children: [
       signals.map((pad, i) => {
         const tailY = pad.y - direction * pad.height * 0.4;
         return /* @__PURE__ */ jsxs(Union, { children: [
@@ -7140,18 +7392,26 @@ var Crystal = ({
     })
   ];
   return /* @__PURE__ */ jsxs(Fragment2, { children: [
-    terminalPositions.map((center, index) => /* @__PURE__ */ jsx(Colorize, { color: "#d6a258", children: /* @__PURE__ */ jsx(ExtrudeLinear, { height: terminalThickness, children: /* @__PURE__ */ jsx(
-      Polygon,
+    terminalPositions.map((center, index) => /* @__PURE__ */ jsx(
+      Colorize,
       {
-        points: getTerminalPoints(
-          center,
-          terminalWidth,
-          terminalLength,
-          bodyChamfer,
-          index === 0
-        )
-      }
-    ) }) }, index)),
+        color: "#d6a258",
+        material: componentMaterials.goldContact,
+        children: /* @__PURE__ */ jsx(ExtrudeLinear, { height: terminalThickness, children: /* @__PURE__ */ jsx(
+          Polygon,
+          {
+            points: getTerminalPoints(
+              center,
+              terminalWidth,
+              terminalLength,
+              bodyChamfer,
+              index === 0
+            )
+          }
+        ) })
+      },
+      index
+    )),
     /* @__PURE__ */ jsx(
       ChipBody,
       {
@@ -7167,8 +7427,8 @@ var Crystal = ({
         chamferSize: bodyChamfer
       }
     ),
-    /* @__PURE__ */ jsx(Colorize, { color: "#d2a057", children: /* @__PURE__ */ jsx(Hull, { children: sealProfile }) }),
-    /* @__PURE__ */ jsx(Colorize, { color: "#b9bec2", children: /* @__PURE__ */ jsx(Hull, { children: lidProfiles }) })
+    /* @__PURE__ */ jsx(Colorize, { color: "#d2a057", material: componentMaterials.goldContact, children: /* @__PURE__ */ jsx(Hull, { children: sealProfile }) }),
+    /* @__PURE__ */ jsx(Colorize, { color: "#b9bec2", material: componentMaterials.brushedMetal, children: /* @__PURE__ */ jsx(Hull, { children: lidProfiles }) })
   ] });
 };
 
@@ -7607,6 +7867,7 @@ var ParametricChip = ({
       {
         size: [bodyLength10, width10, height10],
         offset: [0, 0, height10 / 2],
+        material: componentMaterials.moldedPlastic,
         color
       }
     ),
@@ -7615,6 +7876,7 @@ var ParametricChip = ({
       {
         size: [terminatorWidth9, height10, width10],
         offset: [fullLength10 / 2 - terminatorWidth9 / 2, 0, height10 / 2],
+        material: componentMaterials.tinnedLead,
         color: "#ccc"
       }
     ),
@@ -7623,6 +7885,7 @@ var ParametricChip = ({
       {
         size: [terminatorWidth9, height10, width10],
         offset: [-fullLength10 / 2 + terminatorWidth9 / 2, 0, height10 / 2],
+        material: componentMaterials.tinnedLead,
         color: "#ccc"
       }
     )
@@ -8019,14 +8282,14 @@ var DPAK = ({
   const leadZ = tabThickness / 2;
   const leadThickness = 0.4;
   return /* @__PURE__ */ jsxs(Fragment2, { children: [
-    /* @__PURE__ */ jsx(Colorize, { color: tabColor, children: /* @__PURE__ */ jsx(
+    /* @__PURE__ */ jsx(Colorize, { material: componentMaterials.tinnedLead, color: tabColor, children: /* @__PURE__ */ jsx(
       Cuboid,
       {
         size: [tabWidth, tabLength, tabThickness],
         center: [tabCenterX, 0, tabThickness / 2]
       }
     ) }),
-    /* @__PURE__ */ jsx(Colorize, { color, children: /* @__PURE__ */ jsx(
+    /* @__PURE__ */ jsx(Colorize, { material: componentMaterials.moldedPlastic, color, children: /* @__PURE__ */ jsx(
       Cuboid,
       {
         size: [bodyWidth, bodyLength10, bodyHeight],
@@ -8034,39 +8297,47 @@ var DPAK = ({
       }
     ) }),
     [-1, 1].map((side) => {
-      return /* @__PURE__ */ jsxs(Colorize, { color: leadColor, children: [
-        /* @__PURE__ */ jsx(
-          Cuboid,
-          {
-            size: [leadContactLength, leadWidth, leadThickness],
-            center: [
-              leadPadX + leadContactLength / 2,
-              side * pitch,
-              leadThickness / 2
-            ]
-          }
-        ),
-        /* @__PURE__ */ jsxs(Hull, { children: [
-          /* @__PURE__ */ jsx(
-            Cuboid,
-            {
-              size: [0.1, leadWidth, leadThickness],
-              center: [
-                leadPadX + leadContactLength,
-                side * pitch,
-                leadThickness / 2
-              ]
-            }
-          ),
-          /* @__PURE__ */ jsx(
-            Cuboid,
-            {
-              size: [0.1, leadWidth, leadThickness],
-              center: [bodyFrontX, side * pitch, leadZ + tabThickness / 2]
-            }
-          )
-        ] })
-      ] }, `lead-${side}`);
+      return /* @__PURE__ */ jsxs(
+        Colorize,
+        {
+          material: componentMaterials.tinnedLead,
+          color: leadColor,
+          children: [
+            /* @__PURE__ */ jsx(
+              Cuboid,
+              {
+                size: [leadContactLength, leadWidth, leadThickness],
+                center: [
+                  leadPadX + leadContactLength / 2,
+                  side * pitch,
+                  leadThickness / 2
+                ]
+              }
+            ),
+            /* @__PURE__ */ jsxs(Hull, { children: [
+              /* @__PURE__ */ jsx(
+                Cuboid,
+                {
+                  size: [0.1, leadWidth, leadThickness],
+                  center: [
+                    leadPadX + leadContactLength,
+                    side * pitch,
+                    leadThickness / 2
+                  ]
+                }
+              ),
+              /* @__PURE__ */ jsx(
+                Cuboid,
+                {
+                  size: [0.1, leadWidth, leadThickness],
+                  center: [bodyFrontX, side * pitch, leadZ + tabThickness / 2]
+                }
+              )
+            ] })
+          ]
+        },
+        `lead-${side}`
+      );
     })
   ] });
 };
@@ -8090,7 +8361,7 @@ var ElectrolyticCapacitor = ({
   const grooveWidth = Math.max(diameter * 0.06, 0.2);
   const grooveDepth = 0.3;
   return /* @__PURE__ */ jsxs(Fragment2, { children: [
-    /* @__PURE__ */ jsx(Colorize, { color: baseColor, children: /* @__PURE__ */ jsx(
+    /* @__PURE__ */ jsx(Colorize, { color: baseColor, material: componentMaterials.rubber, children: /* @__PURE__ */ jsx(
       Cylinder,
       {
         radius: radius - 0.05,
@@ -8098,7 +8369,7 @@ var ElectrolyticCapacitor = ({
         center: [0, 0, baseHeight / 2]
       }
     ) }),
-    /* @__PURE__ */ jsx(Colorize, { color: sleeveColor, children: /* @__PURE__ */ jsxs(Subtract, { children: [
+    /* @__PURE__ */ jsx(Colorize, { color: sleeveColor, material: componentMaterials.sleeve, children: /* @__PURE__ */ jsxs(Subtract, { children: [
       /* @__PURE__ */ jsx(
         RoundedCylinder,
         {
@@ -8123,14 +8394,22 @@ var ElectrolyticCapacitor = ({
         }
       )
     ] }) }),
-    [-1, 1].map((side) => /* @__PURE__ */ jsx(Colorize, { color: "#c0c0c0", children: /* @__PURE__ */ jsx(
-      Cylinder,
+    [-1, 1].map((side) => /* @__PURE__ */ jsx(
+      Colorize,
       {
-        radius: leadDiameter / 2,
-        height: leadLength + baseHeight,
-        center: [side * leadPitch / 2, 0, (baseHeight - leadLength) / 2]
-      }
-    ) }, `lead-${side}`))
+        material: componentMaterials.tinnedLead,
+        color: "#c0c0c0",
+        children: /* @__PURE__ */ jsx(
+          Cylinder,
+          {
+            radius: leadDiameter / 2,
+            height: leadLength + baseHeight,
+            center: [side * leadPitch / 2, 0, (baseHeight - leadLength) / 2]
+          }
+        )
+      },
+      `lead-${side}`
+    ))
   ] });
 };
 
@@ -8437,7 +8716,7 @@ var UsbCMidmount = ({
     );
   const tabBottom = -0.9, tabTop = centerZ + 0.1;
   return /* @__PURE__ */ jsxs(Rotate, { rotation: [0, 0, angle], children: [
-    /* @__PURE__ */ jsx(Colorize, { color: "#b8bdc4", children: /* @__PURE__ */ jsx(Translate, { offset: [0, centerY, centerZ], children: /* @__PURE__ */ jsxs(Subtract, { children: [
+    /* @__PURE__ */ jsx(Colorize, { color: "#b8bdc4", material: componentMaterials.brushedMetal, children: /* @__PURE__ */ jsx(Translate, { offset: [0, centerY, centerZ], children: /* @__PURE__ */ jsxs(Subtract, { children: [
       /* @__PURE__ */ jsx(Capsule, { width: width10, height: height10, depth }),
       /* @__PURE__ */ jsx(
         Capsule,
@@ -8448,7 +8727,7 @@ var UsbCMidmount = ({
         }
       )
     ] }) }) }),
-    /* @__PURE__ */ jsxs(Colorize, { color: "#242529", children: [
+    /* @__PURE__ */ jsxs(Colorize, { color: "#242529", material: componentMaterials.moldedPlastic, children: [
       /* @__PURE__ */ jsx(
         Cuboid,
         {
@@ -8469,7 +8748,7 @@ var UsbCMidmount = ({
         ) : null
       )
     ] }),
-    /* @__PURE__ */ jsxs(Colorize, { color: "#d3ad57", children: [
+    /* @__PURE__ */ jsxs(Colorize, { color: "#d3ad57", material: componentMaterials.goldContact, children: [
       [-1, 1].flatMap(
         (side) => [-2.75, -2.25, -1.25, -0.25, 0.25, 1.25, 2.25, 2.75].map((x) => /* @__PURE__ */ jsx(
           Cuboid,
@@ -8493,7 +8772,7 @@ var UsbCMidmount = ({
         i
       ))
     ] }),
-    /* @__PURE__ */ jsx(Colorize, { color: "#b8bdc4", children: slots.map((slot, i) => /* @__PURE__ */ jsx(
+    /* @__PURE__ */ jsx(Colorize, { color: "#b8bdc4", material: componentMaterials.brushedMetal, children: slots.map((slot, i) => /* @__PURE__ */ jsx(
       Cuboid,
       {
         size: [
@@ -8790,34 +9069,56 @@ var CableStrip = ({
   color,
   acrossOffset = 0,
   normalOffset = 0,
-  overlap = 0.03
-}) => /* @__PURE__ */ jsx(Colorize, { color, children: points.slice(1).map((point, index) => {
-  const previous = points[index];
-  const dx = point[0] - previous[0];
-  const dy = point[1] - previous[1];
-  const dz = point[2] - previous[2];
-  const segmentLength = Math.hypot(dx, dy, dz);
-  if (segmentLength < EPSILON) return null;
-  const pitch = Math.asin(dz / segmentLength);
-  const yaw = Math.atan2(-dx, dy);
-  const midpoint = [
-    (previous[0] + point[0]) / 2,
-    (previous[1] + point[1]) / 2,
-    (previous[2] + point[2]) / 2
-  ];
-  const roundRadius = Math.max(
-    1e-3,
-    Math.min(width10, thickness, segmentLength) / 2 - 1e-3
-  );
-  return /* @__PURE__ */ jsx(Translate, { offset: midpoint, children: /* @__PURE__ */ jsx(Rotate, { rotation: [pitch, 0, yaw], children: /* @__PURE__ */ jsx(
-    RoundedCuboid,
-    {
-      size: [width10, segmentLength + overlap, thickness],
-      center: [acrossOffset, 0, normalOffset],
-      roundRadius
-    }
-  ) }) }, `${index}:${midpoint.join(":")}`);
-}) });
+  overlap = 0.03,
+  widthAtDistance,
+  startDistance = 0
+}) => {
+  const distances = getPathDistances(points);
+  return /* @__PURE__ */ jsx(Colorize, { color, children: points.slice(1).map((point, index) => {
+    const previous = points[index];
+    const dx = point[0] - previous[0];
+    const dy = point[1] - previous[1];
+    const dz = point[2] - previous[2];
+    const segmentLength = Math.hypot(dx, dy, dz);
+    if (segmentLength < EPSILON) return null;
+    const pitch = Math.asin(dz / segmentLength);
+    const yaw = Math.atan2(-dx, dy);
+    const midpoint = [
+      (previous[0] + point[0]) / 2,
+      (previous[1] + point[1]) / 2,
+      (previous[2] + point[2]) / 2
+    ];
+    const roundRadius = Math.max(
+      1e-3,
+      Math.min(width10, thickness, segmentLength) / 2 - 1e-3
+    );
+    const startWidth = widthAtDistance?.(startDistance + distances[index]) ?? width10;
+    const endWidth = widthAtDistance?.(startDistance + distances[index + 1]) ?? width10;
+    return /* @__PURE__ */ jsx(Translate, { offset: midpoint, children: /* @__PURE__ */ jsx(Rotate, { rotation: [pitch, 0, yaw], children: widthAtDistance ? /* @__PURE__ */ jsxs(Hull, { children: [
+      /* @__PURE__ */ jsx(
+        Cuboid,
+        {
+          size: [startWidth, overlap, thickness],
+          center: [acrossOffset, -segmentLength / 2, normalOffset]
+        }
+      ),
+      /* @__PURE__ */ jsx(
+        Cuboid,
+        {
+          size: [endWidth, overlap, thickness],
+          center: [acrossOffset, segmentLength / 2, normalOffset]
+        }
+      )
+    ] }) : /* @__PURE__ */ jsx(
+      RoundedCuboid,
+      {
+        size: [width10, segmentLength + overlap, thickness],
+        center: [acrossOffset, 0, normalOffset],
+        roundRadius
+      }
+    ) }) }, `${index}:${midpoint.join(":")}`);
+  }) });
+};
 var FlexScreen = (props) => {
   const {
     width: width10,
@@ -8837,13 +9138,15 @@ var FlexScreen = (props) => {
     flexCableLength = 28,
     flexCableThickness = 0.18,
     flexCableColor = "#d79528",
-    conductorCount = 8,
-    conductorPitch,
-    conductorWidth,
+    pinCount: conductorCount = props.conductorCount ?? 8,
+    pitch: conductorPitch = props.conductorPitch,
+    padWidth: conductorWidth = props.conductorWidth,
     conductorThickness = 0.035,
     conductorColor = "#8c4a18",
     cableEdgeMargin = 0.6,
-    exposedContactLength = 2.4,
+    padLength: exposedContactLength = props.exposedContactLength ?? 2.4,
+    tailLength,
+    taperLength,
     showConductors = true,
     showFlexCable = true,
     showStiffeners = true,
@@ -8891,8 +9194,11 @@ var FlexScreen = (props) => {
   assertPositive("foldOutset", foldOutset);
   assertPositive("boardThickness", boardThickness);
   if (showStiffeners) assertPositive("stiffenerThickness", stiffenerThickness);
+  if (!Number.isFinite(exposedContactLength) || exposedContactLength < 0) {
+    throw new Error("padLength must be a finite nonnegative length");
+  }
   if (!Number.isInteger(conductorCount) || conductorCount < 1) {
-    throw new Error("conductorCount must be a positive integer");
+    throw new Error("pinCount must be a positive integer");
   }
   if (!Number.isInteger(bendSegments) || bendSegments < 2) {
     throw new Error("bendSegments must be an integer of at least 2");
@@ -8912,17 +9218,22 @@ var FlexScreen = (props) => {
     throw new Error("cableEdgeMargin leaves no usable flex cable width");
   }
   const resolvedConductorPitch = conductorPitch ?? (conductorCount === 1 ? 0 : usableCableWidth / conductorCount);
-  if (conductorCount > 1 && (!Number.isFinite(resolvedConductorPitch) || resolvedConductorPitch <= 0)) {
-    throw new Error("conductorPitch must be greater than zero");
+  if ((conductorPitch !== void 0 || conductorCount > 1) && (!Number.isFinite(resolvedConductorPitch) || resolvedConductorPitch <= 0)) {
+    throw new Error("pitch must be greater than zero");
   }
   const resolvedConductorWidth = conductorWidth ?? (conductorCount === 1 ? Math.min(usableCableWidth, resolvedCableWidth * 0.45) : resolvedConductorPitch * 0.48);
-  assertPositive("conductorWidth", resolvedConductorWidth);
+  assertPositive("padWidth", resolvedConductorWidth);
   const conductorSpan = (conductorCount - 1) * resolvedConductorPitch + resolvedConductorWidth;
-  if (conductorSpan > usableCableWidth + EPSILON) {
-    throw new Error(
-      "conductorPitch and conductorWidth do not fit inside the flex cable margins"
-    );
-  }
+  const connectorWidth = Math.max(
+    resolvedCableWidth,
+    conductorSpan + cableEdgeMargin * 2
+  );
+  const widensAtConnector = connectorWidth > resolvedCableWidth + EPSILON;
+  const screenConductorPitch = widensAtConnector ? conductorCount === 1 ? 0 : usableCableWidth / conductorCount : resolvedConductorPitch;
+  const screenConductorWidth = widensAtConnector ? Math.min(
+    resolvedConductorWidth,
+    conductorCount === 1 ? usableCableWidth : screenConductorPitch * 0.48
+  ) : resolvedConductorWidth;
   const cableStartsBelowBoard = belowBoard && !foldedFace;
   const defaultCableZ = cableStartsBelowBoard ? boardTopZ - boardThickness - boardClearance - flexCableThickness / 2 : boardTopZ + boardClearance + flexCableThickness / 2;
   const start = [
@@ -8949,23 +9260,56 @@ var FlexScreen = (props) => {
     direction
   }) : createFlatPath(start, flexCableLength);
   const totalCableLength = getPathDistances(path).at(-1);
+  if (tailLength !== void 0) {
+    assertPositive("tailLength", tailLength);
+    if (tailLength >= totalCableLength) {
+      throw new Error("tailLength must be shorter than flexCableLength");
+    }
+  }
+  if (taperLength !== void 0) assertPositive("taperLength", taperLength);
   const contactLength = Math.min(
     Math.max(0, exposedContactLength),
-    totalCableLength / 2
+    totalCableLength / 2,
+    tailLength ?? Infinity
   );
   const resolvedStiffenerLength = Math.min(
     Math.max(0, stiffenerLength),
-    totalCableLength / 2
+    totalCableLength / 2,
+    tailLength ?? Infinity
+  );
+  const connectorLeadLength = tailLength ?? Math.max(contactLength, resolvedStiffenerLength);
+  if (taperLength !== void 0 && connectorLeadLength + taperLength > totalCableLength + EPSILON) {
+    throw new Error(
+      "tailLength and taperLength must fit within flexCableLength"
+    );
+  }
+  const taperEndDistance = Math.min(
+    totalCableLength,
+    connectorLeadLength + (taperLength ?? Math.max(3, (connectorWidth - resolvedCableWidth) / 2))
   );
+  const cableWidthAtDistance = (distance2) => {
+    if (distance2 <= connectorLeadLength) return connectorWidth;
+    const progress = Math.min(
+      1,
+      (distance2 - connectorLeadLength) / (taperEndDistance - connectorLeadLength)
+    );
+    return connectorWidth + (resolvedCableWidth - connectorWidth) * progress;
+  };
+  const cablePath = widensAtConnector ? [
+    ...slicePath(path, 0, connectorLeadLength),
+    ...slicePath(path, connectorLeadLength, taperEndDistance).slice(1),
+    ...slicePath(path, taperEndDistance, totalCableLength).slice(1)
+  ] : path;
+  const widthProfile = widensAtConnector ? cableWidthAtDistance : void 0;
   const startContacts = slicePath(path, 0, contactLength);
   const endContacts = slicePath(
     path,
     totalCableLength - contactLength,
     totalCableLength
   );
-  const startStiffener = slicePath(path, 0, resolvedStiffenerLength);
+  const startStiffener = slicePath(cablePath, 0, resolvedStiffenerLength);
   const endStiffener = slicePath(
-    path,
+    cablePath,
     totalCableLength - resolvedStiffenerLength,
     totalCableLength
   );
@@ -9014,7 +9358,7 @@ var FlexScreen = (props) => {
   ];
   const conductorOffsets = Array.from(
     { length: conductorCount },
-    (_, index) => conductorCount === 1 ? 0 : (index - (conductorCount - 1) / 2) * resolvedConductorPitch
+    (_, index) => (index - (conductorCount - 1) / 2) * resolvedConductorPitch
   );
   const conductorNormalOffset = (flexCableThickness + conductorThickness) / 2;
   const stiffenerNormalOffset = -(flexCableThickness + stiffenerThickness) / 2;
@@ -9022,8 +9366,9 @@ var FlexScreen = (props) => {
     showFlexCable && /* @__PURE__ */ jsx(
       CableStrip,
       {
-        points: path,
+        points: cablePath,
         width: resolvedCableWidth,
+        widthAtDistance: widthProfile,
         thickness: flexCableThickness,
         color: flexCableColor
       }
@@ -9033,7 +9378,7 @@ var FlexScreen = (props) => {
         CableStrip,
         {
           points: startStiffener,
-          width: resolvedCableWidth,
+          width: connectorWidth,
           thickness: stiffenerThickness,
           color: stiffenerColor,
           normalOffset: stiffenerNormalOffset
@@ -9044,6 +9389,8 @@ var FlexScreen = (props) => {
         {
           points: endStiffener,
           width: resolvedCableWidth,
+          widthAtDistance: widthProfile,
+          startDistance: totalCableLength - resolvedStiffenerLength,
           thickness: stiffenerThickness,
           color: stiffenerColor,
           normalOffset: stiffenerNormalOffset
@@ -9066,10 +9413,10 @@ var FlexScreen = (props) => {
         CableStrip,
         {
           points: endContacts,
-          width: resolvedConductorWidth,
+          width: screenConductorWidth,
           thickness: conductorThickness,
           color: conductorColor,
-          acrossOffset,
+          acrossOffset: (index - (conductorCount - 1) / 2) * screenConductorPitch,
           normalOffset: conductorNormalOffset
         }
       )
@@ -9108,6 +9455,10 @@ var Footprinter3d = ({ footprint }) => {
   if (mp3.getModelNames().includes(modelFn)) {
     const model = mp3.string(footprint).json();
     switch (model.fn) {
+      case "hexbolt": {
+        const { fn, ...props } = model;
+        return /* @__PURE__ */ jsx(HexBolt, { ...props });
+      }
       case "nema": {
         const { fn, ...props } = model;
         return /* @__PURE__ */ jsx(NemaMotor, { ...props });
@@ -9826,6 +10177,16 @@ function renderNode(node, colorCtx, renderCtx) {
     return node.flatMap((n) => renderNode(n, colorCtx, renderCtx));
   if (!isVNode(node)) return [];
   const { type, props, children } = node;
+  if (props?.material) {
+    const { material, ...rest } = props;
+    return renderNode({ ...node, props: rest }, colorCtx, renderCtx).map(
+      (entry) => ({
+        ...entry,
+        material: { ...material },
+        geom: { ...entry.geom, material: { ...material } }
+      })
+    );
+  }
   if (type === Fragment) {
     return (children ?? []).flatMap((c) => renderNode(c, colorCtx, renderCtx));
   }
@@ -9842,7 +10203,8 @@ function renderNode(node, colorCtx, renderCtx) {
     const geoms = (children ?? []).flatMap(
       (c) => renderNode(c, colorCtx, renderCtx)
     );
-    return geoms.map(({ geom, color }) => ({
+    return geoms.map(({ geom, color, material }) => ({
+      material,
       geom: transforms.translate(off, geom),
       color: color ?? colorCtx
     }));
@@ -9857,7 +10219,8 @@ function renderNode(node, colorCtx, renderCtx) {
     const geoms = (children ?? []).flatMap(
       (c) => renderNode(c, colorCtx, renderCtx)
     );
-    return geoms.map(({ geom, color }) => ({
+    return geoms.map(({ geom, color, material }) => ({
+      material,
       geom: transforms.rotateZ(
         rot[2],
         transforms.rotateY(rot[1], transforms.rotateX(rot[0], geom))
@@ -9866,14 +10229,23 @@ function renderNode(node, colorCtx, renderCtx) {
     }));
   }
   if (type === Union || type === Subtract || type === Hull) {
-    const geoms = (children ?? []).flatMap((c) => renderNode(c, colorCtx, renderCtx)).map((g) => g.geom);
+    const entries = (children ?? []).flatMap(
+      (c) => renderNode(c, colorCtx, renderCtx)
+    );
+    const geoms = entries.map((g) => g.geom);
     if (geoms.length === 0) return [];
     let geom;
     if (type === Union) geom = booleans.union(geoms);
     else if (type === Subtract)
       geom = booleans.subtract(geoms[0], geoms.slice(1));
     else geom = hulls.hull(geoms);
-    return [{ geom, color: colorCtx }];
+    return [
+      {
+        geom,
+        color: colorCtx,
+        material: type === Subtract ? entries[0]?.material : void 0
+      }
+    ];
   }
   if (type === Custom) {
     return [{ geom: props.geometry, color: colorCtx }];
@@ -9884,7 +10256,10 @@ function renderNode(node, colorCtx, renderCtx) {
     return [{ geom: g2, color: colorCtx ?? props?.color }];
   }
   if (type === ExtrudeLinear) {
-    const geoms2 = (children ?? []).flatMap((c) => renderNode(c, colorCtx, renderCtx)).map((g) => g.geom);
+    const entries = (children ?? []).flatMap(
+      (c) => renderNode(c, colorCtx, renderCtx)
+    );
+    const geoms2 = entries.map((g) => g.geom);
     if (geoms2.length === 0) return [];
     const base2 = geoms2.length > 1 ? booleans.union(geoms2) : geoms2[0];
     const height10 = props?.height ?? props?.h ?? 1;
@@ -9895,7 +10270,13 @@ function renderNode(node, colorCtx, renderCtx) {
         poly.vertices.reverse();
       }
     }
-    return [{ geom: g3, color: colorCtx ?? props?.color }];
+    return [
+      {
+        geom: g3,
+        color: colorCtx ?? props?.color,
+        material: entries.length === 1 ? entries[0]?.material : void 0
+      }
+    ];
   }
   if (type === Cuboid || type === Cube || type === Cylinder || type === Sphere || type === RoundedCuboid || type === RoundedCylinder) {
     let g;
@@ -9940,7 +10321,11 @@ function renderNode(node, colorCtx, renderCtx) {
 }
 function render(root, jscad4) {
   const geometries = renderNode(root, void 0, { jscad: jscad4 });
-  return { geometries };
+  return {
+    geometries: geometries.map(
+      (entry) => entry.material ? { ...entry, geom: { ...entry.geom, material: entry.material } } : entry
+    )
+  };
 }
 
 // lib/vanilla/convertCSGToThreeGeom.ts
@@ -10054,6 +10439,7 @@ function createJSCADRenderer(jscad4) {
 export {
   Fragment,
   HelicalGear,
+  HexBolt,
   HexSocketBolt,
   NEMA17,
   NEMA23,
@@ -10065,6 +10451,8 @@ export {
   convertCSGToThreeGeom,
   createHelicalGearGeom,
   createHelicalGearMesh,
+  createHexBoltGeom,
+  createHexBoltMesh,
   createHexSocketBoltGeom,
   createHexSocketBoltMesh,
   createJSCADRenderer,