abstract-3d 2.7.30 → 2.7.33

package/src/renderers/svg/svg-geometries/shared.ts

@@ -1,4 +1,5 @@
-import { vec2, Vec2, vec3, Vec3, vec3TransRot, vec3Zero, View } from "../../../abstract-3d.js";
+import type { Vec2, Vec3, View } from "../../../abstract-3d.js";
+import { vec3TransRot, vec3Zero } from "../../../abstract-3d.js";
 
 export type zOrderElement = { readonly element: string; readonly zOrder: number };
 export const zElem = (element: string, zOrder: number): zOrderElement => ({ element, zOrder });

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

@@ -1,16 +1,7 @@
-import {
-  Box,
-  Vec2,
-  Vec3,
-  vec3Scale,
-  vec3TransRot,
-  vec3RotCombine,
-  vec3Zero,
-  vec3,
-  vec3ZMean,
-  Material,
-} from "../../../abstract-3d.js";
-import { gray, black, zElem, zOrderElement, SvgOptions } from "./shared.js";
+import type { Box, Vec2, Vec3, Material } from "../../../abstract-3d.js";
+import { vec3Scale, vec3TransRot, vec3RotCombine, vec3Zero, vec3, vec3ZMean } from "../../../abstract-3d.js";
+import type { zOrderElement, SvgOptions } from "./shared.js";
+import { gray, black, zElem } from "./shared.js";
 import { svgPolygon } from "../svg-encoding.js";
 import { rgbGrayScale } from "../../../utils.js";
 

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

@@ -1,16 +1,7 @@
-import {
-  Cone,
-  Vec2,
-  Vec3,
-  vec3,
-  vec3TransRot,
-  vec3RotCombine,
-  vec3Zero,
-  vec3ZMean,
-  equals,
-  Material,
-} from "../../../abstract-3d.js";
-import { gray, stBW, zElem, zOrderElement, transparent, SvgOptions } from "./shared.js";
+import type { Cone, Vec2, Vec3, Material } from "../../../abstract-3d.js";
+import { vec3, vec3TransRot, vec3RotCombine, vec3Zero, vec3ZMean, equals } from "../../../abstract-3d.js";
+import type { zOrderElement, SvgOptions } from "./shared.js";
+import { gray, stBW, zElem, transparent } from "./shared.js";
 import { svgCircle, svgPolygon } from "../svg-encoding.js";
 import { rgbGrayScale } from "../../../utils.js";
 
@@ -59,7 +50,7 @@ export function cone(
   }
 
   // Add circle if direcly facing camera
