altium-toolkit 0.1.22 → 1.0.1

package/src/ui/PcbScene3dBuilder.mjs

@@ -3,6 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import { PcbEdgeFacingGlyphNormalizer } from './PcbEdgeFacingGlyphNormalizer.mjs'
+import { PcbScene3dBoardOutlineRefiner } from './PcbScene3dBoardOutlineRefiner.mjs'
 import { PcbScene3dDrillCutoutBuilder } from './PcbScene3dDrillCutoutBuilder.mjs'
 import { PcbFootprintPrimitiveSelector } from './PcbFootprintPrimitiveSelector.mjs'
 import { PcbScene3dPackages } from './PcbScene3dPackages.mjs'
@@ -99,7 +100,7 @@ export class PcbScene3dBuilder {
             appearance3d
         )
 
-        return {
+        const sceneDescription = {
             sourceFormat: 'altium',
             board,
             components: components.map((component) =>
@@ -139,6 +140,11 @@ export class PcbScene3dBuilder {
                 }
             }
         }
+
+        return PcbScene3dBoardOutlineRefiner.refine(
+            sceneDescription,
+            documentModel
+        )
     }
 
     /**
@@ -729,6 +735,11 @@ export class PcbScene3dBuilder {
             boardOutline
         )
 
+        const drillCutouts = PcbScene3dDrillCutoutBuilder.buildCutouts(
+            pads,
+            vias
+        )
+
         return {
             ...normalized,
             denseOverlayArtwork,
@@ -743,11 +754,11 @@ export class PcbScene3dBuilder {
                 side
             ),
             tracks: normalized.tracks,
-            fills: PcbScene3dDrillCutoutBuilder.clipFills(
+            fills: PcbScene3dDrillCutoutBuilder.clipFillsWithCutouts(
                 fillsWithRegions,
-                pads,
-                vias
-            )
+                drillCutouts
+            ),
+            drillCutouts: drillCutouts.map((cutout) => cutout.points)
         }
     }
 

package/src/ui/PcbScene3dDrillCutoutBuilder.mjs

@@ -10,6 +10,19 @@ export class PcbScene3dDrillCutoutBuilder {
     static #SLOT_CAP_SEGMENTS = 12
     static #EPSILON = 0.001
 
+    /**
+     * Builds all known drill cutout contours.
+     * @param {{ x?: number, y?: number, holeDiameter?: number, drillDiameter?: number, holeSlotLength?: number, slotLength?: number, rotation?: number, holeRotation?: number }[]} pads
+     * @param {{ x?: number, y?: number, holeDiameter?: number, drillDiameter?: number }[]} vias
+     * @returns {{ x: number, y: number, bounds: { minX: number, minY: number, maxX: number, maxY: number }, points: { x: number, y: number }[] }[]}
+     */
+    static buildCutouts(pads, vias) {
+        return [
+            ...PcbScene3dDrillCutoutBuilder.#buildPadCutouts(pads),
+            ...PcbScene3dDrillCutoutBuilder.#buildViaCutouts(vias)
+        ]
+    }
+
     /**
      * Adds drill-shaped holes to every fill intersected by a pad or via drill.
      * @param {{ points?: { x: number, y: number }[], holes?: { x: number, y: number }[][], x1?: number, y1?: number, x2?: number, y2?: number }[]} fills
@@ -18,9 +31,20 @@ export class PcbScene3dDrillCutoutBuilder {
      * @returns {{ points?: { x: number, y: number }[], holes?: { x: number, y: number }[][], x1?: number, y1?: number, x2?: number, y2?: number }[]}
      */
     static clipFills(fills, pads, vias) {
-        const cutouts = PcbScene3dDrillCutoutBuilder.#buildCutouts(pads, vias)
+        return PcbScene3dDrillCutoutBuilder.clipFillsWithCutouts(
+            fills,
+            PcbScene3dDrillCutoutBuilder.buildCutouts(pads, vias)
+        )
+    }
 
-        if (!cutouts.length) {
+    /**
+     * Adds drill-shaped holes from precomputed cutouts.
+     * @param {{ points?: { x: number, y: number }[], holes?: { x: number, y: number }[][], x1?: number, y1?: number, x2?: number, y2?: number }[]} fills
+     * @param {{ x: number, y: number, bounds: { minX: number, minY: number, maxX: number, maxY: number }, points: { x: number, y: number }[] }[]} cutouts
+     * @returns {{ points?: { x: number, y: number }[], holes?: { x: number, y: number }[][], x1?: number, y1?: number, x2?: number, y2?: number }[]}
+     */
+    static clipFillsWithCutouts(fills, cutouts) {
+        if (!Array.isArray(cutouts) || !cutouts.length) {
             return fills
         }
 
@@ -48,19 +72,6 @@ export class PcbScene3dDrillCutoutBuilder {
         })
     }
 
-    /**
-     * Builds all known drill cutout contours.
-     * @param {{ x?: number, y?: number, holeDiameter?: number, drillDiameter?: number, holeSlotLength?: number, slotLength?: number, rotation?: number, holeRotation?: number }[]} pads
-     * @param {{ x?: number, y?: number, holeDiameter?: number, drillDiameter?: number }[]} vias
-     * @returns {{ x: number, y: number, bounds: { minX: number, minY: number, maxX: number, maxY: number }, points: { x: number, y: number }[] }[]}
-     */
-    static #buildCutouts(pads, vias) {
-        return [
-            ...PcbScene3dDrillCutoutBuilder.#buildPadCutouts(pads),
-            ...PcbScene3dDrillCutoutBuilder.#buildViaCutouts(vias)
-        ]
-    }
-
     /**
      * Builds drill contours for drilled pads.
      * @param {{ x?: number, y?: number, holeDiameter?: number, drillDiameter?: number, holeSlotLength?: number, slotLength?: number, rotation?: number, holeRotation?: number }[]} pads