abstract-3d 2.6.19 → 2.7.0

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

@@ -0,0 +1,35 @@
+import type { Vec3 } from "../../../abstract-3d.js";
+import { type DxfColor, dxfColor } from "./dxf-color.js";
+import { DXF_MODEL_SPACE_HANDLE, dxfHandleNext, dxfRound, type Handle } from "./dxf-common.js";
+
+export function dxfEncLine(
+  vecStart: Vec3,
+  vecEnd: Vec3,
+  col: DxfColor,
+  handleRef: Handle
+): string {
+  return `  0
+LINE
+5
+${dxfHandleNext(handleRef)}
+330
+${DXF_MODEL_SPACE_HANDLE}
+100
+AcDbEntity
+${dxfColor(col)}
+100
+AcDbLine
+10
+${dxfRound(vecStart.x)}
+20
+${dxfRound(vecStart.y)}
+30
+${dxfRound(vecStart.z)}
+11
+${dxfRound(vecEnd.x)}
+21
+${dxfRound(vecEnd.y)}
+31
+${dxfRound(vecEnd.z)}
+`;
+}

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

@@ -0,0 +1,83 @@
+import type { Vec3 } from "../../../abstract-3d.js";
+import { type DxfColor, dxfColor } from "./dxf-color.js";
+import { DXF_MODEL_SPACE_HANDLE, dxfHandleNext, dxfRound, type Handle } from "./dxf-common.js";
+
+export function dxfEncPolyline(
+  points: ReadonlyArray<Vec3>,
+  col: DxfColor,
+  closed: boolean,
+  handleRef: Handle
+): string {
+  if (points.length < 2) {
+    return "";
+  }
+
+  const polylineHandle = dxfHandleNext(handleRef);
+  const vertexHandle = dxfHandleNext(handleRef);
+  const seqEndHandle = dxfHandleNext(handleRef);
+  const vertices = points
+    .map((p) => {
+
+  return `  0
+VERTEX
+5
+${vertexHandle}
+330
+${polylineHandle}
+100
+AcDbEntity
+8
+0
+${dxfColor(col)}
+100
+AcDbVertex
+100
+AcDb3dPolylineVertex
+10
+${dxfRound(p.x)}
+20
+${dxfRound(p.y)}
+30
+${dxfRound(p.z)}
+70
+32`;
+    })
+    .join("\n");
+  
+
+  return `  0
+POLYLINE
+5
+${polylineHandle}
+330
+${DXF_MODEL_SPACE_HANDLE}
+100
+AcDbEntity
+8
+0
+${dxfColor(col)}
+100
+AcDb3dPolyline
+66
+1
+10
+0.0
+20
+0.0
+30
+0.0
+70
+${closed ? 9 : 8}
+${vertices}
+  0
+SEQEND
+5
+${seqEndHandle}
+330
+${polylineHandle}
+100
+AcDbEntity
+8
+0
+`;
+}

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

@@ -0,0 +1,47 @@
+import type { Vec3 } from "../../../abstract-3d.js";
+import { dxfColor, type DxfColor } from "./dxf-color.js";
+import { DXF_MODEL_SPACE_HANDLE, dxfHandleNext, dxfRound, type Handle } from "./dxf-common.js";
+
+export const dxfEncQuad = (
+  vec1: Vec3,
+  vec2: Vec3,
+  vec3: Vec3,
+  vec4: Vec3,
+  col: DxfColor,
+  handleRef: Handle
+): string => `  0
+3DFACE
+5
+${dxfHandleNext(handleRef)}
+330
+${DXF_MODEL_SPACE_HANDLE}
+100
+AcDbEntity
+${dxfColor(col)}
+100
+AcDbFace
+10
+${dxfRound(vec1.x)}
+20
+${dxfRound(vec1.y)}
+30
+${dxfRound(vec1.z)}
+11
+${dxfRound(vec2.x)}
+21
+${dxfRound(vec2.y)}
+31
+${dxfRound(vec2.z)}
+12
+${dxfRound(vec3.x)}
+22
+${dxfRound(vec3.y)}
+32
+${dxfRound(vec3.z)}
+13
+${dxfRound(vec4.x)}
+23
+${dxfRound(vec4.y)}
+33
+${dxfRound(vec4.z)}
+`;

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