-  const cylTop = vec3tr(vec3(0, +half.y, 0));
+  const cylTop = vec3tr(vec3(0, half.y, 0));
   const cylBottom = vec3tr(vec3(0, -half.y, 0));
   if (equals(cylTop.x, cylBottom.x, 0.1) && equals(cylTop.y, cylBottom.y, 0.1)) {
     zOrderComponents.push(

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

@@ -1,16 +1,7 @@
-import {
-  Cylinder,
-  Vec2,
-  Vec3,
-  vec3,
-  vec3TransRot,
-  vec3RotCombine,
-  vec3Zero,
-  vec3ZMean,
-  equals,
-  Material,
-} from "../../../abstract-3d.js";
-import { gray, stBW, SvgOptions, transparent, zElem, zOrderElement } from "./shared.js";
+import type { Cylinder, Vec2, Vec3, Material } from "../../../abstract-3d.js";
+import { vec3, vec3TransRot, vec3RotCombine, vec3Zero, vec3ZMean, equals } from "../../../abstract-3d.js";
+import type { SvgOptions, zOrderElement } from "./shared.js";
+import { gray, stBW, transparent, zElem } from "./shared.js";
 import { svgCircle, svgPolygon } from "../svg-encoding.js";
 import { rgbGrayScale } from "../../../utils.js";
 
@@ -65,7 +56,7 @@ export function cylinder(
   }
   if (!c.open) {
     // Add circle if direcly facing camera
-    const circleTop = vec3tr(vec3(0, +half.y, 0));
+    const circleTop = vec3tr(vec3(0, half.y, 0));
     const circleBottom = vec3tr(vec3(0, -half.y, 0));
     if (equals(circleTop.x, circleBottom.x, 0.1) && equals(circleTop.y, circleBottom.y, 0.1)) {
       const circlePos = circleTop.z > circleBottom.z ? circleTop : circleBottom;

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

@@ -1,16 +1,10 @@
 import { createSVG } from "abstract-image";
-import {
-  ImageMesh,
-  Vec2,
-  Vec3,
-  vec2Scale,
-  vec3TransRot,
-  vec3RotCombine,
-  vec3Zero,
-  vec3,
-} from "../../../abstract-3d.js";
-import { zElem, zOrderElement, SvgOptions } from "./shared.js";
-import { EmbededImage, rawSvgPrefix, svgImage } from "../svg-encoding.js";
+import type { ImageMesh, Vec2, Vec3 } from "../../../abstract-3d.js";
+import { vec2Scale, vec3TransRot, vec3RotCombine, vec3Zero, vec3 } from "../../../abstract-3d.js";
+import type { zOrderElement, SvgOptions } from "./shared.js";
+import { zElem } from "./shared.js";
+import type { EmbededImage } from "../svg-encoding.js";
+import { rawSvgPrefix, svgImage } from "../svg-encoding.js";
 import { exhaustiveCheck } from "ts-exhaustive-check";
 
 export function image(
@@ -56,8 +50,8 @@ export function image(
             ),
           }
         : i.image.url
-        ? { type: "url", url: imageData ?? i.image.url }
-        : undefined;
+          ? { type: "url", url: imageData ?? i.image.url }
+          : undefined;
 
       if (image) {
         const img = svgImage(point(v4.x, v4.y), i.size, rot, image, opts.imageBg ? opts.background : undefined);

package/src/renderers/svg/svg-geometries/svg-line.ts

@@ -1,5 +1,7 @@
-import { CulledLine, Line, Vec2, Vec3, vec3TransRot, vec3ZMean } from "../../../abstract-3d.js";
-import { SvgOptions, zElem, zOrderElement } from "./shared.js";
+import type { CulledLine, Line, Vec2, Vec3 } from "../../../abstract-3d.js";
+import { vec3TransRot, vec3ZMean } from "../../../abstract-3d.js";
+import type { SvgOptions, zOrderElement } from "./shared.js";
+import { zElem } from "./shared.js";
 import { svgLine } from "../svg-encoding.js";
 import { rgbGrayScale } from "../../../utils.js";
 

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

@@ -1,17 +1,7 @@
-import {
-  Plane,
-  Vec2,
-  Vec3,
-  vec2Scale,
-  vec3TransRot,
-  vec3RotCombine,
-  vec3Zero,
-  vec3,
-  vec3ZMean,
-  Material,
-  Hole,
-} from "../../../abstract-3d.js";
-import { gray, black, zElem, zOrderElement, SvgOptions } from "./shared.js";
+import type { Plane, Vec2, Vec3, Material, Hole } from "../../../abstract-3d.js";
+import { vec2Scale, vec3TransRot, vec3RotCombine, vec3Zero, vec3, vec3ZMean } from "../../../abstract-3d.js";
+import type { zOrderElement, SvgOptions } from "./shared.js";
+import { gray, black, zElem } from "./shared.js";
 import { svgPolygon } from "../svg-encoding.js";
 import { rgbGrayScale } from "../../../utils.js";
 

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

@@ -1,14 +1,7 @@
-import {
-  Polygon,
-  vec3ZMean,
-  Vec3,
-  Vec2,
-  vec3TransRot,
-  vec3RotCombine,
-  vec3Zero,
-  Material,
-} from "../../../abstract-3d.js";
-import { gray, zElem, zOrderElement, transparent, SvgOptions } from "./shared.js";
+import type { Polygon, Vec3, Vec2, Material } from "../../../abstract-3d.js";
+import { vec3ZMean, vec3TransRot, vec3RotCombine, vec3Zero } from "../../../abstract-3d.js";
+import type { zOrderElement, SvgOptions } from "./shared.js";
+import { gray, zElem, transparent } from "./shared.js";
 import { svgPolygon } from "../svg-encoding.js";
 import { rgbGrayScale } from "../../../utils.js";
 

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

@@ -1,15 +1,7 @@
-import {
-  vec3ZMean,
-  Vec3,
-  Vec2,
-  vec3TransRot,
-  vec3RotCombine,
-  Shape,
-  vec3,
-  vec3Zero,
-  Material,
-} from "../../../abstract-3d.js";
-import { gray, zElem, zOrderElement, transparent, SvgOptions } from "./shared.js";
+import type { Vec3, Vec2, Shape, Material } from "../../../abstract-3d.js";
+import { vec3ZMean, vec3TransRot, vec3RotCombine, vec3, vec3Zero } from "../../../abstract-3d.js";
+import type { zOrderElement, SvgOptions } from "./shared.js";
+import { gray, zElem, transparent } from "./shared.js";
 import { svgPolygon } from "../svg-encoding.js";
 import { rgbGrayScale } from "../../../utils.js";
 

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

@@ -1,5 +1,7 @@
-import { Text, Vec2, Vec3, vec3TransRot, vec3RotCombine, vec3Zero, vec3, View, vec3Flip, rotationForCameraPos, vec3Dot, vec3Rot } from "../../../abstract-3d.js";
-import { svgTrsMatrix, SvgOptions, zElem, zOrderElement } from "./shared.js";
+import type { Text, Vec2, Vec3 } from "../../../abstract-3d.js";
+import { vec3TransRot, vec3RotCombine, vec3Zero, vec3, vec3Dot, vec3Rot } from "../../../abstract-3d.js";
+import type { SvgOptions, zOrderElement } from "./shared.js";
+import { svgTrsMatrix, zElem } from "./shared.js";
 import { svgText } from "../svg-encoding.js";
 
 const SVG_FORWARD: Vec3 = vec3(0.0, 0.0, 1.0);
@@ -17,14 +19,10 @@ export function text(
   const pos = vec3TransRot(t.pos, parentPos, parentRot);
   const rot = vec3RotCombine(parentRot, t.rot ?? vec3Zero);
 
-  const textForward = vec3Rot(
-      { x: 0, y: 0, z: 1 },
-      vec3Zero,
-      rot,
-  );
+  const textForward = vec3Rot({ x: 0, y: 0, z: 1 }, vec3Zero, rot);
 
   //discard texts that are pointing away
-  if(vec3Dot(textForward, SVG_FORWARD) <= SVG_DOT_OPPOSITE_THRESHOLD) {
+  if (vec3Dot(textForward, SVG_FORWARD) <= SVG_DOT_OPPOSITE_THRESHOLD) {
     return [];
   }
 

package/src/renderers/svg/svg.ts

@@ -1,31 +1,22 @@
 import { exhaustiveCheck } from "ts-exhaustive-check";
+import type { Scene, Vec3, Mesh, Vec2, Group, Material, Bounds2 } from "../../abstract-3d.js";
 import {
   vec2,
-  Scene,
-  Vec3,
-  Mesh,
   vec3Rot,
   vec3Zero,
   vec3RotCombine,
   vec3,
-  Vec2,
-  Group,
   vec3TransRot,
-  Material,
   rotationForCameraPos,
   sizeBoundsForCameraPos,
-  Bounds2,
   bounds2FromPosAndSize,
   bounds2ToSize,
   bounds2Merge,
   vec2Zero,
   vec3Flip,
-  vec2Add,
-  View,
-  vec3RotInverse,
   dimensionConvertToTypeMesh,
 } from "../../abstract-3d.js";
-import { SvgOptions, zOrderElement } from "./svg-geometries/shared.js";
+import type { SvgOptions, zOrderElement } from "./svg-geometries/shared.js";
 import { box } from "./svg-geometries/svg-box.js";
 import { cylinder } from "./svg-geometries/svg-cylinder.js";
 import { line } from "./svg-geometries/svg-line.js";
@@ -34,7 +25,8 @@ import { shape } from "./svg-geometries/svg-shape.js";
 import { polygon } from "./svg-geometries/svg-polygon.js";
 import { text } from "./svg-geometries/svg-text.js";
 import { cone } from "./svg-geometries/svg-cone.js";
-import { calculateVisibleViews, isViewVisible, Optional } from "../../utils.js";
+import type { Optional } from "../../utils.js";
+import { calculateVisibleViews, isViewVisible } from "../../utils.js";
 import { svg } from "./svg-encoding.js";
 import { image } from "./svg-geometries/svg-image.js";
 
@@ -114,13 +106,17 @@ function renderInternal(
   }
   const dimOpts: SvgOptions = { ...opts, only_stroke: false, gray_scale: false };
   elements.sort((a, b) => a.zOrder - b.zOrder);
-	const visibleViews = calculateVisibleViews(opts.view, scene.rotation_deprecated);
+  const visibleViews = calculateVisibleViews(opts.view, scene.rotation_deprecated);
 
   for (const dim of scene.dimensions_deprecated?.dimensions ?? []) {
-    const d = dimensionConvertToTypeMesh(dim, scene.rotation_deprecated ?? vec3Zero, scene.dimensions_deprecated?.material);
-    if(isViewVisible(d.views[0], visibleViews)) {
+    const d = dimensionConvertToTypeMesh(
+      dim,
+      scene.rotation_deprecated ?? vec3Zero,
+      scene.dimensions_deprecated?.material
+    );
+    if (isViewVisible(d.views[0], visibleViews)) {
       const pos = vec3TransRot(d.pos, unitCenterFlipped, unitRot);
-			const rot = vec3RotCombine(unitRot, d.rot);
+      const rot = vec3RotCombine(unitRot, d.rot);
       for (const m of d.meshes) {
         elements.push(...svgMesh(m, pos, rot, point, scene.dimensions_deprecated?.material ?? { normal: "" }, dimOpts));
       }
@@ -182,4 +178,4 @@ function svgMesh(
     default:
       return exhaustiveCheck(mesh.geometry);
   }
-}
+}

package/src/utils.ts

@@ -1,6 +1,5 @@
-/* eslint-disable @typescript-eslint/no-unused-expressions */
-
-import { vec3, Vec3, vec3Rot, vec3Zero, View } from "./abstract-3d.js";
+import type { Vec3, View } from "./abstract-3d.js";
+import { vec3, vec3Rot, vec3Zero } from "./abstract-3d.js";
 
 // dummy
 export function parseRgb(color: string): { readonly r: number; readonly g: number; readonly b: number } {
@@ -141,10 +140,10 @@ export function shade(p: number, from: string, to?: string): string | undefined
       (f[3]! > -1 && t[3]! > -1
         ? r(((t[3]! - f[3]!) * p + f[3]!) * 255)
         : t[3]! > -1
-        ? r(t[3]! * 255)
-        : f[3]! > -1
-        ? r(f[3]! * 255)
-        : 255)
+          ? r(t[3]! * 255)
+          : f[3]! > -1
+            ? r(f[3]! * 255)
+            : 255)
     )
       .toString(16)
       .slice(1, f[3]! > -1 || t[3]! > -1 ? undefined : -2)
@@ -153,35 +152,31 @@ export function shade(p: number, from: string, to?: string): string | undefined
 
 export function calculateVisibleViews(originalView: View, sceneRotation: Vec3 | undefined): Record<string, boolean> {
   const cameraPositionForView = (view: View): Vec3 => {
-		switch (view) {
-			case "front":
-				return vec3(0, 0, 1);
-			case "back":
-				return vec3(0, 0, -1);
-			case "top":
-				return vec3(0, 1, 0);
-			case "bottom":
-				return vec3(0, -1, 0);
-			case "right":
-				return vec3(1, 0, 0);
-			case "left":
-				return vec3(-1, 0, 0);
+    switch (view) {
+      case "front":
+        return vec3(0, 0, 1);
+      case "back":
+        return vec3(0, 0, -1);
+      case "top":
+        return vec3(0, 1, 0);
+      case "bottom":
+        return vec3(0, -1, 0);
+      case "right":
+        return vec3(1, 0, 0);
+      case "left":
+        return vec3(-1, 0, 0);
       default:
         return vec3(0, 0, 1);
-		}
-	};
+    }
+  };
 
-	const cam = vec3Rot(
-		cameraPositionForView(originalView),
-		vec3Zero,
-		sceneRotation ?? vec3Zero
-	);
+  const cam = vec3Rot(cameraPositionForView(originalView), vec3Zero, sceneRotation ?? vec3Zero);
 
   return {
-  	[cam.x >= 0 ? "right" : "left"]: originalView === "right" || originalView === "left",
-		[cam.y >= 0 ? "top" : "bottom"]: originalView === "top"   || originalView === "bottom",
-		[cam.z >= 0 ? "front" : "back"]: originalView === "front" || originalView === "back",
-	};
+    [cam.x >= 0 ? "right" : "left"]: originalView === "right" || originalView === "left",
+    [cam.y >= 0 ? "top" : "bottom"]: originalView === "top" || originalView === "bottom",
+    [cam.z >= 0 ? "front" : "back"]: originalView === "front" || originalView === "back",
+  };
 }
 
 export function isViewVisible(view: View | undefined, visibleViews: Record<string, boolean>): boolean {