abstract-3d 0.9.0 → 0.9.2

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

@@ -1,5 +1,5 @@
 import { Polygon, vec3ZMean, Vec3, Vec2, vec3TransRot, vec3RotCombine, vec3Zero } from "../../../abstract-3d.js";
-import { gray, zElem, zOrderElement, transparent } from "./shared.js";
+import { gray, zElem, zOrderElement, transparent, SvgOptions } from "./shared.js";
 import { svgPolygon } from "../svg-encoding.js";
 import { rgbGrayScale } from "../../shared.js";
 
@@ -7,10 +7,7 @@ export function polygon(
   p: Polygon,
   point: (x: number, y: number) => Vec2,
   color: string,
-  onlyStroke: boolean | undefined,
-  grayScale: boolean | undefined,
-  onlyStrokeFill: string,
-  stroke: number,
+  opts: SvgOptions,
   parentPos: Vec3,
   parentRot: Vec3
 ): ReadonlyArray<zOrderElement> {
@@ -18,8 +15,8 @@ export function polygon(
   const rot = vec3RotCombine(parentRot, p.rot ?? vec3Zero);
   const rotatedPoints = p.points.map((p) => vec3TransRot(p, pos, rot));
   const points = rotatedPoints.map(({ x, y }) => point(x, y));
-  const [strokeColor, fill, strokeThickness] = onlyStroke
-    ? [grayScale ? gray : color, onlyStrokeFill, stroke]
-    : [transparent, grayScale ? rgbGrayScale(color) : color, 0];
+  const [strokeColor, fill, strokeThickness] = opts.onlyStroke
+    ? [opts.grayScale ? gray : color, opts.onlyStrokeFill, opts.stroke]
+    : [transparent, opts.grayScale ? rgbGrayScale(color) : color, 0];
   return [zElem(svgPolygon(points, fill, strokeColor, strokeThickness), vec3ZMean(...rotatedPoints))];
 }

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

@@ -1,5 +1,5 @@
 import { vec3ZMean, Vec3, Vec2, vec3TransRot, vec3RotCombine, Shape, vec3, vec3Zero } from "../../../abstract-3d.js";
-import { gray, zElem, zOrderElement, transparent } from "./shared.js";
+import { gray, zElem, zOrderElement, transparent, SvgOptions } from "./shared.js";
 import { svgPolygon } from "../svg-encoding.js";
 import { rgbGrayScale } from "../../shared.js";
 
@@ -7,10 +7,7 @@ export function shape(
   s: Shape,
   point: (x: number, y: number) => Vec2,
   color: string,
-  onlyStroke: boolean | undefined,
-  grayScale: boolean | undefined,
-  onlyStrokeFill: string,
-  _stroke: number,
+  opts: SvgOptions,
   parentPos: Vec3,
   parentRot: Vec3
 ): ReadonlyArray<zOrderElement> {
@@ -18,8 +15,8 @@ export function shape(
   const rot = vec3RotCombine(parentRot, s.rot ?? vec3Zero);
   const rotatedPoints = s.points.map((p) => vec3TransRot(vec3(p.x, p.y, 0), pos, rot));
   const points = rotatedPoints.map(({ x, y }) => point(x, y));
-  const [strokeColor, fill] = onlyStroke
-    ? [grayScale ? gray : color, onlyStrokeFill]
-    : [transparent, grayScale ? rgbGrayScale(color) : color];
+  const [strokeColor, fill] = opts.onlyStroke
+    ? [opts.grayScale ? gray : color, opts.onlyStrokeFill]
+    : [transparent, opts.grayScale ? rgbGrayScale(color) : color];
   return [zElem(svgPolygon(points, fill, strokeColor, 0), vec3ZMean(...rotatedPoints))];
 }

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

@@ -1,5 +1,5 @@
 import { Text, Vec2, Vec3, vec3TransRot, vec3RotCombine, vec3Zero } from "../../../abstract-3d.js";
-import { zElem, zOrderElement } from "./shared.js";
+import { SvgOptions, zElem, zOrderElement } from "./shared.js";
 import { svgText } from "../svg-encoding.js";
 
 // dummy
@@ -7,10 +7,10 @@ export function text(
   t: Text,
   point: (x: number, y: number) => Vec2,
   fill: string,
+  opts: SvgOptions,
   parentPos: Vec3,
   parentRot: Vec3,
-  factor: number,
-  font: string
+  factor: number
 ): ReadonlyArray<zOrderElement> {
   const pos = vec3TransRot(t.pos, parentPos, parentRot);
   const rot = vec3RotCombine(parentRot, t.rot ?? vec3Zero);
@@ -19,7 +19,7 @@ export function text(
   const strings = t.text.split("\n");
   let posY = strings.length === 1 ? 0 : (fontSize * strings.length - fontSize) / 2;
   for (const s of strings) {
-    texts.push(zElem(svgText(point(pos.x, pos.y + posY), s, 0, fill, font, fontSize), pos.z));
+    texts.push(zElem(svgText(point(pos.x, pos.y + posY), s, 0, fill, opts.font, fontSize), pos.z));
     posY -= fontSize * 1.2;
   }
 

package/src/renderers/svg/svg.ts

@@ -15,7 +15,7 @@ import {
   vec3TransRot,
   Material,
 } from "../../abstract-3d.js";
-import { ImageDataUri, zOrderElement } from "./svg-geometries/shared.js";
+import { 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";
@@ -24,73 +24,62 @@ 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 { rotationForCameraPos, sizeCenterForCameraPos } from "../shared.js";
+import { Optional, rotationForCameraPos, sizeCenterForCameraPos } from "../shared.js";
 import { svg } from "./svg-encoding.js";
 
 export function toSvg(
   scene: Scene,
-  view: View,
-  stroke: number,
-  scale?: { readonly size: number; readonly scaleByWidth: boolean },
-  onlyStroke?: boolean,
-  grayScale?: boolean,
-  onlyStrokeFill: string = "rgba(255,255,255,0)",
-  font: string = "",
-  imageDataByUrl?: Record<string, ImageDataUri>,
-  rotation?: number
+  options: Optional<SvgOptions>
 ): { readonly image: string; readonly width: number; readonly height: number } {
-  const factor = scale
-    ? scale.size /
-      (scale.scaleByWidth
-        ? view === "right" || view === "left"
+  const opts: SvgOptions = {
+    view: options.view ?? "front",
+    stroke: options.stroke ?? 2,
+    scale: options.scale ?? undefined,
+    onlyStroke: options.onlyStroke ?? false,
+    grayScale: options.grayScale ?? false,
+    onlyStrokeFill: options.onlyStrokeFill ?? "rgba(255,255,255,0)",
+    font: options.font ?? "",
+    imageDataByUrl: options.imageDataByUrl ?? {},
+    rotation: options.rotation ?? 0,
+  };
+
+  const factor = opts.scale
+    ? opts.scale.size /
+      (opts.scale.scaleByWidth
+        ? opts.view === "right" || opts.view === "left"
           ? scene.size_deprecated.z
           : scene.size_deprecated.x
-        : view === "top" || view === "bottom"
+        : opts.view === "top" || opts.view === "bottom"
         ? scene.size_deprecated.z
         : scene.size_deprecated.y)
     : 1;
-  const baseRot = vec3RotCombine(rotationForCameraPos(view), scene.rotation_deprecated ?? vec3Zero);
-  const unitRot = rotation ? vec3RotCombine(vec3(0, 0, (rotation * Math.PI) / 180), baseRot) : baseRot;
+  const baseRot = vec3RotCombine(rotationForCameraPos(opts.view), scene.rotation_deprecated ?? vec3Zero);
+  const unitRot = opts.rotation ? vec3RotCombine(vec3(0, 0, (opts.rotation * Math.PI) / 180), baseRot) : baseRot;
 
   const unitPos = vec3Rot(scene.center_deprecated ?? vec3Zero, vec3Zero, scene.rotation_deprecated ?? vec3Zero);
   const [size, center] = sizeCenterForCameraPos(scene.size_deprecated, unitPos, unitRot, factor);
   const unitHalfSize = vec3Scale(size, 0.5);
-  const centerAdj = vec3(center.x - stroke * 0.75, center.y + stroke * 0.75, center.z);
-  const width = size.x + 1.5 * stroke;
-  const height = size.y + 1.5 * stroke;
+  const centerAdj = vec3(center.x - opts.stroke * 0.75, center.y + opts.stroke * 0.75, center.z);
+  const width = size.x + 1.5 * opts.stroke;
+  const height = size.y + 1.5 * opts.stroke;
   const elements = Array<zOrderElement>();
   const point = (x: number, y: number): Vec2 =>
     vec2(-centerAdj.x + unitHalfSize.x + x * factor, centerAdj.y + unitHalfSize.y - y * factor);
   for (const g of scene.groups) {
     const pos = vec3Rot(g.pos, unitPos, unitRot);
     const rot = vec3RotCombine(unitRot, g.rot ?? vec3Zero);
-    elements.push(
-      ...svgGroup(g, pos, rot, point, view, factor, onlyStroke, grayScale, onlyStrokeFill, font, stroke, imageDataByUrl)
-    );
+    elements.push(...svgGroup(g, pos, rot, point, factor, opts));
   }
+  const dimOpts: SvgOptions = { ...opts, onlyStroke: false, grayScale: false };
   elements.sort((a, b) => a.zOrder - b.zOrder);
   const cameraPos = vec3Rot(vec3(1, 1, 1), vec3Zero, scene.rotation_deprecated ?? vec3Zero);
   for (const d of scene.dimensions_deprecated?.dimensions ?? []) {
-    if (flipViews(d.views[0], cameraPos) === view) {
+    if (flipViews(d.views[0], cameraPos) === opts.view) {
       const pos = vec3Rot(d.pos, unitPos, unitRot);
       const rot = vec3RotCombine(unitRot, d.rot);
       for (const m of d.meshes) {
         elements.push(
-          ...svgMesh(
-            m,
-            pos,
-            rot,
-            point,
-            view,
-            factor,
-            scene.dimensions_deprecated?.material ?? { normal: "" },
-            false,
-            false,
-            onlyStrokeFill,
-            font,
-            stroke,
-            imageDataByUrl
-          )
+          ...svgMesh(m, pos, rot, point, factor, scene.dimensions_deprecated?.material ?? { normal: "" }, dimOpts)
         );
       }
     }
@@ -109,55 +98,17 @@ function svgGroup(
   pos: Vec3,
   rot: Vec3,
   point: (x: number, y: number) => Vec2,
-  view: View,
   factor: number,
-  onlyStroke: boolean | undefined,
-  grayScale: boolean | undefined,
-  onlyStrokeFill: string,
-  font: string,
-  stroke: number,
-  imageDataByUrl: Record<string, ImageDataUri> | undefined
+  opts: SvgOptions
 ): ReadonlyArray<zOrderElement> {
   const elements = Array<zOrderElement>();
-
   for (const m of g.meshes ?? []) {
-    elements.push(
-      ...svgMesh(
-        m,
-        pos,
-        rot,
-        point,
-        view,
-        factor,
-        m.material,
-        onlyStroke,
-        grayScale,
-        onlyStrokeFill,
-        font,
-        stroke,
-        imageDataByUrl
-      )
-    );
+    elements.push(...svgMesh(m, pos, rot, point, factor, m.material, opts));
   }
   for (const sg of g.groups ?? []) {
     const sPos = vec3TransRot(sg.pos, pos, rot);
     const sRot = vec3RotCombine(rot, sg.rot ?? vec3Zero);
-    elements.push(
-      ...svgGroup(
-        sg,
-        sPos,
-        sRot,
-        point,
-        view,
-        factor,
-        onlyStroke,
-        grayScale,
-        onlyStrokeFill,
-        font,
-        stroke,
-        imageDataByUrl
-      )
-    );
+    elements.push(...svgGroup(sg, sPos, sRot, point, factor, opts));
   }
   return elements;
 }
@@ -167,57 +118,28 @@ function svgMesh(
   parentPos: Vec3,
   parentRot: Vec3,
   point: (x: number, y: number) => Vec2,
-  view: View,
   factor: number,
   material: Material,
-  onlyStroke: boolean | undefined,
-  grayScale: boolean | undefined,
-  background: string,
-  font: string,
-  stroke: number,
-  imageDataByUrl: Record<string, ImageDataUri> | undefined
+  opts: SvgOptions
 ): ReadonlyArray<zOrderElement> {
   const color = material.normal;
   switch (mesh.geometry.type) {
     case "Box":
-      return box(mesh.geometry, point, color, onlyStroke, grayScale, stroke, background, parentPos, parentRot);
+      return box(mesh.geometry, point, color, opts, parentPos, parentRot);
     case "Plane":
-      return plane(
-        mesh.geometry,
-        point,
-        material,
-        onlyStroke,
-        grayScale,
-        stroke,
-        background,
-        parentPos,
-        parentRot,
-        view,
-        imageDataByUrl
-      );
+      return plane(mesh.geometry, point, material, opts, parentPos, parentRot);
     case "Cylinder":
-      return cylinder(
-        mesh.geometry,
-        point,
-        color,
-        onlyStroke,
-        grayScale,
-        stroke,
-        background,
-        parentPos,
-        parentRot,
-        factor
-      );
+      return cylinder(mesh.geometry, point, color, opts, parentPos, parentRot, factor);
     case "Cone":
-      return cone(mesh.geometry, point, color, onlyStroke, grayScale, stroke, background, parentPos, parentRot, factor);
+      return cone(mesh.geometry, point, color, opts, parentPos, parentRot, factor);
     case "Line":
-      return line(mesh.geometry, point, color, grayScale, stroke, parentPos, parentRot);
+      return line(mesh.geometry, point, color, opts, parentPos, parentRot);
     case "Polygon":
-      return polygon(mesh.geometry, point, color, onlyStroke, grayScale, background, stroke, parentPos, parentRot);
+      return polygon(mesh.geometry, point, color, opts, parentPos, parentRot);
     case "Shape":
-      return shape(mesh.geometry, point, color, onlyStroke, grayScale, background, stroke, parentPos, parentRot);
+      return shape(mesh.geometry, point, color, opts, parentPos, parentRot);
     case "Text":
-      return text(mesh.geometry, point, color, parentPos, parentRot, factor, font);
+      return text(mesh.geometry, point, color, opts, parentPos, parentRot, factor);
     case "Tube":
     case "Sphere":
       return [];