@@ -0,0 +1,71 @@
+import type { Vec3 } from "../../../abstract-3d.js";
+import { type DxfColor, dxfColor } from "./dxf-color.js";
+import { DXF_MODEL_SPACE_HANDLE, dxfHandleNext, dxfRound, type Handle } from "./dxf-common.js";
+
+export enum DxfTextVerticalAlignment {
+  Baseline = 0,
+  Bottom = 1,
+  Middle = 2,
+  Top = 3
+};
+
+export enum DxfTextHorizontalAlignment {
+  VLeft = 0,
+  VCenter = 1,
+  VRight = 2,
+
+  /* 
+    the vertical alignment must be 0 to use these
+    https://help.autodesk.com/view/OARX/2018/ENU/?guid=GUID-62E5383D-8A14-47B4-BFC4-35824CAE8363
+  */
+  Aligned = 3,
+  Middle = 4,
+  Fit = 5,
+}
+
+export function dxfEncText(pos: Vec3, rot: number, text: string, fontSize: number, col: DxfColor, handleRef: Handle): string {
+  return `0
+TEXT
+5
+${dxfHandleNext(handleRef)}
+330
+${DXF_MODEL_SPACE_HANDLE}
+100
+AcDbEntity
+8
+0
+${dxfColor(col)}
+100
+AcDbText
+10
+${dxfRound(pos.x)}
+20
+${dxfRound(pos.y)}
+30
+${dxfRound(pos.z)}
+40
+${(fontSize * 0.75).toString()}
+1
+${text}
+50
+${dxfRound((rot / Math.PI) * 180.0)}
+41
+1.0
+7
+STANDARD
+71
+0
+72
+${DxfTextHorizontalAlignment.VCenter}
+11
+${dxfRound(pos.x)}
+21
+${dxfRound(pos.y)}
+31
+${dxfRound(pos.z)}
+100
+AcDbText
+73
+${DxfTextVerticalAlignment.Middle}
+`;
+}

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

@@ -0,0 +1,12 @@
+import type { Vec3 } from "../../../abstract-3d.js";
+import type { DxfColor } from "./dxf-color.js";
+import type { Handle } from "./dxf-common.js";
+import { dxfEncQuad } from "./dxf-quad.js";
+
+export const dxfEncTriangle = (
+  vec1: Vec3,
+  vec2: Vec3,
+  vec3: Vec3,
+  col: DxfColor,
+  handleRef: Handle
+): string => dxfEncQuad(vec1, vec2, vec3, vec3, col, handleRef);

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

