jscad-electronics 0.0.183 → 0.0.184

package/dist/index.js

@@ -896,7 +896,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)"
@@ -932,8 +932,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);
@@ -1155,7 +1158,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";
@@ -1163,6 +1170,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),
@@ -1264,6 +1331,7 @@ function createNemaMotorSections(input) {
 // lib/NemaMotor.tsx
 import { Colorize as Colorize9, Custom as Custom3 } from "jscad-fiber";
 import { Fragment as Fragment14, jsx as jsx19, jsxs as jsxs16 } from "react/jsx-runtime";
+var generalize = jscad3.modifiers.generalize;
 function NemaMotor({
   bodyColor = "#242830",
   capColor = "#aeb5bd",
@@ -1272,7 +1340,7 @@ function NemaMotor({
   ...props
 }) {
   const p = resolveNemaMotorProps(props);
-  const screw = p.backFace === "screws" ? jscad2.transforms.rotateX(
+  const screw = p.backFace === "screws" ? jscad3.transforms.rotateX(
     Math.PI,
     createHexSocketBoltGeom({
       metricSize: p.backFaceScrewSize,
@@ -1283,14 +1351,14 @@ function NemaMotor({
   const halfPitch = p.backFaceHoleSpacing / 2;
   return /* @__PURE__ */ jsxs16(Fragment14, { children: [
     createNemaMotorSections(p).map((section, index) => {
-      const outline = jscad2.geometries.geom2.fromPoints(section.outline);
-      const profile = section.holes.length ? jscad2.booleans.subtract(
+      const outline = jscad3.geometries.geom2.fromPoints(section.outline);
+      const profile = section.holes.length ? jscad3.booleans.subtract(
         outline,
-        ...section.holes.map((h) => jscad2.geometries.geom2.fromPoints(h))
+        ...section.holes.map((h) => jscad3.geometries.geom2.fromPoints(h))
       ) : outline;
-      const geometry = jscad2.transforms.translate(
+      const geometry = jscad3.transforms.translate(
         [0, 0, section.zMin],
-        jscad2.extrusions.extrudeLinear(
+        jscad3.extrusions.extrudeLinear(
           { height: section.zMax - section.zMin },
           profile
         )
@@ -1299,18 +1367,19 @@ function NemaMotor({
         Colorize9,
         {
           color: section.name === "body" ? bodyColor : section.name === "shaft" ? shaftColor : capColor,
-          children: /* @__PURE__ */ jsx19(Custom3, { geometry })
+          children: /* @__PURE__ */ jsx19(Custom3, { geometry: generalize({ simplify: true }, geometry) })
         },
         `${section.name}-${index}`
       );
     }),
+    createNemaMotorWireGeometry(p).map(({ geometry, color }, index) => /* @__PURE__ */ jsx19(Colorize9, { color, children: /* @__PURE__ */ jsx19(Custom3, { geometry: generalize({ simplify: true }, geometry) }) }, `wire-${index}`)),
     screw && [-halfPitch, halfPitch].flatMap(
       (x) => [-halfPitch, halfPitch].map((y) => /* @__PURE__ */ jsx19(Colorize9, { color: screwColor, children: /* @__PURE__ */ jsx19(
         Custom3,
         {
-          geometry: jscad2.transforms.translate(
+          geometry: jscad3.transforms.translate(
             [x, y, -p.bodyLength],
-            screw
+            generalize({ simplify: true }, screw)
           )
         }
       ) }, `rear-screw-${x}-${y}`))