circuit-json-to-step 0.0.21 → 0.0.23

package/lib/pill-geometry.ts

@@ -396,7 +396,8 @@ export function createPillHoleLoop(
 export function createPillCylindricalFaces(
   repo: Repository,
   hole: any,
-  boardThickness: number,
+  zMin: number,
+  zMax: number,
   xDir: Ref<Direction>,
   zDir: Ref<Direction>,
 ): Ref<AdvancedFace>[] {
@@ -428,7 +429,8 @@ export function createPillCylindricalFaces(
         rotation,
         centerX,
         centerY,
-        boardThickness,
+        zMin,
+        zMax,
         zDir,
         xDir,
       ),
@@ -445,7 +447,8 @@ export function createPillCylindricalFaces(
         rotation,
         centerX,
         centerY,
-        boardThickness,
+        zMin,
+        zMax,
         zDir,
       ),
     )
@@ -462,7 +465,8 @@ export function createPillCylindricalFaces(
         rotation,
         centerX,
         centerY,
-        boardThickness,
+        zMin,
+        zMax,
         zDir,
         xDir,
       ),
@@ -479,7 +483,8 @@ export function createPillCylindricalFaces(
         rotation,
         centerX,
         centerY,
-        boardThickness,
+        zMin,
+        zMax,
         zDir,
       ),
     )
@@ -499,7 +504,8 @@ export function createPillCylindricalFaces(
         rotation,
         centerX,
         centerY,
-        boardThickness,
+        zMin,
+        zMax,
         zDir,
         xDir,
       ),
@@ -516,7 +522,8 @@ export function createPillCylindricalFaces(
         rotation,
         centerX,
         centerY,
-        boardThickness,
+        zMin,
+        zMax,
         zDir,
       ),
     )
@@ -533,7 +540,8 @@ export function createPillCylindricalFaces(
         rotation,
         centerX,
         centerY,
-        boardThickness,
+        zMin,
+        zMax,
         zDir,
         xDir,
       ),
@@ -550,7 +558,8 @@ export function createPillCylindricalFaces(
         rotation,
         centerX,
         centerY,
-        boardThickness,
+        zMin,
+        zMax,
         zDir,
       ),
     )
