jscad-electronics 0.0.182 → 0.0.184

package/dist/vanilla.d.ts

@@ -28,12 +28,13 @@ type NemaMotorProps = NemaMotorModelPropsInput & {
     bodyColor?: string;
     capColor?: string;
     shaftColor?: string;
+    screwColor?: string;
 };
 type NemaFrameMotorProps = Omit<NemaMotorProps, "nemaSize">;
 /** Mounting face at Z=0, body along -Z, shaft along +Z; all lengths in mm.
  * Parameters follow the modelprinter NEMA contract; JSCAD builds all geometry.
  */
-declare function NemaMotor({ bodyColor, capColor, shaftColor, ...props }: NemaMotorProps): react_jsx_runtime.JSX.Element;
+declare function NemaMotor({ bodyColor, capColor, shaftColor, screwColor, ...props }: NemaMotorProps): react_jsx_runtime.JSX.Element;
 declare const NEMA8: (props: NemaFrameMotorProps) => react_jsx_runtime.JSX.Element;
 declare const NEMA17: (props: NemaFrameMotorProps) => react_jsx_runtime.JSX.Element;
 declare const NEMA23: (props: NemaFrameMotorProps) => react_jsx_runtime.JSX.Element;

package/dist/vanilla.js

@@ -218,7 +218,7 @@ var createHexSocketBoltMesh = (input) => {
   } = hexSocketBoltDimensions[props.metricSize];
   const { length, showThreads } = props;
   const segments = 96;
-  const steps = Math.max(2, Math.ceil(length / pitch * 24));
+  const steps = showThreads ? Math.max(2, Math.ceil(length / pitch * 24)) : 2;
   if (steps > 24e3)
     throw new Error(
       "Bolt length exceeds mesh resolution limit (1000 thread turns)"
@@ -254,8 +254,11 @@ var createHexSocketBoltMesh = (input) => {
     }
   };
   let previous = -1;
