abstract-3d 2.7.30 → 2.7.33

package/src/renderers/dxf/dxf-encoding/dxf-dimension.ts

@@ -1,6 +1,13 @@
-import { dimensionMeshifyAlignedDimension, type Material, type Vec3, DimensionAligned, View, vec3RotCombine, vec3, vec3Cross } from "../../../abstract-3d.js";
+import { dimensionMeshifyAlignedDimension } from "../../../abstract-3d.js";
+import type { DimensionAligned, View, Material, Vec3 } from "../../../abstract-3d.js";
 import { type DxfColor, dxfColor } from "./dxf-color.js";
-import { DXF_BLOCK_RECORD_TABLE_HANDLE, DXF_MODEL_SPACE_HANDLE, dxfHandleNext, dxfRound, type Handle } from "./dxf-common.js";
+import {
+  DXF_BLOCK_RECORD_TABLE_HANDLE,
+  DXF_MODEL_SPACE_HANDLE,
+  dxfHandleNext,
+  dxfRound,
+  type Handle,
+} from "./dxf-common.js";
 import { dxfEncLine } from "./dxf-line.js";
 import { DxfMTextAttachment, dxfEncMText, encodeDxfFormattedText } from "./dxf-mtext.js";
 import { dxfEncSolidTriangle } from "./dxf-triangle.js";
@@ -26,8 +33,20 @@ export function dxfEncDimension(
   const blockName = `*D${blockRecordHandle}`;
   return {
     entity: dxfEncodeDimensionEntity(blockName, measurementStart, measurementEnd, linePosition, text, col, handleRef),
-    block: dxfEncodeDimensionBlock(blockName, blockRecordHandle, measurementStart, measurementEnd, linePosition, text, col, sceneRotation, viewRotation, views, handleRef),
-    blockRecord: dxfEncodeDimensionBlockRecord(blockName, blockRecordHandle)
+    block: dxfEncodeDimensionBlock(
+      blockName,
+      blockRecordHandle,
+      measurementStart,
+      measurementEnd,
+      linePosition,
+      text,
+      col,
+      sceneRotation,
+      viewRotation,
+      views,
+      handleRef
+    ),
+    blockRecord: dxfEncodeDimensionBlockRecord(blockName, blockRecordHandle),
   };
 }
 
@@ -88,10 +107,7 @@ ${dxfRound(measurementEnd.z)}
 `;
 }
 
-function dxfEncodeDimensionBlockRecord(
-  blockName: string,
-  blockRecordHandle: string,
-): string {
+function dxfEncodeDimensionBlockRecord(blockName: string, blockRecordHandle: string): string {
   return `0
 BLOCK_RECORD
 5
@@ -146,7 +162,18 @@ ${blockName}
 ${blockName}
 1
 
-${dxfEncodeDimensionGeometry(blockRecordHandle, measurementStart, measurementEnd, linePosition, text, col, sceneRotation, viewRotation, views, handleRef)}0
+${dxfEncodeDimensionGeometry(
+  blockRecordHandle,
+  measurementStart,
+  measurementEnd,
+  linePosition,
+  text,
+  col,
+  sceneRotation,
+  viewRotation,
+  views,
+  handleRef
+)}0
 ENDBLK
 5
 ${dxfHandleNext(handleRef)}
