lbrnts 0.0.15 → 0.0.17

package/dist/index.d.ts

@@ -93,7 +93,7 @@ interface CutSettingInit {
     lineAngle?: number;
     crossHatch?: boolean;
     frequency?: number;
-    pulseWidth?: number;
+    qPulseWidth?: number;
 }
 declare class CutSetting extends LightBurnBaseElement {
     private _type;
@@ -120,7 +120,7 @@ declare class CutSetting extends LightBurnBaseElement {
     private _lineAngle?;
     private _crossHatch?;
     private _frequency?;
-    private _pulseWidth?;
+    private _qPulseWidth?;
     constructor(init?: CutSettingInit);
     get type(): string;
     set type(value: string);
@@ -170,8 +170,8 @@ declare class CutSetting extends LightBurnBaseElement {
     set crossHatch(value: boolean | undefined);
     get frequency(): number | undefined;
     set frequency(value: number | undefined);
-    get pulseWidth(): number | undefined;
-    set pulseWidth(value: number | undefined);
+    get qPulseWidth(): number | undefined;
+    set qPulseWidth(value: number | undefined);
     getXmlAttributes(): Record<string, string | number | boolean | undefined>;
     getChildren(): LightBurnBaseElement[];
     static fromXmlJson(node: XmlJsonElement): CutSetting;

package/dist/index.js

@@ -295,7 +295,7 @@ var CutSetting = class _CutSetting extends LightBurnBaseElement {
   _lineAngle;
   _crossHatch;
   _frequency;
-  _pulseWidth;
+  _qPulseWidth;
   constructor(init) {
     super();
     this.token = "CutSetting";
@@ -326,7 +326,7 @@ var CutSetting = class _CutSetting extends LightBurnBaseElement {
       if (init.lineAngle !== void 0) this._lineAngle = init.lineAngle;
       if (init.crossHatch !== void 0) this._crossHatch = init.crossHatch;
       if (init.frequency !== void 0) this._frequency = init.frequency;
-      if (init.pulseWidth !== void 0) this._pulseWidth = init.pulseWidth;
+      if (init.qPulseWidth !== void 0) this._qPulseWidth = init.qPulseWidth;
     }
   }
   get type() {
@@ -473,11 +473,11 @@ var CutSetting = class _CutSetting extends LightBurnBaseElement {
   set frequency(value) {
     this._frequency = value;
   }
-  get pulseWidth() {
-    return this._pulseWidth;
+  get qPulseWidth() {
+    return this._qPulseWidth;
   }
-  set pulseWidth(value) {
-    this._pulseWidth = value;
+  set qPulseWidth(value) {
+    this._qPulseWidth = value;
   }
   getXmlAttributes() {
     return {
@@ -510,7 +510,7 @@ var CutSetting = class _CutSetting extends LightBurnBaseElement {
       "lineAngle",
       "crossHatch",
       "frequency",
-      "pulseWidth"
+      "qPulseWidth"
     ];
     for (const prop of props) {
       const value = this[`_${prop}`];
@@ -552,7 +552,7 @@ var CutSetting = class _CutSetting extends LightBurnBaseElement {
     cs.lineAngle = num(getChildValue("lineAngle"), void 0);
     cs.crossHatch = boolish(getChildValue("crossHatch"), void 0);
     cs.frequency = num(getChildValue("frequency"), void 0);
-    cs.pulseWidth = num(getChildValue("pulseWidth"), void 0);
+    cs.qPulseWidth = num(getChildValue("QPulseWidth"), void 0);
     return cs;
   }
 };
@@ -579,7 +579,8 @@ var CutSettingPropertyElement = class extends LightBurnBaseElement {
   }
   toXml(indent = 0) {
     const indentStr = "    ".repeat(indent);
-    return `${indentStr}<${this.propName} Value="${this.formatValue(this.propValue)}"/>`;
+    const tagName = this.propName === "qPulseWidth" ? "QPulseWidth" : this.propName;
+    return `${indentStr}<${tagName} Value="${this.formatValue(this.propValue)}"/>`;
   }
 };
 LightBurnBaseElement.register("CutSetting", CutSetting);
@@ -1255,7 +1256,39 @@ LightBurnBaseElement.register("Shape.Bitmap", ShapeBitmap);
 import { stringify } from "svgson";
 
 // lib/svg-gen/assemble.ts
-function assembleSvg(children, layout) {
+function assembleSvg(children, layout, defs) {
+  const svgChildren = [];
+  if (defs && defs.length > 0) {
+    svgChildren.push({
+      name: "defs",
+      type: "element",
+      value: "",
+      attributes: {},
+      children: defs
+    });
+  }
+  svgChildren.push({
+    name: "rect",
+    type: "element",
+    value: "",
+    attributes: {
+      x: String(layout.bg.x),
+      y: String(layout.bg.y),
+      width: String(layout.bg.width),
+      height: String(layout.bg.height),
+      fill: "white"
+    },
+    children: []
+  });
+  svgChildren.push({
+    name: "g",
+    type: "element",
+    value: "",
+    attributes: {
+      transform: `matrix(1 0 0 -1 0 ${layout.flipY})`
+    },
+    children
+  });
   return {
     name: "svg",
     type: "element",
@@ -1267,30 +1300,7 @@ function assembleSvg(children, layout) {
       viewBox: layout.viewBox,
       style: "background-color: white;"
     },
-    children: [
-      {
-        name: "rect",
-        type: "element",
-        value: "",
-        attributes: {
-          x: String(layout.bg.x),
-          y: String(layout.bg.y),
-          width: String(layout.bg.width),
-          height: String(layout.bg.height),
-          fill: "white"
-        },
-        children: []
-      },
-      {
-        name: "g",
-        type: "element",
-        value: "",
-        attributes: {
-          transform: `matrix(1 0 0 -1 0 ${layout.flipY})`
-        },
-        children
-      }
-    ]
+    children: svgChildren
   };
 }
 
@@ -1334,6 +1344,104 @@ function collectCutSettings(root) {
   return settings;
 }
 
+// lib/svg-gen/node-helpers.ts
+var g = (attrs, children = []) => ({
+  name: "g",
+  type: "element",
+  value: "",
+  attributes: attrs,
+  children
+});
+var leaf = (name, attrs) => ({
+  name,
+  type: "element",
+  value: "",
+  attributes: attrs,
+  children: []
+});
+var textNode = (value) => ({
+  name: "",
+  type: "text",
+  value,
+  attributes: {},
+  children: []
+});
+
+// lib/svg-gen/fill-patterns.ts
+function generatePatternId(params) {
+  const opacity = params.opacity ?? 0.8;
+  const safeColor = encodeURIComponent(params.color).replace(
+    /[^a-zA-Z0-9]/g,
+    "_"
+  );
+  return `hatch-${params.interval.toFixed(4)}-${params.angleDeg}-${params.crossHatch}-${safeColor}-${params.strokeWidth.toFixed(4)}-${opacity.toFixed(2)}`;
+}
+function createHatchPattern(params) {
+  const { interval, angleDeg, crossHatch, color, strokeWidth } = params;
+  const opacity = params.opacity ?? 0.8;
+  const id = generatePatternId(params);
+  let d = `M ${-interval} 0 L ${interval} 0`;
+  if (crossHatch) {
+    d += ` M 0 ${-interval} L 0 ${interval}`;
+  }
+  return {
+    name: "pattern",
+    type: "element",
+    value: "",
+    attributes: {
+      id,
+      patternUnits: "userSpaceOnUse",
+      width: String(interval),
+      height: String(interval),
+      patternTransform: `rotate(${angleDeg})`
+    },
+    children: [
+      leaf("path", {
+        d,
+        stroke: color,
+        "stroke-width": String(strokeWidth),
+        "stroke-opacity": String(opacity)
+      })
+    ]
+  };
+}
+var HatchPatternRegistry = class {
+  patterns = /* @__PURE__ */ new Map();
+  /**
+   * Get or create a pattern for the given parameters.
+   * @returns The pattern ID to use in fill="url(#id)"
+   */
+  getOrCreate(params) {
+    const id = generatePatternId(params);
+    if (!this.patterns.has(id)) {
+      this.patterns.set(id, createHatchPattern(params));
+    }
+    return id;
+  }
+  /**
+   * Get all registered patterns for the <defs> section.
+   */
+  getPatterns() {
+    return Array.from(this.patterns.values());
+  }
+  /**
+   * Check if any patterns have been registered.
+   */
+  hasPatterns() {
+    return this.patterns.size > 0;
+  }
+};
+function fillSettingsToPatternParams(settings, color, strokeWidth, opacity) {
+  return {
+    interval: settings.interval,
+    angleDeg: settings.angle,
+    crossHatch: settings.crossHatch,
+    color,
+    strokeWidth,
+    opacity
+  };
+}
+
 // lib/svg-gen/options.ts
 var DEFAULT_OPTIONS = {
   margin: 10,
@@ -1415,29 +1523,6 @@ function addPts(bb, pts) {
   return bb;
 }
 
-// lib/svg-gen/node-helpers.ts
-var g = (attrs, children = []) => ({
-  name: "g",
-  type: "element",
-  value: "",
-  attributes: attrs,
-  children
-});
-var leaf = (name, attrs) => ({
-  name,
-  type: "element",
-  value: "",
-  attributes: attrs,
-  children: []
-});
-var textNode = (value) => ({
-  name: "",
-  type: "text",
-  value,
-  attributes: {},
-  children: []
-});
-
 // lib/svg-gen/registry/shape-bitmap.ts
 var bitmapRenderer = {
   match: (s) => s instanceof ShapeBitmap,
@@ -1474,124 +1559,6 @@ var bitmapRenderer = {
   }
 };
 
-// lib/svg-gen/fill-patterns.ts
-function generateScanLines(bbox, settings, color, strokeWidth) {
-  const lines = [];
-  const angleRad = settings.angle * Math.PI / 180;
-  const primaryLines = generateLinesAtAngle(
-    bbox,
-    settings.interval,
-    angleRad,
-    color,
-    strokeWidth
-  );
-  lines.push(...primaryLines);
-  if (settings.crossHatch) {
-    const perpAngle = angleRad + Math.PI / 2;
-    const crossLines = generateLinesAtAngle(
-      bbox,
-      settings.interval,
-      perpAngle,
-      color,
-      strokeWidth
-    );
-    lines.push(...crossLines);
-  }
-  return lines;
-}
-function generateLinesAtAngle(bbox, interval, angle, color, strokeWidth) {
-  const lines = [];
-  const diagonal = Math.sqrt(
-    Math.pow(bbox.maxX - bbox.minX, 2) + Math.pow(bbox.maxY - bbox.minY, 2)
-  );
-  const dx = Math.cos(angle);
-  const dy = Math.sin(angle);
-  const px = -Math.sin(angle);
-  const py = Math.cos(angle);
-  const cx = (bbox.minX + bbox.maxX) / 2;
-  const cy = (bbox.minY + bbox.maxY) / 2;
-  const numLines = Math.ceil(diagonal / interval) + 2;
-  for (let i = -numLines / 2; i <= numLines / 2; i++) {
-    const offset = i * interval;
-    const startX = cx + px * offset - dx * diagonal;
-    const startY = cy + py * offset - dy * diagonal;
-    const endX = cx + px * offset + dx * diagonal;
-    const endY = cy + py * offset + dy * diagonal;
-    const clipped = clipLineToBBox(
-      startX,
-      startY,
-      endX,
-      endY,
-      bbox.minX,
-      bbox.minY,
-      bbox.maxX,
-      bbox.maxY
-    );
-    if (clipped) {
-      lines.push(
-        leaf("line", {
-          x1: String(clipped.x1),
-          y1: String(clipped.y1),
-          x2: String(clipped.x2),
-          y2: String(clipped.y2),
-          stroke: color,
-          "stroke-width": String(strokeWidth),
-          "stroke-opacity": "0.8"
-        })
-      );
-    }
-  }
-  return lines;
-}
-function clipLineToBBox(x1, y1, x2, y2, minX, minY, maxX, maxY) {
-  const INSIDE = 0;
-  const LEFT = 1;
-  const RIGHT = 2;
-  const BOTTOM = 4;
-  const TOP = 8;
-  function computeOutCode(x, y) {
-    let code = INSIDE;
-    if (x < minX) code |= LEFT;
-    else if (x > maxX) code |= RIGHT;
-    if (y < minY) code |= BOTTOM;
-    else if (y > maxY) code |= TOP;
-    return code;
-  }
-  let outcode1 = computeOutCode(x1, y1);
-  let outcode2 = computeOutCode(x2, y2);
-  while (true) {
-    if (!(outcode1 | outcode2)) {
-      return { x1, y1, x2, y2 };
-    } else if (outcode1 & outcode2) {
-      return null;
-    }
-    const outcodeOut = outcode1 ? outcode1 : outcode2;
-    let x, y;
-    if (outcodeOut & TOP) {
-      x = x1 + (x2 - x1) * (maxY - y1) / (y2 - y1);
-      y = maxY;
-    } else if (outcodeOut & BOTTOM) {
-      x = x1 + (x2 - x1) * (minY - y1) / (y2 - y1);
-      y = minY;
-    } else if (outcodeOut & RIGHT) {
-      y = y1 + (y2 - y1) * (maxX - x1) / (x2 - x1);
-      x = maxX;
-    } else {
-      y = y1 + (y2 - y1) * (minX - x1) / (x2 - x1);
-      x = minX;
-    }
-    if (outcodeOut === outcode1) {
-      x1 = x;
-      y1 = y;
-      outcode1 = computeOutCode(x1, y1);
-    } else {
-      x2 = x;
-      y2 = y;
-      outcode2 = computeOutCode(x2, y2);
-    }
-  }
-}
-
 // lib/svg-gen/palette.ts
 var LIGHTBURN_COLORS = {
   0: "#000000",
@@ -1678,26 +1645,31 @@ var ellipseRenderer = {
     const cutSetting = el.cutIndex !== void 0 ? cutSettings.get(el.cutIndex) : void 0;
     const shouldShowFill = cutSetting && (cutSetting.type === "Scan" || cutSetting.type === "Scan+Cut");
     if (shouldShowFill && cutSetting) {
-      const localBBox = {
-        minX: -rx,
-        minY: -ry,
-        maxX: rx,
-        maxY: ry
-      };
       const fillSettings = {
         interval: cutSetting.interval || 0.1,
         angle: cutSetting.angle || 0,
         crossHatch: cutSetting.crossHatch || false
       };
-      const fillLines = generateScanLines(
-        localBBox,
-        fillSettings,
-        stroke,
-        options.strokeWidth
+      const patternId = options.patternRegistry.getOrCreate(
+        fillSettingsToPatternParams(fillSettings, stroke, options.strokeWidth)
       );
-      children.push(...fillLines);
+      const fillChild = rx === ry ? leaf("circle", {
+        cx: "0",
+        cy: "0",
+        r: String(rx),
+        fill: `url(#${patternId})`,
+        stroke: "none"
+      }) : leaf("ellipse", {
+        cx: "0",
+        cy: "0",
+        rx: String(rx),
+        ry: String(ry),
+        fill: `url(#${patternId})`,
+        stroke: "none"
+      });
+      children.push(fillChild);
     }
-    const child = rx === ry ? leaf("circle", {
+    const outlineChild = rx === ry ? leaf("circle", {
       cx: "0",
       cy: "0",
       r: String(rx),
@@ -1711,7 +1683,7 @@ var ellipseRenderer = {
       fill: "none",
       stroke
     });
-    children.push(child);
+    children.push(outlineChild);
     return g({ transform }, children);
   }
 };
@@ -1931,44 +1903,26 @@ var groupRenderer = {
         const cutSetting = cutIndex !== void 0 ? cutSettings.get(cutIndex) : void 0;
         const shouldShowFill = cutSetting && (cutSetting.type === "Scan" || cutSetting.type === "Scan+Cut");
         if (shouldShowFill && cutSetting) {
-          const bbox = shapeChildren.reduce(
-            (bb, c) => boxUnion(bb, bboxOfShape(c)),
-            emptyBox()
-          );
           const fillSettings = {
             interval: cutSetting.interval || 0.1,
             angle: cutSetting.angle || 0,
             crossHatch: cutSetting.crossHatch || false
           };
-          const fillLines = generateScanLines(
-            bbox,
-            fillSettings,
-            stroke,
-            options.strokeWidth
+          const patternId = options.patternRegistry.getOrCreate(
+            fillSettingsToPatternParams(
+              fillSettings,
+              stroke,
+              options.strokeWidth
+            )
+          );
+          children2.push(
+            leaf("path", {
+              d: combinedPathData,
+              fill: `url(#${patternId})`,
+              "fill-rule": "nonzero",
+              stroke: "none"
+            })
           );
-          const clipId = `clip-${Date.now()}-${Math.random().toString(36).slice(2, 11)}`;
-          const clipPath = {
-            name: "clipPath",
-            type: "element",
-            value: "",
-            attributes: { id: clipId },
-            children: [
-              leaf("path", {
-                d: combinedPathData,
-                "fill-rule": "nonzero",
-                "clip-rule": "nonzero"
-              })
-            ]
-          };
-          const clippedGroup = {
-            name: "g",
-            type: "element",
-            value: "",
-            attributes: { "clip-path": `url(#${clipId})` },
-            children: fillLines
-          };
-          children2.push(clipPath);
-          children2.push(clippedGroup);
         }
         children2.push(
           leaf("path", {
@@ -2026,38 +1980,22 @@ var pathRenderer = {
     const cutSetting = p.cutIndex !== void 0 ? cutSettings.get(p.cutIndex) : void 0;
     const shouldShowFill = p.isClosed && cutSetting && (cutSetting.type === "Scan" || cutSetting.type === "Scan+Cut");
     if (shouldShowFill && cutSetting) {
-      const bbox = addPts(
-        emptyBox(),
-        p.verts.map((v) => ({ x: v.x, y: v.y }))
-      );
       const fillSettings = {
         interval: cutSetting.interval || 0.1,
         angle: cutSetting.angle || 0,
         crossHatch: cutSetting.crossHatch || false
       };
-      const fillLines = generateScanLines(
-        bbox,
-        fillSettings,
-        stroke,
-        options.strokeWidth
+      const patternId = options.patternRegistry.getOrCreate(
+        fillSettingsToPatternParams(fillSettings, stroke, options.strokeWidth)
+      );
+      children.push(
+        leaf("path", {
+          d,
+          fill: `url(#${patternId})`,
+          "fill-rule": "nonzero",
+          stroke: "none"
+        })
       );
-      const clipId = `clip-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
-      const clipPath = {
-        name: "clipPath",
-        type: "element",
-        value: "",
-        attributes: { id: clipId },
-        children: [leaf("path", { d })]
-      };
-      const clippedGroup = {
-        name: "g",
-        type: "element",
-        value: "",
-        attributes: { "clip-path": `url(#${clipId})` },
-        children: fillLines
-      };
-      children.push(clipPath);
-      children.push(clippedGroup);
     }
     children.push(
       leaf("path", {
@@ -2102,24 +2040,26 @@ var rectRenderer = {
     const cutSetting = rect.cutIndex !== void 0 ? cutSettings.get(rect.cutIndex) : void 0;
     const shouldShowFill = cutSetting && (cutSetting.type === "Scan" || cutSetting.type === "Scan+Cut");
     if (shouldShowFill && cutSetting) {
-      const localBBox = {
-        minX: 0,
-        minY: 0,
-        maxX: w,
-        maxY: h
-      };
       const fillSettings = {
         interval: cutSetting.interval || 0.1,
         angle: cutSetting.angle || 0,
         crossHatch: cutSetting.crossHatch || false
       };
-      const fillLines = generateScanLines(
-        localBBox,
-        fillSettings,
-        stroke,
-        options.strokeWidth
+      const patternId = options.patternRegistry.getOrCreate(
+        fillSettingsToPatternParams(fillSettings, stroke, options.strokeWidth)
+      );
+      children.push(
+        leaf("rect", {
+          x: "0",
+          y: "0",
+          width: String(w),
+          height: String(h),
+          rx: String(cr),
+          ry: String(cr),
+          fill: `url(#${patternId})`,
+          stroke: "none"
+        })
       );
-      children.push(...fillLines);
     }
     children.push(
       leaf("rect", {
@@ -2193,11 +2133,8 @@ function svgForShape(shape, cutSettings, options) {
 function measure(shapes) {
   return shapes.reduce((acc, s) => boxUnion(acc, bboxOfShape(s)), emptyBox());
 }
-function renderAll(shapes, cutSettings, svgOptions) {
-  const renderOptions = {
-    strokeWidth: svgOptions?.defaultStrokeWidth ?? DEFAULT_OPTIONS.defaultStrokeWidth
-  };
-  return shapes.map((s) => svgForShape(s, cutSettings, renderOptions));
+function renderAll(shapes, cutSettings, options) {
+  return shapes.map((s) => svgForShape(s, cutSettings, options));
 }
 
 // lib/svg-gen/index.ts
@@ -2206,8 +2143,14 @@ function generateLightBurnSvg(root, options) {
   const cutSettings = collectCutSettings(root);
   const bbox = measure(shapes);
   const layout = computeLayout(bbox, options);
-  const nodes = renderAll(shapes, cutSettings, options);
-  const svgTree = assembleSvg(nodes, layout);
+  const patternRegistry = new HatchPatternRegistry();
+  const renderOptions = {
+    strokeWidth: options?.defaultStrokeWidth ?? DEFAULT_OPTIONS.defaultStrokeWidth,
+    patternRegistry
+  };
+  const nodes = renderAll(shapes, cutSettings, renderOptions);
+  const defs = patternRegistry.getPatterns();
+  const svgTree = assembleSvg(nodes, layout, defs);
   return stringify(svgTree);
 }
 export {

package/package.json

@@ -2,7 +2,7 @@
   "name": "lbrnts",
   "main": "dist/index.js",
   "type": "module",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "files": [
     "dist"
   ],