-  for (let step = 0; step <= steps; step++) {
-    const z = -length + length * step / steps;
+  const shaftLevels = showThreads ? Array.from(
+    { length: steps + 1 },
+    (_, step) => -length + length * step / steps
+  ) : [-length, -length + tipBevel, 0];
+  for (const z of shaftLevels) {
     const current = ring(z, (angle) => {
       const phase = ((z / pitch - angle / (2 * Math.PI)) % 1 + 1) % 1;
       const distance2 = Math.min(phase, 1 - phase);
@@ -472,7 +475,11 @@ function SheetMetal({ color = "#737e8f", ...props }) {
 }
 
 // lib/NemaMotor.tsx
+import jscad3 from "@jscad/modeling";
+
+// lib/utils/nemaMotorWireGeometry.ts
 import jscad2 from "@jscad/modeling";
+import { getNemaMotorReferencePoints } from "@tscircuit/modelprinter";
 
 // lib/utils/nemaMotorParameters.ts
 import { mp as mp2, nemaMotorModelPropsSchema } from "@tscircuit/modelprinter";
@@ -480,6 +487,66 @@ var resolveNemaMotorProps = nemaMotorModelPropsSchema.parse.bind(
   nemaMotorModelPropsSchema
 );
 
+// lib/utils/nemaMotorWireGeometry.ts
+function createNemaMotorWireGeometry(input) {
+  const p = resolveNemaMotorProps(input);
+  if (p.wireConnection === "none") return [];
+  const { position } = getNemaMotorReferencePoints(p).wireside;
+  const angle = p.wireSideAngle * Math.PI / 180;
+  const place = (geometry) => jscad2.transforms.translate(
+    [position.x, position.y, position.z],
+    jscad2.transforms.rotateZ(angle, geometry)
+  );
+  if (p.wireConnection === "stubs") {
+    const colors = [
+      "#d53f3f",
+      "#2463af",
+      "#3b934b",
+      "#252830",
+      "#e5d049",
+      "#eeeeee",
+      "#ce7432",
+      "#803e91"
+    ];
+    return Array.from({ length: p.wireCount }, (_, i) => ({
+      color: colors[i],
+      geometry: place(
+        jscad2.transforms.translate(
+          [
+            (p.wireLength - 0.15) / 2,
+            (i - (p.wireCount - 1) / 2) * p.wireDiameter * 1.5,
+            0
+          ],
+          jscad2.transforms.rotateY(
+            Math.PI / 2,
+            jscad2.primitives.cylinder({
+              height: p.wireLength + 0.15,
+              radius: p.wireDiameter / 2,
+              segments: 24
+            })
+          )
+        )
+      )
+    }));
+  }
+  const shell = jscad2.booleans.subtract(
+    jscad2.primitives.cuboid({ size: [6.1, 13.9, 4.5], center: [2.95, 0, 0] }),
+    jscad2.primitives.cuboid({ size: [5.5, 12.7, 3.3], center: [3.55, 0, 0] })
+  );
+  return [
+    { color: "#eeeeea", geometry: place(shell) },
+    ...Array.from({ length: 6 }, (_, i) => ({
+      color: "#b8bec6",
+      geometry: place(
+        jscad2.primitives.cuboid({
+          size: [3.4, 0.5, 0.5],
+          center: [1.7, (i - 2.5) * 2, 0]
+        })
+      )
+    }))
+  ];
+}
+
 // lib/utils/nemaMotorGeometry.ts
 var circle = (radius, x = 0, y = 0) => Array.from({ length: 96 }, (_, i) => [
   x + radius * Math.cos(i * Math.PI / 48),
@@ -527,12 +594,34 @@ function createNemaMotorSections(input) {
   add("frontCap", front, -holeDepth, 0, holes);
   add("frontCap", front, -p.frontCapLength, -holeDepth);
   add("body", core, -p.bodyLength + p.rearCapLength, -p.frontCapLength);
-  add(
-    "rearCap",
-    p.mountingHoleThrough ? core : front,
-    -p.bodyLength,
-    -p.bodyLength + p.rearCapLength
-  );
+  if (p.backFace === "plain") {
+    add(
+      "rearCap",
+      p.mountingHoleThrough ? core : front,
+      -p.bodyLength,
+      -p.bodyLength + p.rearCapLength
+    );
+  } else {
+    const halfPitch = p.backFaceHoleSpacing / 2;
+    const rearHoles = [-halfPitch, halfPitch].flatMap(
+      (x) => [-halfPitch, halfPitch].map(
+        (y) => circle(p.backFaceHoleDiameter / 2, x, y)
+      )
+    );
+    add(
+      "rearCap",
+      front,
+      -p.bodyLength,
+      -p.bodyLength + p.backFaceHoleDepth,
+      rearHoles
+    );
+    add(
+      "rearCap",
+      front,
+      -p.bodyLength + p.backFaceHoleDepth,
+      -p.bodyLength + p.rearCapLength
+    );
+  }
   add("pilot", circle(p.pilotDiameter / 2), 0, p.pilotLength);
   const r = p.shaftDiameter / 2;
   const round = circle(r);
@@ -557,34 +646,60 @@ function createNemaMotorSections(input) {
 }
 
 // lib/NemaMotor.tsx
+var generalize = jscad3.modifiers.generalize;
 function NemaMotor({
   bodyColor = "#242830",
   capColor = "#aeb5bd",
   shaftColor = "#b8bec6",
+  screwColor = "#626b78",
   ...props
 }) {
-  return /* @__PURE__ */ jsx(Fragment2, { children: createNemaMotorSections(props).map((section, index) => {
-    const outline = jscad2.geometries.geom2.fromPoints(section.outline);
-    const profile = section.holes.length ? jscad2.booleans.subtract(
-      outline,
-      ...section.holes.map((h2) => jscad2.geometries.geom2.fromPoints(h2))
-    ) : outline;
-    const geometry = jscad2.transforms.translate(
-      [0, 0, section.zMin],
-      jscad2.extrusions.extrudeLinear(
-        { height: section.zMax - section.zMin },
-        profile
-      )
-    );
-    return /* @__PURE__ */ jsx(
-      Colorize,
-      {
-        color: section.name === "body" ? bodyColor : section.name === "shaft" ? shaftColor : capColor,
-        children: /* @__PURE__ */ jsx(Custom, { geometry })
-      },
-      `${section.name}-${index}`
-    );
-  }) });
+  const p = resolveNemaMotorProps(props);
+  const screw = p.backFace === "screws" ? jscad3.transforms.rotateX(
+    Math.PI,
+    createHexSocketBoltGeom({
+      metricSize: p.backFaceScrewSize,
+      length: p.backFaceHoleDepth,
+      showThreads: false
+    })
+  ) : void 0;
+  const halfPitch = p.backFaceHoleSpacing / 2;
+  return /* @__PURE__ */ jsxs(Fragment2, { children: [
+    createNemaMotorSections(p).map((section, index) => {
+      const outline = jscad3.geometries.geom2.fromPoints(section.outline);
+      const profile = section.holes.length ? jscad3.booleans.subtract(
+        outline,
+        ...section.holes.map((h2) => jscad3.geometries.geom2.fromPoints(h2))
+      ) : outline;
+      const geometry = jscad3.transforms.translate(
+        [0, 0, section.zMin],
+        jscad3.extrusions.extrudeLinear(
+          { height: section.zMax - section.zMin },
+          profile
+        )
+      );
+      return /* @__PURE__ */ jsx(
+        Colorize,
+        {
+          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}`)),
+    screw && [-halfPitch, halfPitch].flatMap(
+      (x) => [-halfPitch, halfPitch].map((y) => /* @__PURE__ */ jsx(Colorize, { color: screwColor, children: /* @__PURE__ */ jsx(
+        Custom,
+        {
+          geometry: jscad3.transforms.translate(
+            [x, y, -p.bodyLength],
+            generalize({ simplify: true }, screw)
+          )
+        }
+      ) }, `rear-screw-${x}-${y}`))
+    )
+  ] });
 }
 var NEMA8 = (props) => /* @__PURE__ */ jsx(NemaMotor, { ...props, nemaSize: 8 });
 var NEMA17 = (props) => /* @__PURE__ */ jsx(NemaMotor, { ...props, nemaSize: 17 });
@@ -9414,8 +9529,8 @@ function renderNode(node, colorCtx, renderCtx) {
   }
   return (children ?? []).flatMap((c) => renderNode(c, colorCtx, renderCtx));
 }
-function render(root, jscad3) {
-  const geometries = renderNode(root, void 0, { jscad: jscad3 });
+function render(root, jscad4) {
+  const geometries = renderNode(root, void 0, { jscad: jscad4 });
   return { geometries };
 }
 
@@ -9503,24 +9618,24 @@ function convertCSGToThreeGeom(csg) {
 }
 
 // lib/vanilla/index.ts
-function getJscadModelForFootprint(footprint, jscad3) {
+function getJscadModelForFootprint(footprint, jscad4) {
   const vnode = h(Footprinter3d, { footprint });
-  return render(vnode, jscad3);
+  return render(vnode, jscad4);
 }
-function getJscadModelForFootprintWithPads(footprint, jscad3) {
+function getJscadModelForFootprintWithPads(footprint, jscad4) {
   const vnode = h(
     Fragment,
     {},
     h(Footprinter3d, { footprint }),
     h(ExtrudedPads, { footprint })
   );
-  return render(vnode, jscad3);
+  return render(vnode, jscad4);
 }
-function createJSCADRenderer(jscad3) {
+function createJSCADRenderer(jscad4) {
   function createJSCADRoot(container) {
     return {
       render(element) {
-        const { geometries } = render(element, jscad3);
+        const { geometries } = render(element, jscad4);
         container.splice(0, container.length, ...geometries);
       }
     };