@@ -180,8 +207,25 @@ function dxfEncodeDimensionGeometry(
   const onCreateLine = (start: Vec3, end: Vec3, _norm: Vec3, _thickness: number, _mat: Material): void => {
     entities += dxfEncLine(start, end, col, handleRef, blockRecordHandle);
   };
-  const onCreateText = (pos: Vec3, measurement: string, fontSize: number, _mat: Material, _rot: Vec3, dir: Vec3, norm: Vec3): void => {
-    entities += dxfEncMText(pos, measurement, dir, norm, fontSize, handleRef, DxfMTextAttachment.MiddleCenter, blockRecordHandle);
+  const onCreateText = (
+    pos: Vec3,
+    measurement: string,
+    fontSize: number,
+    _mat: Material,
+    _rot: Vec3,
+    dir: Vec3,
+    norm: Vec3
+  ): void => {
+    entities += dxfEncMText(
+      pos,
+      measurement,
+      dir,
+      norm,
+      fontSize,
+      handleRef,
+      DxfMTextAttachment.MiddleCenter,
+      blockRecordHandle
+    );
   };
   const onCreatePolygon = (p1: Vec3, p2: Vec3, p3: Vec3, _mat: Material): void => {
     entities += dxfEncSolidTriangle(p1, p2, p3, col, handleRef, blockRecordHandle);
@@ -191,8 +235,8 @@ function dxfEncodeDimensionGeometry(
     measurementStart,
     measurementEnd,
     text,
-    views
+    views,
   };
   dimensionMeshifyAlignedDimension(dimension, sceneRotation, viewRotation, onCreateLine, onCreateText, onCreatePolygon);
   return entities;
-}
+}

package/src/renderers/dxf/dxf-encoding/dxf-footer.ts

@@ -1,6 +1,7 @@
+// oxlint-disable-next-line import/no-cycle -- both sides only call each other from function bodies
 import { DXF_MODEL_SPACE_HANDLE } from "./dxf-common.js";
 
-/* eslint-disable max-lines */
+/* oxlint-disable max-lines */
 export const dxfEncFooter = (blockId: string): string => `  0
 ENDBLK
 5
@@ -16648,4 +16649,4 @@ RTVSPost2010PropOp57
   0
 ENDSEC
   0
-EOF`;
+EOF`;

package/src/renderers/dxf/dxf-encoding/dxf-header.ts

@@ -1,11 +1,22 @@
-/* eslint-disable max-lines */
+/* oxlint-disable max-lines */
 import type { Bounds3, Vec3 } from "../../../abstract-3d.js";
+// oxlint-disable-next-line import/no-cycle -- both sides only call each other from function bodies
 import { DXF_BLOCK_RECORD_TABLE_HANDLE, DXF_MODEL_SPACE_HANDLE } from "./dxf-common.js";
 
 const DXF_MAKER = "DXF Generated from Divid Abstract 3D";
 const DXF_STANDARD = "AC1015";
 
-export const dxfEncHeader = (bounds: Bounds3, center: Vec3, blockId: string, size: Vec3, dimBlocks: string, dimBlockRecords: string, dimScale: number = 44.0, dimArrowSize: number = 1.0, dimTextHeight: number = 1.0): string =>
+export const dxfEncHeader = (
+  bounds: Bounds3,
+  center: Vec3,
+  blockId: string,
+  size: Vec3,
+  dimBlocks: string,
+  dimBlockRecords: string,
+  dimScale: number = 44.0,
+  dimArrowSize: number = 1.0,
+  dimTextHeight: number = 1.0
+): string =>
   ` 999
 ${DXF_MAKER}
 0
@@ -1093,7 +1104,7 @@ AcDbViewportTableRecord
  12
 ${-size.x / 2}
  22     
-${0}
+0
  13
 0.0
  23
@@ -1654,4 +1665,4 @@ ${blockId}
 ${blockId}
   1
 
-`;
+`;

package/src/renderers/dxf/dxf-encoding/dxf-line.ts

@@ -33,4 +33,4 @@ ${dxfRound(vecEnd.y)}
 31
 ${dxfRound(vecEnd.z)}
 `;
-}
+}

package/src/renderers/dxf/dxf-encoding/dxf-lwpolyline.ts

@@ -28,18 +28,15 @@ export function dxfEncLwPolyline(
     return undefined;
   }
 
-  if(points.length === 2) {
+  if (points.length === 2) {
     const a = points[0];
     const b = points[1];
-    if(a === undefined || b === undefined) {
+    if (a === undefined || b === undefined) {
       return undefined;
     }
 
     const direction = vec3Normalize(vec3Sub(b, a));
-    const reference =
-      Math.abs(direction.z) < 0.9
-        ? vec3(0, 0, 1)
-        : vec3(0, 1, 0);
+    const reference = Math.abs(direction.z) < 0.9 ? vec3(0, 0, 1) : vec3(0, 1, 0);
     const normal = vec3Normalize(vec3Cross(direction, reference));
 
     const plane: LwPolylinePlane = {
@@ -52,13 +49,20 @@ export function dxfEncLwPolyline(
   }
 
   const plane = findPlane(planePos, points);
-  if(!plane || !isCoplanar(points, plane)) {
+  if (!plane || !isCoplanar(points, plane)) {
     return undefined;
   }
   return encodeLwPolyline(points, plane, col, closed, handleRef, blockRefHandle);
 }
 
-function encodeLwPolyline(points: ReadonlyArray<Vec3>, plane: LwPolylinePlane, col: DxfColor, closed: boolean, handleRef: Handle, blockRefHandle?: string): string {
+function encodeLwPolyline(
+  points: ReadonlyArray<Vec3>,
+  plane: LwPolylinePlane,
+  col: DxfColor,
+  closed: boolean,
+  handleRef: Handle,
+  blockRefHandle?: string
+): string {
   let dxf = "";
   const planeElevation = vec3Dot(plane.pos, plane.normal);
 
@@ -73,7 +77,7 @@ function encodeLwPolyline(points: ReadonlyArray<Vec3>, plane: LwPolylinePlane, c
   dxf += `70\n${closed ? 1 : 0}\n`;
   dxf += `38\n${planeElevation}\n`;
 
-  for(const point of points) {
+  for (const point of points) {
     dxf += `10\n${vec3Dot(point, plane.xAxis)}\n`;
     dxf += `20\n${vec3Dot(point, plane.yAxis)}\n`;
   }
@@ -86,29 +90,29 @@ function encodeLwPolyline(points: ReadonlyArray<Vec3>, plane: LwPolylinePlane, c
 }
 
 function findPlane(planePos: Vec3, points: ReadonlyArray<Vec3>): LwPolylinePlane | undefined {
-  if(points.length < 3) {
+  if (points.length < 3) {
     return undefined;
   }
-  for(let i = 1; i < points.length; i++) {
+  for (let i = 1; i < points.length; i++) {
     const aRaw = points[i];
-    if(aRaw === undefined) {
+    if (aRaw === undefined) {
       continue;
     }
     const a = vec3Sub(aRaw, planePos);
-    for(let j = i + 1; j < points.length; j++) {
+    for (let j = i + 1; j < points.length; j++) {
       const bRaw = points[j];
-      if(bRaw === undefined) {
+      if (bRaw === undefined) {
         continue;
       }
       const b = vec3Sub(bRaw, planePos);
       const normal = vec3Cross(a, b);
-      if(vec3Length(normal) > EPSILON) {
+      if (vec3Length(normal) > EPSILON) {
         const normalizedNormal = vec3Normalize(normal);
         return {
           normal: normalizedNormal,
           pos: planePos,
           ...dxfOCSXYAxis(normalizedNormal),
-        }
+        };
       }
     }
   }
@@ -120,4 +124,4 @@ function isCoplanar(points: ReadonlyArray<Vec3>, plane: LwPolylinePlane): boolea
     const distance = vec3Dot(vec3Sub(p, plane.pos), plane.normal);
     return Math.abs(distance) < EPSILON;
   });
-}
+}

package/src/renderers/dxf/dxf-encoding/dxf-mtext.ts

@@ -11,9 +11,18 @@ export enum DxfMTextAttachment {
   BottomLeft = 7,
   BottomCenter = 8,
   BottomRight = 9,
-};
+}
 
-export function dxfEncMText(pos: Vec3, text: string, dir: Vec3, normal: Vec3, fontSize: number, handleRef: Handle, attachment: DxfMTextAttachment = DxfMTextAttachment.MiddleCenter, blockRefHandle?: string): string {
+export function dxfEncMText(
+  pos: Vec3,
+  text: string,
+  dir: Vec3,
+  normal: Vec3,
+  fontSize: number,
+  handleRef: Handle,
+  attachment: DxfMTextAttachment = DxfMTextAttachment.MiddleCenter,
+  blockRefHandle?: string
+): string {
   return `0
 MTEXT
 5
@@ -55,4 +64,4 @@ ${encodeDxfFormattedText(text)}
 
 export function encodeDxfFormattedText(text: string): string {
   return text.replace(/\r\n|\r|\n/g, "\\P");
-}
+}