@@ -572,7 +581,8 @@ function createCylindricalWall(
   rotation: number,
   centerX0: number,
   centerY0: number,
-  boardThickness: number,
+  zMin: number,
+  zMax: number,
   zDir: Ref<Direction>,
   xDir: Ref<Direction>,
 ): Ref<AdvancedFace> {
@@ -602,13 +612,13 @@ function createCylindricalWall(
   const bottomStartVertex = repo.add(
     new VertexPoint(
       "",
-      repo.add(new CartesianPoint("", bottomStart.x, bottomStart.y, 0)),
+      repo.add(new CartesianPoint("", bottomStart.x, bottomStart.y, zMin)),
     ),
   )
   const bottomEndVertex = repo.add(
     new VertexPoint(
       "",
-      repo.add(new CartesianPoint("", bottomEnd.x, bottomEnd.y, 0)),
+      repo.add(new CartesianPoint("", bottomEnd.x, bottomEnd.y, zMin)),
     ),
   )
 
@@ -616,17 +626,13 @@ function createCylindricalWall(
   const topStart = repo.add(
     new VertexPoint(
       "",
-      repo.add(
-        new CartesianPoint("", bottomStart.x, bottomStart.y, boardThickness),
-      ),
+      repo.add(new CartesianPoint("", bottomStart.x, bottomStart.y, zMax)),
     ),
   )
   const topEnd = repo.add(
     new VertexPoint(
       "",
-      repo.add(
-        new CartesianPoint("", bottomEnd.x, bottomEnd.y, boardThickness),
-      ),
+      repo.add(new CartesianPoint("", bottomEnd.x, bottomEnd.y, zMax)),
     ),
   )
 
@@ -639,7 +645,7 @@ function createCylindricalWall(
     rotation,
   )
   const bottomCenter = repo.add(
-    new CartesianPoint("", centerRotated.x, centerRotated.y, 0),
+    new CartesianPoint("", centerRotated.x, centerRotated.y, zMin),
   )
   const bottomPlacement = repo.add(
     new Axis2Placement3D(
@@ -656,7 +662,7 @@ function createCylindricalWall(
 
   // Create arc edge at top
   const topCenter = repo.add(
-    new CartesianPoint("", centerRotated.x, centerRotated.y, boardThickness),
+    new CartesianPoint("", centerRotated.x, centerRotated.y, zMax),
   )
   const topPlacement = repo.add(new Axis2Placement3D("", topCenter, zDir, xDir))
   const topCircle = repo.add(new Circle("", topPlacement, radius))
@@ -666,40 +672,37 @@ function createCylindricalWall(
   const v1 = repo.add(
     new VertexPoint(
       "",
-      repo.add(new CartesianPoint("", bottomStart.x, bottomStart.y, 0)),
+      repo.add(new CartesianPoint("", bottomStart.x, bottomStart.y, zMin)),
     ),
   )
   const v2 = repo.add(
     new VertexPoint(
       "",
-      repo.add(
-        new CartesianPoint("", bottomStart.x, bottomStart.y, boardThickness),
-      ),
+      repo.add(new CartesianPoint("", bottomStart.x, bottomStart.y, zMax)),
     ),
   )
   const v3 = repo.add(
     new VertexPoint(
       "",
-      repo.add(new CartesianPoint("", bottomEnd.x, bottomEnd.y, 0)),
+      repo.add(new CartesianPoint("", bottomEnd.x, bottomEnd.y, zMin)),
     ),
   )
   const v4 = repo.add(
     new VertexPoint(
       "",
-      repo.add(
-        new CartesianPoint("", bottomEnd.x, bottomEnd.y, boardThickness),
-      ),
+      repo.add(new CartesianPoint("", bottomEnd.x, bottomEnd.y, zMax)),
     ),
   )
 
   // Create vertical line edges
   const dir1 = repo.add(new Direction("", 0, 0, 1))
-  const vec1 = repo.add(new Vector("", dir1, boardThickness))
+  const height = zMax - zMin
+  const vec1 = repo.add(new Vector("", dir1, height))
   const line1 = repo.add(new Line("", v1.resolve(repo).pnt, vec1))
   const edge1 = repo.add(new EdgeCurve("", v1, v2, line1, true))
 
   const dir2 = repo.add(new Direction("", 0, 0, 1))
-  const vec2 = repo.add(new Vector("", dir2, boardThickness))
+  const vec2 = repo.add(new Vector("", dir2, height))
   const line2 = repo.add(new Line("", v3.resolve(repo).pnt, vec2))
   const edge2 = repo.add(new EdgeCurve("", v3, v4, line2, true))
 
@@ -743,7 +746,8 @@ function createPlanarWall(
   rotation: number,
   centerX0: number,
   centerY0: number,
-  boardThickness: number,
+  zMin: number,
+  zMax: number,
   zDir: Ref<Direction>,
 ): Ref<AdvancedFace> {
   // Rotate points
@@ -752,21 +756,21 @@ function createPlanarWall(
 
   // Create vertices
   const v1 = repo.add(
-    new VertexPoint("", repo.add(new CartesianPoint("", start.x, start.y, 0))),
+    new VertexPoint(
+      "",
+      repo.add(new CartesianPoint("", start.x, start.y, zMin)),
+    ),
   )
   const v2 = repo.add(
-    new VertexPoint("", repo.add(new CartesianPoint("", end.x, end.y, 0))),
+    new VertexPoint("", repo.add(new CartesianPoint("", end.x, end.y, zMin))),
   )
   const v3 = repo.add(
-    new VertexPoint(
-      "",
-      repo.add(new CartesianPoint("", end.x, end.y, boardThickness)),
-    ),
+    new VertexPoint("", repo.add(new CartesianPoint("", end.x, end.y, zMax))),
   )
   const v4 = repo.add(
     new VertexPoint(
       "",
-      repo.add(new CartesianPoint("", start.x, start.y, boardThickness)),
+      repo.add(new CartesianPoint("", start.x, start.y, zMax)),
     ),
   )
 
@@ -793,11 +797,12 @@ function createPlanarWall(
 
   // Create vertical edges
   const vertDir = repo.add(new Direction("", 0, 0, 1))
-  const vertVec1 = repo.add(new Vector("", vertDir, boardThickness))
+  const height = zMax - zMin
+  const vertVec1 = repo.add(new Vector("", vertDir, height))
   const vertLine1 = repo.add(new Line("", v2.resolve(repo).pnt, vertVec1))
   const vertEdge1 = repo.add(new EdgeCurve("", v2, v3, vertLine1, true))
 
-  const vertVec2 = repo.add(new Vector("", vertDir, boardThickness))
+  const vertVec2 = repo.add(new Vector("", vertDir, height))
   const vertLine2 = repo.add(new Line("", v1.resolve(repo).pnt, vertVec2))
   const vertEdge2 = repo.add(new EdgeCurve("", v1, v4, vertLine2, true))
 
@@ -819,7 +824,7 @@ function createPlanarWall(
   const refDir = repo.add(
     new Direction("", dx / edgeLength, dy / edgeLength, 0),
   )
-  const planeOrigin = repo.add(new CartesianPoint("", start.x, start.y, 0))
+  const planeOrigin = repo.add(new CartesianPoint("", start.x, start.y, zMin))
   const placement = repo.add(
     new Axis2Placement3D("", planeOrigin, normalDir, refDir),
   )

package/lib/scene-box-to-step.ts

@@ -0,0 +1,91 @@
+import type { Ref, Repository } from "stepts"
+import { ClosedShell, ManifoldSolidBrep } from "stepts"
+import type { SceneBox } from "./scene-geometry"
+import { rotatePoint3 } from "./scene-geometry"
+import { createFaceFromVertices, createVertex } from "./step-brep-utils"
+
+export function createSceneBoxSolid(
+  repo: Repository,
+  box: SceneBox,
+): Ref<ManifoldSolidBrep> {
+  if (box.mesh?.triangles?.length) {
+    return createSceneMeshSolid(repo, box)
+  }
+
+  const localBounds = box.mesh?.boundingBox
+    ? {
+        min: box.mesh.boundingBox.min,
+        max: box.mesh.boundingBox.max,
+      }
+    : {
+        min: {
+          x: -box.size.x / 2,
+          y: -box.size.y / 2,
+          z: -box.size.z / 2,
+        },
+        max: {
+          x: box.size.x / 2,
+          y: box.size.y / 2,
+          z: box.size.z / 2,
+        },
+      }
+
+  const corners = [
+    { x: localBounds.min.x, y: localBounds.min.y, z: localBounds.min.z },
+    { x: localBounds.max.x, y: localBounds.min.y, z: localBounds.min.z },
+    { x: localBounds.max.x, y: localBounds.max.y, z: localBounds.min.z },
+    { x: localBounds.min.x, y: localBounds.max.y, z: localBounds.min.z },
+    { x: localBounds.min.x, y: localBounds.min.y, z: localBounds.max.z },
+    { x: localBounds.max.x, y: localBounds.min.y, z: localBounds.max.z },
+    { x: localBounds.max.x, y: localBounds.max.y, z: localBounds.max.z },
+    { x: localBounds.min.x, y: localBounds.max.y, z: localBounds.max.z },
+  ].map((corner) => {
+    const rotated = rotatePoint3(corner, box.rotation)
+    return {
+      x: rotated.x + box.center.x,
+      y: rotated.y + box.center.y,
+      z: rotated.z + box.center.z,
+    }
+  })
+
+  const stepCorners = corners.map((corner) => ({
+    x: corner.x,
+    y: corner.z,
+    z: corner.y,
+  }))
+
+  const vertices = stepCorners.map((corner) => createVertex(repo, corner))
+  const faces = [
+    [vertices[0]!, vertices[1]!, vertices[2]!, vertices[3]!],
+    [vertices[4]!, vertices[7]!, vertices[6]!, vertices[5]!],
+    [vertices[0]!, vertices[4]!, vertices[5]!, vertices[1]!],
+    [vertices[1]!, vertices[5]!, vertices[6]!, vertices[2]!],
+    [vertices[2]!, vertices[6]!, vertices[7]!, vertices[3]!],
+    [vertices[3]!, vertices[7]!, vertices[4]!, vertices[0]!],
+  ].map((faceVertices) => createFaceFromVertices(repo, faceVertices))
+
+  const shell = repo.add(new ClosedShell("", faces))
+  return repo.add(new ManifoldSolidBrep("Component", shell))
+}
+
+function createSceneMeshSolid(
+  repo: Repository,
+  box: SceneBox,
+): Ref<ManifoldSolidBrep> {
+  const faces = box.mesh!.triangles!.map((triangle) => {
+    const vertices = triangle.vertices.map((vertex) => {
+      const rotated = rotatePoint3(vertex, box.rotation)
+      const translated = {
+        x: rotated.x + box.center.x,
+        y: rotated.z + box.center.z,
+        z: rotated.y + box.center.y,
+      }
+      return createVertex(repo, translated)
+    })
+
+    return createFaceFromVertices(repo, vertices)
+  })
+
+  const shell = repo.add(new ClosedShell("", faces))
+  return repo.add(new ManifoldSolidBrep("Component", shell))
+}

package/lib/scene-geometry.ts

@@ -0,0 +1,58 @@
+export type Point3 = { x: number; y: number; z: number }
+
+export type Rotation3 = { x: number; y: number; z: number }
+
+export type Triangle = {
+  vertices: [Point3, Point3, Point3]
+  normal: Point3
+}
+
+export type BoundingBox = {
+  min: Point3
+  max: Point3
+}
+
+export type SceneBox = {
+  center: Point3
+  size: Point3
+  rotation?: Rotation3
+  mesh?: {
+    boundingBox: BoundingBox
+    triangles?: Triangle[]
+  }
+}
+
+export function rotatePoint3(point: Point3, rotation?: Rotation3): Point3 {
+  if (!rotation) return point
+
+  let { x, y, z } = point
+
+  if (rotation.x) {
+    const cos = Math.cos(rotation.x)
+    const sin = Math.sin(rotation.x)
+    const nextY = y * cos - z * sin
+    const nextZ = y * sin + z * cos
+    y = nextY
+    z = nextZ
+  }
+
+  if (rotation.y) {
+    const cos = Math.cos(rotation.y)
+    const sin = Math.sin(rotation.y)
+    const nextX = x * cos + z * sin
+    const nextZ = -x * sin + z * cos
+    x = nextX
+    z = nextZ
+  }
+
+  if (rotation.z) {
+    const cos = Math.cos(rotation.z)
+    const sin = Math.sin(rotation.z)
+    const nextX = x * cos - y * sin
+    const nextY = x * sin + y * cos
+    x = nextX
+    y = nextY
+  }
+
+  return { x, y, z }
+}

package/lib/step-brep-utils.ts

@@ -0,0 +1,118 @@
+import type { Ref, Repository } from "stepts"
+import {
+  AdvancedFace,
+  Axis2Placement3D,
+  CartesianPoint,
+  Direction,
+  EdgeCurve,
+  EdgeLoop,
+  FaceOuterBound,
+  Line,
+  OrientedEdge,
+  Plane,
+  Vector,
+  VertexPoint,
+} from "stepts"
+import type { Point3 } from "./scene-geometry"
+
+export function createVertex(
+  repo: Repository,
+  point: Point3,
+): Ref<VertexPoint> {
+  return repo.add(
+    new VertexPoint(
+      "",
+      repo.add(new CartesianPoint("", point.x, point.y, point.z)),
+    ),
+  )
+}
+
+function createEdge(
+  repo: Repository,
+  vStart: Ref<VertexPoint>,
+  vEnd: Ref<VertexPoint>,
+): Ref<EdgeCurve> {
+  const pStart = vStart.resolve(repo).pnt.resolve(repo)
+  const pEnd = vEnd.resolve(repo).pnt.resolve(repo)
+  const dx = pEnd.x - pStart.x
+  const dy = pEnd.y - pStart.y
+  const dz = pEnd.z - pStart.z
+  const length = Math.sqrt(dx * dx + dy * dy + dz * dz)
+
+  if (length < 1e-10) {
+    const dir = repo.add(new Direction("", 1, 0, 0))
+    const vec = repo.add(new Vector("", dir, 1e-10))
+    const line = repo.add(new Line("", vStart.resolve(repo).pnt, vec))
+    return repo.add(new EdgeCurve("", vStart, vEnd, line, true))
+  }
+
+  const dir = repo.add(new Direction("", dx / length, dy / length, dz / length))
+  const vec = repo.add(new Vector("", dir, length))
+  const line = repo.add(new Line("", vStart.resolve(repo).pnt, vec))
+  return repo.add(new EdgeCurve("", vStart, vEnd, line, true))
+}
+
+export function createFaceFromVertices(
+  repo: Repository,
+  vertices: Ref<VertexPoint>[],
+): Ref<AdvancedFace> {
+  const edges = vertices.map((vertex, index) =>
+    createEdge(repo, vertex, vertices[(index + 1) % vertices.length]!),
+  )
+
+  const edgeLoop = repo.add(
+    new EdgeLoop(
+      "",
+      edges.map((edge) => repo.add(new OrientedEdge("", edge, true))),
+    ),
+  )
+
+  const p1 = vertices[0]!.resolve(repo).pnt.resolve(repo)
+  const p2 = vertices[1]!.resolve(repo).pnt.resolve(repo)
+  const p3 = vertices[2]!.resolve(repo).pnt.resolve(repo)
+
+  const ux = p2.x - p1.x
+  const uy = p2.y - p1.y
+  const uz = p2.z - p1.z
+  const vx = p3.x - p1.x
+  const vy = p3.y - p1.y
+  const vz = p3.z - p1.z
+
+  const nx = uy * vz - uz * vy
+  const ny = uz * vx - ux * vz
+  const nz = ux * vy - uy * vx
+  const normalLength = Math.sqrt(nx * nx + ny * ny + nz * nz)
+  const normal =
+    normalLength < 1e-10
+      ? repo.add(new Direction("", 0, 0, 1))
+      : repo.add(
+          new Direction(
+            "",
+            nx / normalLength,
+            ny / normalLength,
+            nz / normalLength,
+          ),
+        )
+
+  const refLength = Math.sqrt(ux * ux + uy * uy + uz * uz)
+  const refDir =
+    refLength < 1e-10
+      ? repo.add(new Direction("", 1, 0, 0))
+      : repo.add(
+          new Direction("", ux / refLength, uy / refLength, uz / refLength),
+        )
+
+  const placement = repo.add(
+    new Axis2Placement3D("", vertices[0]!.resolve(repo).pnt, normal, refDir),
+  )
+  const plane = repo.add(new Plane("", placement))
+
+  return repo.add(
+    new AdvancedFace(
+      "",
+      [repo.add(new FaceOuterBound("", edgeLoop, true))],
+      plane,
+      true,
+    ),
+  )
+}

package/lib/step-model-merger.ts

@@ -203,20 +203,20 @@ function adjustTransformForPlacement(
 
   if (isThroughHoleComponent) {
     // Place model's z=0 at board top surface.
-    // For through-hole components, the flange should always sit at board top (z=boardThickness),
+    // For through-hole components, the flange should always sit at board top (z=boardThickness/2),
     // regardless of position.z from circuit JSON (which may include absolute coordinates or offsets
     // that shouldn't affect the flange placement).
-    transform.translation.z = boardThickness
+    transform.translation.z = boardThickness / 2
   }
 
   if (!isThroughHoleComponent && boardThickness > 0) {
     const halfThickness = boardThickness / 2
-    const offsetZ = targetZ - halfThickness
+    const offsetZ = targetZ
     if (normalizedLayer === "bottom") {
       transform.translation.z = -maxZ + offsetZ
       transform.rotation.x = normalizeDegrees(transform.rotation.x + 180)
     } else {
-      transform.translation.z = boardThickness - minZ + offsetZ
+      transform.translation.z = halfThickness - minZ + offsetZ
     }
   } else if (!isThroughHoleComponent) {
     // Only apply center-based Z for non-through-hole components without board thickness

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "circuit-json-to-step",
   "main": "dist/index.js",
-  "version": "0.0.21",
+  "version": "0.0.23",
   "type": "module",
   "scripts": {
     "pull-reference": "git clone https://github.com/tscircuit/circuit-json.git && find circuit-json/tests -name '*.test.ts' -exec bash -c 'mv \"$0\" \"${0%.test.ts}.ts\"' {} \\; && git clone https://github.com/tscircuit/stepts.git && find stepts/tests -name '*.test.ts' -exec bash -c 'mv \"$0\" \"${0%.test.ts}.ts\"' {} \\;",
@@ -31,9 +31,9 @@
   },
   "dependencies": {
     "circuit-json-to-connectivity-map": "^0.0.22",
-    "circuit-json-to-gltf": "^0.0.91",
+    "circuit-json-to-gltf": "^0.0.93",
     "circuit-to-svg": "^0.0.327",
     "schematic-symbols": "^0.0.202",
-    "stepts": "^0.0.3"
+    "stepts": "^0.0.4"
   }
 }

package/test/basics/basics06/basics06.json

@@ -5,7 +5,10 @@
     "width": 12,
     "height": 8,
     "thickness": 1.6,
-    "center": { "x": 6, "y": 4 }
+    "center": {
+      "x": 6,
+      "y": 4
+    }
   },
   {
     "type": "pcb_hole",
@@ -26,7 +29,10 @@
     "type": "pcb_component",
     "pcb_component_id": "pcb_component_1",
     "source_component_id": "source_component_1",
-    "center": { "x": 4, "y": 4 },
+    "center": {
+      "x": 4,
+      "y": 4
+    },
     "width": 1.6,
     "height": 0.8,
     "layer": "top",
@@ -37,8 +43,16 @@
     "cad_component_id": "cad_component_1",
     "pcb_component_id": "pcb_component_1",
     "source_component_id": "source_component_1",
-    "position": { "x": 4, "y": 4, "z": 1.6 },
-    "rotation": { "x": 0, "y": 0, "z": 0 },
+    "position": {
+      "x": 4,
+      "y": 4,
+      "z": 0
+    },
+    "rotation": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
     "model_step_url": "test/fixtures/kicad-models/R_0603_1608Metric.step"
   },
   {
@@ -52,7 +66,10 @@
     "type": "pcb_component",
     "pcb_component_id": "pcb_component_2",
     "source_component_id": "source_component_2",
-    "center": { "x": 9, "y": 4 },
+    "center": {
+      "x": 9,
+      "y": 4
+    },
     "width": 4.2,
     "height": 2.8,
     "layer": "top",
@@ -63,8 +80,16 @@
     "cad_component_id": "cad_component_2",
     "pcb_component_id": "pcb_component_2",
     "source_component_id": "source_component_2",
-    "position": { "x": 9, "y": 4, "z": 1.6 },
-    "rotation": { "x": 0, "y": 0, "z": 0 },
+    "position": {
+      "x": 9,
+      "y": 4,
+      "z": 0
+    },
+    "rotation": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
     "model_step_url": "test/fixtures/kicad-models/SW_Push_1P1T_NO_CK_KMR2.step"
   }
 ]