@@ -1,5 +1,15 @@
-import { Box, Material, Vec3, vec3TransRot, vec3RotCombine, vec3Zero, vec3Scale, vec3 } from "../../../abstract-3d.js";
-import { dxfQuad, Handle } from "../dxf-encoding.js";
+import {
+  type Box,
+  type Material,
+  type Vec3,
+  vec3,
+  vec3RotCombine,
+  vec3Scale, 
+  vec3TransRot,
+  vec3Zero,
+} from "../../../abstract-3d.js";
+import type { Handle } from "../dxf-encoding/dxf-common.js";
+import { dxfEncQuad } from "../dxf-encoding/dxf-quad.js";
 
 export function dxfBox(b: Box, m: Material, parentPos: Vec3, parentRot: Vec3, handleRef: Handle): string {
   const pos = vec3TransRot(b.pos, parentPos, parentRot);
@@ -16,11 +26,11 @@ export function dxfBox(b: Box, m: Material, parentPos: Vec3, parentRot: Vec3, ha
   const v7 = vec3tr3(half.x, half.y, -half.z);
   const v8 = vec3tr3(-half.x, half.y, -half.z);
   return (
-    dxfQuad(v1, v2, v3, v4, m.normal, handleRef) + // front
-    dxfQuad(v5, v6, v7, v8, m.normal, handleRef) + // Back
-    dxfQuad(v5, v1, v4, v8, m.normal, handleRef) + // Left
-    dxfQuad(v6, v2, v3, v7, m.normal, handleRef) + // Right
-    dxfQuad(v8, v7, v3, v4, m.normal, handleRef) + // Top
-    dxfQuad(v5, v6, v2, v1, m.normal, handleRef) // Bottom
+    dxfEncQuad(v1, v2, v3, v4, m.normal, handleRef) + // front
+    dxfEncQuad(v5, v6, v7, v8, m.normal, handleRef) + // Back
+    dxfEncQuad(v5, v1, v4, v8, m.normal, handleRef) + // Left
+    dxfEncQuad(v6, v2, v3, v7, m.normal, handleRef) + // Right
+    dxfEncQuad(v8, v7, v3, v4, m.normal, handleRef) + // Top
+    dxfEncQuad(v5, v6, v2, v1, m.normal, handleRef) // Bottom
   );
 }

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

@@ -1,5 +1,14 @@
-import { Cone, Material, Vec3, vec3TransRot, vec3RotCombine, vec3Zero, vec3 } from "../../../abstract-3d.js";
-import { dxfTriangle, Handle } from "../dxf-encoding.js";
+import {
+  type Cone,
+  type Material,
+  type Vec3,
+  vec3,
+  vec3RotCombine,
+  vec3TransRot,
+  vec3Zero,
+} from "../../../abstract-3d.js";
+import type { Handle } from "../dxf-encoding/dxf-common.js";
+import { dxfEncTriangle } from "../dxf-encoding/dxf-triangle.js";
 
 export function dxfCone(
   c: Cone,
@@ -28,8 +37,8 @@ export function dxfCone(
     if (i !== 0) {
       const prevBot = botVec3Array[i - 1]!;
       dxfString +=
-        dxfTriangle(botPos, prevBot, currBot, m.normal, handleRef) +
-        dxfTriangle(currBot, prevBot, topPos, m.normal, handleRef);
+        dxfEncTriangle(botPos, prevBot, currBot, m.normal, handleRef) +
+        dxfEncTriangle(currBot, prevBot, topPos, m.normal, handleRef);
     }
     currentAngle += angleStep;
   }

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

@@ -1,15 +1,17 @@
 import {
-  Cylinder,
-  Material,
-  Vec3,
-  vec3TransRot,
-  vec3RotCombine,
-  vec3Zero,
+  type Cylinder,
+  type Material,
+  type Vec3,
+  equals,
   vec3,
+  vec3RotCombine,
   vec3Scale,
-  equals,
+  vec3TransRot,
+  vec3Zero,
 } from "../../../abstract-3d.js";
-import { dxfQuad, dxfTriangle, Handle } from "../dxf-encoding.js";
+import type { Handle } from "../dxf-encoding/dxf-common.js";
+import { dxfEncQuad } from "../dxf-encoding/dxf-quad.js";
+import { dxfEncTriangle } from "../dxf-encoding/dxf-triangle.js";
 import { dxfPlane } from "./dxf-plane.js";
 
 export function dxfCylinder(
@@ -45,10 +47,10 @@ export function dxfCylinder(
     if (i !== 0 && prevBot && prevTop) {
       if (!c.open) {
         dxfString +=
-          dxfTriangle(botPos, prevBot, currBot, m.normal, handleRef) +
-          dxfTriangle(topPos, prevTop, currTop, m.normal, handleRef);
+          dxfEncTriangle(botPos, prevBot, currBot, m.normal, handleRef) +
+          dxfEncTriangle(topPos, prevTop, currTop, m.normal, handleRef);
       }
-      dxfString += dxfQuad(currBot, prevBot, prevTop, currTop, m.normal, handleRef);
+      dxfString += dxfEncQuad(currBot, prevBot, prevTop, currTop, m.normal, handleRef);
     }
 
     prevBot = currBot;

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

@@ -0,0 +1,14 @@
+import { type Dimension, dimensionIsOfTypeMesh, type Vec3, vec3Length, vec3Sub, vec3TransRot } from "../../../abstract-3d.js";
+import type { Handle } from "../dxf-encoding/dxf-common.js";
+import { dxfEncDimension } from "../dxf-encoding/dxf-dimension.js";
+
+export function dxfDimension(dimension: Dimension, parentPos: Vec3, parentRot: Vec3, handleRef: Handle): string {
+  if(dimensionIsOfTypeMesh(dimension)) {
+    return "";
+  }
+  const ms = vec3TransRot(dimension.measurementStart, parentPos, parentRot);
+  const me = vec3TransRot(dimension.measurementEnd, parentPos, parentRot);
+  const lp = vec3TransRot(dimension.linePosition, parentPos, parentRot);
+  const text = dimension.text ?? `${vec3Length(vec3Sub(me, ms))}`;
+  return dxfEncDimension(ms, me, lp, text, 7, handleRef);
+}

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

@@ -1,7 +1,7 @@
 import type { AbstractImage, Color, Component } from "abstract-image";
 import {
-  ImageMesh,
-  Vec3,
+  type ImageMesh,
+  type Vec3,
   vec2Scale,
   vec3TransRot,
   vec3RotCombine,
@@ -10,8 +10,10 @@ import {
   vec3Rot,
   vec3Add,
 } from "../../../abstract-3d.js";
-import { DEFAULT_CIRCLE_SIDE_COUNT, DxfDynamicColor, dxfLine, dxfPolyline, Handle } from "../dxf-encoding.js";
-// dummy
+import { DEFAULT_CIRCLE_SIDE_COUNT, type Handle } from "../dxf-encoding/dxf-common.js";
+import { DxfDynamicColor } from "../dxf-encoding/dxf-color.js";
+import { dxfEncPolyline } from "../dxf-encoding/dxf-polyline.js";
+import { dxfEncLine } from "../dxf-encoding/dxf-line.js";
 
 export function dxfImage(i: ImageMesh, parentPos: Vec3, parentRot: Vec3, handleRef: Handle): string {
   const half = vec2Scale(i.size, 0.5);
@@ -59,17 +61,17 @@ function abstractImageComponentToDxf3D(
       break;
     }
     case "line": {
-      dxf += dxfLine(vec3tr(comp.start.x, comp.start.y), vec3tr(comp.end.x, comp.end.y), strokeColor, handleRef);
+      dxf += dxfEncLine(vec3tr(comp.start.x, comp.start.y), vec3tr(comp.end.x, comp.end.y), strokeColor, handleRef);
       break;
     }
     case "polyline": {
       const points = comp.points.map((p) => vec3tr(p.x, p.y));
-      dxf += dxfPolyline(points, strokeColor, false, handleRef);
+      dxf += dxfEncPolyline(points, strokeColor, false, handleRef);
       break;
     }
     case "polygon": {
       const points = comp.points.map((p) => vec3tr(p.x, p.y));
-      dxf += dxfPolyline(points, strokeColor, true, handleRef);
+      dxf += dxfEncPolyline(points, strokeColor, true, handleRef);
       break;
     }
     case "ellipse": {
@@ -82,7 +84,7 @@ function abstractImageComponentToDxf3D(
         const y = comp.topLeft.y + r2 + r2 * Math.sin(t);
         points.push(vec3tr(x, y));
       }
-      dxf += dxfPolyline(points, strokeColor, true, handleRef);
+      dxf += dxfEncPolyline(points, strokeColor, true, handleRef);
       break;
     }
     case "rectangle": {
@@ -93,7 +95,7 @@ function abstractImageComponentToDxf3D(
           vec3tr(comp.bottomRight.x, comp.bottomRight.y),
           vec3tr(comp.topLeft.x, comp.bottomRight.y),
       ];
-      dxf += dxfPolyline(points, strokeColor, true, handleRef);
+      dxf += dxfEncPolyline(points, strokeColor, true, handleRef);
       break;
     }
     default:

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

@@ -1,21 +1,22 @@
 import {
-  Plane,
-  Material,
-  Vec3,
+  type Plane,
+  type Material,
+  type Vec3,
   vec2Scale,
+  vec3,
   vec3TransRot,
   vec3RotCombine,
   vec3Zero,
-  vec3,
 } from "../../../abstract-3d.js";
-import { dxfQuad, Handle } from "../dxf-encoding.js";
+import type { Handle } from "../dxf-encoding/dxf-common.js";
+import { dxfEncQuad } from "../dxf-encoding/dxf-quad.js";
 
 export function dxfPlane(p: Plane, m: Material, parentPos: Vec3, parentRot: Vec3, handleRef: Handle): string {
   const half = vec2Scale(p.size, 0.5);
   const pos = vec3TransRot(p.pos, parentPos, parentRot);
   const rot = vec3RotCombine(parentRot, p.rot ?? vec3Zero);
   const vec3tr = (x: number, y: number): Vec3 => vec3TransRot(vec3(x, y, 0), pos, rot);
-  return dxfQuad(
+  return dxfEncQuad(
     vec3tr(-half.x, -half.y),
     vec3tr(half.x, -half.y),
     vec3tr(half.x, half.y),

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

@@ -1,5 +1,7 @@
-import { Polygon, Material, Vec3, vec3TransRot, vec3RotCombine, vec3Zero } from "../../../abstract-3d.js";
-import { dxfQuad, dxfTriangle, Handle } from "../dxf-encoding.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 { dxfEncQuad } from "../dxf-encoding/dxf-quad.js";
+import { dxfEncTriangle } from "../dxf-encoding/dxf-triangle.js";
 
 const QUAD_STRIDE = 4;
 const TRIANGLE_STRIDE = 3;
@@ -17,7 +19,7 @@ export function dxfPolygon(p: Polygon, m: Material, parentPos: Vec3, parentRot:
     const vec3 = points[i + 2];
     const vec4 = points[i + 3];
     if(vec1 && vec2 && vec3 && vec4) {
-      polygonString += dxfQuad(
+      polygonString += dxfEncQuad(
         vec1,
         vec2,
         vec3,
@@ -37,7 +39,7 @@ export function dxfPolygon(p: Polygon, m: Material, parentPos: Vec3, parentRot:
         const vec2 = points[i - 1];
         const vec3 = points[i - 2];
         if(vec1 && vec2 && vec3) {
-          polygonString += dxfTriangle(vec3, vec2, vec1, col, handleRef);
+          polygonString += dxfEncTriangle(vec3, vec2, vec1, col, handleRef);
         }
         break;
       }
@@ -46,7 +48,7 @@ export function dxfPolygon(p: Polygon, m: Material, parentPos: Vec3, parentRot:
         const vec2 = points[i - 1];
         const vec3 = points[i + 1];
         if(vec1 && vec2 && vec3) {
-          polygonString += dxfTriangle(
+          polygonString += dxfEncTriangle(
             vec2,
             vec1,
             vec3,
@@ -61,7 +63,7 @@ export function dxfPolygon(p: Polygon, m: Material, parentPos: Vec3, parentRot:
         const vec2 = points[i + 1];
         const vec3 = points[i + 2];
         if(vec1 && vec2 && vec3) {
-          polygonString += dxfTriangle(
+          polygonString += dxfEncTriangle(
             vec1,
             vec2,
             vec3,

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

@@ -1,5 +1,7 @@
-import { Shape, Material, Vec3, vec3TransRot, vec3RotCombine, vec3Zero, vec3 } from "../../../abstract-3d.js";
-import { dxfQuad, dxfTriangle, Handle } from "../dxf-encoding.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 { dxfEncQuad } from "../dxf-encoding/dxf-quad.js";
+import { dxfEncTriangle } from "../dxf-encoding/dxf-triangle.js";
 
 const QUAD_STRIDE = 4;
 const TRIANGLE_STRIDE = 3;
@@ -17,7 +19,7 @@ export function dxfPolygon(s: Shape, m: Material, parentPos: Vec3, parentRot: Ve
       const p3 = points[i + 2];
       const p4 = points[i + 3];
       if(p1 && p2 && p3 && p4) {
-        polygonString += dxfQuad(p1, p2, p3, p4, m.normal, handleRef);
+        polygonString += dxfEncQuad(p1, p2, p3, p4, m.normal, handleRef);
       }
     }
   }
@@ -30,7 +32,7 @@ export function dxfPolygon(s: Shape, m: Material, parentPos: Vec3, parentRot: Ve
         const p2 = points[i - 1];
         const p3 = points[i];
         if(p1 && p2 && p3) {
-          polygonString += dxfTriangle(p1, p2, p3, m.normal, handleRef);
+          polygonString += dxfEncTriangle(p1, p2, p3, m.normal, handleRef);
         }
         break;
       }
@@ -39,7 +41,7 @@ export function dxfPolygon(s: Shape, m: Material, parentPos: Vec3, parentRot: Ve
         const p2 = points[i];
         const p3 = points[i + 1];
         if(p1 && p2 && p3) {
-          polygonString += dxfTriangle(p1, p2, p3, m.normal, handleRef);
+          polygonString += dxfEncTriangle(p1, p2, p3, m.normal, handleRef);
         }
         break;
       }
@@ -48,7 +50,7 @@ export function dxfPolygon(s: Shape, m: Material, parentPos: Vec3, parentRot: Ve
         const p2 = points[i + 1];
         const p3 = points[i + 2];
         if(p1 && p2 && p3) {
-          polygonString += dxfTriangle(p1, p2, p3, m.normal, handleRef);
+          polygonString += dxfEncTriangle(p1, p2, p3, m.normal, handleRef);
         }
         break;
       }

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

@@ -0,0 +1,9 @@
+import { type Text, type Material, type Vec3, vec3RotCombine, vec3TransRot, vec3Zero } from "../../../abstract-3d.js";
+import type { Handle } from "../dxf-encoding/dxf-common.js";
+import { dxfEncText } from "../dxf-encoding/dxf-text.js";
+
+export function dxfText(t: Text, _m: Material, parentPos: Vec3, parentRot: Vec3, handleRef: Handle): string {
+  const pos = vec3TransRot(t.pos, parentPos, parentRot);
+  const rot = vec3RotCombine(parentRot, t.rot ?? vec3Zero);
+  return dxfEncText(pos, rot.z, t.text, t.fontSize, 7, handleRef);
+}