package/src/renderers/dxf/dxf-encoding/dxf-polyline.ts

@@ -17,7 +17,7 @@ export function dxfEncPolyline(
   const seqEndHandle = dxfHandleNext(handleRef);
   const vertices = points
     .map((p) => {
-  return `  0
+      return `  0
 VERTEX
 5
 ${dxfHandleNext(handleRef)}
@@ -42,7 +42,6 @@ ${dxfRound(p.z)}
 32`;
     })
     .join("\n");
-  
 
   return `  0
 POLYLINE
@@ -79,4 +78,4 @@ AcDbEntity
 8
 0
 `;
-}
+}

package/src/renderers/dxf/dxf-encoding/dxf-solid.ts

@@ -45,4 +45,4 @@ ${dxfRound(vec4.x)}
 ${dxfRound(vec4.y)}
 33
 ${dxfRound(vec4.z)}
-`;
+`;

package/src/renderers/dxf/dxf-encoding/dxf-triangle.ts

@@ -20,4 +20,4 @@ export const dxfEncSolidTriangle = (
   col: DxfColor,
   handleRef: Handle,
   blockRefHandle?: string
-): string => dxfEncSolid(vec1, vec2, vec3, vec3, col, handleRef, blockRefHandle);
+): string => dxfEncSolid(vec1, vec2, vec3, vec3, col, handleRef, blockRefHandle);

package/src/renderers/dxf/dxf-geometries/dxf-box.ts

@@ -4,7 +4,7 @@ import {
   type Vec3,
   vec3,
   vec3RotCombine,
-  vec3Scale, 
+  vec3Scale,
   vec3TransRot,
   vec3Zero,
 } from "../../../abstract-3d.js";

package/src/renderers/dxf/dxf-geometries/dxf-dimension.ts

@@ -1,9 +1,23 @@
-import { type Dimension, dimensionIsOfTypeMesh, type Vec3, vec3Length, vec3Sub, vec3TransRot } from "../../../abstract-3d.js";
+import {
+  type Dimension,
+  dimensionIsOfTypeMesh,
+  type Vec3,
+  vec3Length,
+  vec3Sub,
+  vec3TransRot,
+} from "../../../abstract-3d.js";
 import type { Handle } from "../dxf-encoding/dxf-common.js";
 import { type DxfDimensionDefinition, dxfEncDimension } from "../dxf-encoding/dxf-dimension.js";
 
-export function dxfDimension(dimension: Dimension, parentPos: Vec3, parentRot: Vec3, sceneRotation: Vec3, viewRotation: Vec3, handleRef: Handle): DxfDimensionDefinition {
-  if(dimensionIsOfTypeMesh(dimension)) {
+export function dxfDimension(
+  dimension: Dimension,
+  parentPos: Vec3,
+  parentRot: Vec3,
+  sceneRotation: Vec3,
+  viewRotation: Vec3,
+  handleRef: Handle
+): DxfDimensionDefinition {
+  if (dimensionIsOfTypeMesh(dimension)) {
     return {
       block: "",
       entity: "",
@@ -15,4 +29,4 @@ export function dxfDimension(dimension: Dimension, parentPos: Vec3, parentRot: V
   const lp = vec3TransRot(dimension.linePosition, parentPos, parentRot);
   const text = dimension.text ?? `${vec3Length(vec3Sub(me, ms))}`;
   return dxfEncDimension(ms, me, lp, text, 7, sceneRotation, viewRotation, dimension.views ?? ["front"], handleRef);
-}
+}

package/src/renderers/dxf/dxf-geometries/dxf-image.ts

@@ -35,29 +35,17 @@ export function dxfImage(i: ImageMesh, parentPos: Vec3, parentRot: Vec3, handleR
 }
 
 function abstractImageToDxf3D(image: AbstractImage, pos: Vec3, rot: Vec3, scale: Vec3, handleRef: Handle): string {
-  const strokeScale = Math.max(scale.x, scale.y, scale.z);
-  return image.components
-    .map((comp) => abstractImageComponentToDxf3D(comp, pos, rot, scale, strokeScale, handleRef))
-    .join("");
+  return image.components.map((comp) => abstractImageComponentToDxf3D(comp, pos, rot, scale, handleRef)).join("");
 }
 
-function abstractImageComponentToDxf3D(
-  comp: Component,
-  pos: Vec3,
-  rot: Vec3,
-  scale: Vec3,
-  strokeScale: number,
-  handleRef: Handle
-): string {
+function abstractImageComponentToDxf3D(comp: Component, pos: Vec3, rot: Vec3, scale: Vec3, handleRef: Handle): string {
   const vec3tr = (x: number, y: number): Vec3 => vec3TransRot(vec3(x * scale.x, y * scale.y, 0), pos, rot);
   const strokeColor: DxfDynamicColor = 7;
 
   let dxf = "";
   switch (comp.type) {
     case "group": {
-      dxf += comp.children
-        .map((child) => abstractImageComponentToDxf3D(child, pos, rot, scale, strokeScale, handleRef))
-        .join("");
+      dxf += comp.children.map((child) => abstractImageComponentToDxf3D(child, pos, rot, scale, handleRef)).join("");
       break;
     }
     case "line": {
@@ -89,11 +77,11 @@ function abstractImageComponentToDxf3D(
     }
     case "rectangle": {
       const points = [
-          //these points form a loop
-          vec3tr(comp.topLeft.x, comp.topLeft.y),
-          vec3tr(comp.bottomRight.x, comp.topLeft.y),
-          vec3tr(comp.bottomRight.x, comp.bottomRight.y),
-          vec3tr(comp.topLeft.x, comp.bottomRight.y),
+        //these points form a loop
+        vec3tr(comp.topLeft.x, comp.topLeft.y),
+        vec3tr(comp.bottomRight.x, comp.topLeft.y),
+        vec3tr(comp.bottomRight.x, comp.bottomRight.y),
+        vec3tr(comp.topLeft.x, comp.bottomRight.y),
       ];
       dxf += dxfEncLwPolyline(pos, points, strokeColor, true, handleRef) ?? "";
       break;

package/src/renderers/dxf/dxf-geometries/dxf-polygon.ts

@@ -1,4 +1,11 @@
-import { type Polygon, type Material, type Vec3, vec3RotCombine, vec3TransRot, vec3Zero } from "../../../abstract-3d.js";
+import {
+  type Polygon,
+  type Material,
+  type Vec3,
+  vec3RotCombine,
+  vec3TransRot,
+  vec3Zero,
+} from "../../../abstract-3d.js";
 import type { Handle } from "../dxf-encoding/dxf-common.js";
 import { dxfEnc3DFace } from "../dxf-encoding/dxf-3dface.js";
 import { dxfEnc3DFaceTriangle } from "../dxf-encoding/dxf-triangle.js";
@@ -13,20 +20,13 @@ export function dxfPolygon(p: Polygon, m: Material, parentPos: Vec3, parentRot:
   const rot = vec3RotCombine(parentRot, p.rot ?? vec3Zero);
   const points = p.points.map((p) => vec3TransRot(p, pos, rot));
   let i = 0;
-  while((points.length - i) >= QUAD_STRIDE) {
+  while (points.length - i >= QUAD_STRIDE) {
     const vec1 = points[i];
     const vec2 = points[i + 1];
     const vec3 = points[i + 2];
     const vec4 = points[i + 3];
-    if(vec1 && vec2 && vec3 && vec4) {
-      polygonString += dxfEnc3DFace(
-        vec1,
-        vec2,
-        vec3,
-        vec4,
-        col,
-        handleRef
-      );
+    if (vec1 && vec2 && vec3 && vec4) {
+      polygonString += dxfEnc3DFace(vec1, vec2, vec3, vec4, col, handleRef);
     }
     i += QUAD_STRIDE;
   }
@@ -38,7 +38,7 @@ export function dxfPolygon(p: Polygon, m: Material, parentPos: Vec3, parentRot:
         const vec1 = points[i];
         const vec2 = points[i - 1];
         const vec3 = points[i - 2];
-        if(vec1 && vec2 && vec3) {
+        if (vec1 && vec2 && vec3) {
           polygonString += dxfEnc3DFaceTriangle(vec3, vec2, vec1, col, handleRef);
         }
         break;
@@ -47,14 +47,8 @@ export function dxfPolygon(p: Polygon, m: Material, parentPos: Vec3, parentRot:
         const vec1 = points[i];
         const vec2 = points[i - 1];
         const vec3 = points[i + 1];
-        if(vec1 && vec2 && vec3) {
-          polygonString += dxfEnc3DFaceTriangle(
-            vec2,
-            vec1,
-            vec3,
-            col,
-            handleRef
-          );
+        if (vec1 && vec2 && vec3) {
+          polygonString += dxfEnc3DFaceTriangle(vec2, vec1, vec3, col, handleRef);
         }
         break;
       }
@@ -62,14 +56,8 @@ export function dxfPolygon(p: Polygon, m: Material, parentPos: Vec3, parentRot:
         const vec1 = points[i];
         const vec2 = points[i + 1];
         const vec3 = points[i + 2];
-        if(vec1 && vec2 && vec3) {
-          polygonString += dxfEnc3DFaceTriangle(
-            vec1,
-            vec2,
-            vec3,
-            col,
-            handleRef
-          );
+        if (vec1 && vec2 && vec3) {
+          polygonString += dxfEnc3DFaceTriangle(vec1, vec2, vec3, col, handleRef);
         }
         break;
       }

package/src/renderers/dxf/dxf-geometries/dxf-shape.ts

@@ -1,4 +1,12 @@
-import { type Shape, type Material, type Vec3, vec3TransRot, vec3RotCombine, vec3Zero, vec3 } from "../../../abstract-3d.js";
+import {
+  type Shape,
+  type Material,
+  type Vec3,
+  vec3TransRot,
+  vec3RotCombine,
+  vec3Zero,
+  vec3,
+} from "../../../abstract-3d.js";
 import type { Handle } from "../dxf-encoding/dxf-common.js";
 import { dxfEnc3DFace } from "../dxf-encoding/dxf-3dface.js";
 import { dxfEnc3DFaceTriangle } from "../dxf-encoding/dxf-triangle.js";
@@ -18,7 +26,7 @@ export function dxfPolygon(s: Shape, m: Material, parentPos: Vec3, parentRot: Ve
       const p2 = points[i + 1];
       const p3 = points[i + 2];
       const p4 = points[i + 3];
-      if(p1 && p2 && p3 && p4) {
+      if (p1 && p2 && p3 && p4) {
         polygonString += dxfEnc3DFace(p1, p2, p3, p4, m.normal, handleRef);
       }
     }
@@ -31,7 +39,7 @@ export function dxfPolygon(s: Shape, m: Material, parentPos: Vec3, parentRot: Ve
         const p1 = points[i - 2];
         const p2 = points[i - 1];
         const p3 = points[i];
-        if(p1 && p2 && p3) {
+        if (p1 && p2 && p3) {
           polygonString += dxfEnc3DFaceTriangle(p1, p2, p3, m.normal, handleRef);
         }
         break;
@@ -40,7 +48,7 @@ export function dxfPolygon(s: Shape, m: Material, parentPos: Vec3, parentRot: Ve
         const p1 = points[i - 1];
         const p2 = points[i];
         const p3 = points[i + 1];
-        if(p1 && p2 && p3) {
+        if (p1 && p2 && p3) {
           polygonString += dxfEnc3DFaceTriangle(p1, p2, p3, m.normal, handleRef);
         }
         break;
@@ -49,7 +57,7 @@ export function dxfPolygon(s: Shape, m: Material, parentPos: Vec3, parentRot: Ve
         const p1 = points[i];
         const p2 = points[i + 1];
         const p3 = points[i + 2];
-        if(p1 && p2 && p3) {
+        if (p1 && p2 && p3) {
           polygonString += dxfEnc3DFaceTriangle(p1, p2, p3, m.normal, handleRef);
         }
         break;