abstract-3d 0.9.0 → 0.9.2

package/lib/renderers/svg/svg-geometries/svg-shape.d.ts

@@ -1,4 +1,4 @@
 import { Vec3, Vec2, Shape } from "../../../abstract-3d.js";
-import { zOrderElement } from "./shared.js";
-export declare function shape(s: Shape, point: (x: number, y: number) => Vec2, color: string, onlyStroke: boolean | undefined, grayScale: boolean | undefined, onlyStrokeFill: string, _stroke: number, parentPos: Vec3, parentRot: Vec3): ReadonlyArray<zOrderElement>;
+import { zOrderElement, SvgOptions } from "./shared.js";
+export declare function shape(s: Shape, point: (x: number, y: number) => Vec2, color: string, opts: SvgOptions, parentPos: Vec3, parentRot: Vec3): ReadonlyArray<zOrderElement>;
 //# sourceMappingURL=svg-shape.d.ts.map

package/lib/renderers/svg/svg-geometries/svg-shape.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"svg-shape.d.ts","sourceRoot":"","sources":["../../../../src/renderers/svg/svg-geometries/svg-shape.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,IAAI,EAAE,IAAI,EAAgC,KAAK,EAAkB,MAAM,yBAAyB,CAAC;AACrH,OAAO,EAAe,aAAa,EAAe,MAAM,aAAa,CAAC;AAItE,wBAAgB,KAAK,CACnB,CAAC,EAAE,KAAK,EACR,KAAK,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,IAAI,EACrC,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,OAAO,GAAG,SAAS,EAC/B,SAAS,EAAE,OAAO,GAAG,SAAS,EAC9B,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,IAAI,EACf,SAAS,EAAE,IAAI,GACd,aAAa,CAAC,aAAa,CAAC,CAS9B"}
+{"version":3,"file":"svg-shape.d.ts","sourceRoot":"","sources":["../../../../src/renderers/svg/svg-geometries/svg-shape.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,IAAI,EAAE,IAAI,EAAgC,KAAK,EAAkB,MAAM,yBAAyB,CAAC;AACrH,OAAO,EAAe,aAAa,EAAe,UAAU,EAAE,MAAM,aAAa,CAAC;AAIlF,wBAAgB,KAAK,CACnB,CAAC,EAAE,KAAK,EACR,KAAK,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,IAAI,EACrC,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,IAAI,EACf,SAAS,EAAE,IAAI,GACd,aAAa,CAAC,aAAa,CAAC,CAS9B"}

package/lib/renderers/svg/svg-geometries/svg-shape.js

@@ -2,14 +2,14 @@ import { vec3ZMean, vec3TransRot, vec3RotCombine, vec3, vec3Zero } from "../../.
 import { gray, zElem, transparent } from "./shared.js";
 import { svgPolygon } from "../svg-encoding.js";
 import { rgbGrayScale } from "../../shared.js";
-export function shape(s, point, color, onlyStroke, grayScale, onlyStrokeFill, _stroke, parentPos, parentRot) {
+export function shape(s, point, color, opts, parentPos, parentRot) {
     const pos = vec3TransRot(s.pos, parentPos, parentRot);
     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))];
 }
 //# sourceMappingURL=svg-shape.js.map

package/lib/renderers/svg/svg-geometries/svg-shape.js.map

@@ -1 +1 @@
-{"version":3,"file":"svg-shape.js","sourceRoot":"","sources":["../../../../src/renderers/svg/svg-geometries/svg-shape.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAc,YAAY,EAAE,cAAc,EAAS,IAAI,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACrH,OAAO,EAAE,IAAI,EAAE,KAAK,EAAiB,WAAW,EAAE,MAAM,aAAa,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,MAAM,UAAU,KAAK,CACnB,CAAQ,EACR,KAAqC,EACrC,KAAa,EACb,UAA+B,EAC/B,SAA8B,EAC9B,cAAsB,EACtB,OAAe,EACf,SAAe,EACf,SAAe;IAEf,MAAM,GAAG,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;IACtD,MAAM,GAAG,GAAG,cAAc,CAAC,SAAS,EAAE,CAAC,CAAC,GAAG,IAAI,QAAQ,CAAC,CAAC;IACzD,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IACrF,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5D,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,GAAG,UAAU;QACpC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,cAAc,CAAC;QAC5C,CAAC,CAAC,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAC3D,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC,EAAE,SAAS,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;AACxF,CAAC"}
+{"version":3,"file":"svg-shape.js","sourceRoot":"","sources":["../../../../src/renderers/svg/svg-geometries/svg-shape.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAc,YAAY,EAAE,cAAc,EAAS,IAAI,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACrH,OAAO,EAAE,IAAI,EAAE,KAAK,EAAiB,WAAW,EAAc,MAAM,aAAa,CAAC;AAClF,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,MAAM,UAAU,KAAK,CACnB,CAAQ,EACR,KAAqC,EACrC,KAAa,EACb,IAAgB,EAChB,SAAe,EACf,SAAe;IAEf,MAAM,GAAG,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;IACtD,MAAM,GAAG,GAAG,cAAc,CAAC,SAAS,EAAE,CAAC,CAAC,GAAG,IAAI,QAAQ,CAAC,CAAC;IACzD,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IACrF,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5D,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU;QACzC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,cAAc,CAAC;QACtD,CAAC,CAAC,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAChE,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC,EAAE,SAAS,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;AACxF,CAAC"}

package/lib/renderers/svg/svg-geometries/svg-text.d.ts

@@ -1,4 +1,4 @@
 import { Text, Vec2, Vec3 } from "../../../abstract-3d.js";
-import { zOrderElement } from "./shared.js";
-export declare function text(t: Text, point: (x: number, y: number) => Vec2, fill: string, parentPos: Vec3, parentRot: Vec3, factor: number, font: string): ReadonlyArray<zOrderElement>;
+import { SvgOptions, zOrderElement } from "./shared.js";
+export declare function text(t: Text, point: (x: number, y: number) => Vec2, fill: string, opts: SvgOptions, parentPos: Vec3, parentRot: Vec3, factor: number): ReadonlyArray<zOrderElement>;
 //# sourceMappingURL=svg-text.d.ts.map

package/lib/renderers/svg/svg-geometries/svg-text.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"svg-text.d.ts","sourceRoot":"","sources":["../../../../src/renderers/svg/svg-geometries/svg-text.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAA0C,MAAM,yBAAyB,CAAC;AACnG,OAAO,EAAS,aAAa,EAAE,MAAM,aAAa,CAAC;AAInD,wBAAgB,IAAI,CAClB,CAAC,EAAE,IAAI,EACP,KAAK,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,IAAI,EACrC,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,IAAI,EACf,SAAS,EAAE,IAAI,EACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,GACX,aAAa,CAAC,aAAa,CAAC,CAa9B"}
+{"version":3,"file":"svg-text.d.ts","sourceRoot":"","sources":["../../../../src/renderers/svg/svg-geometries/svg-text.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAA0C,MAAM,yBAAyB,CAAC;AACnG,OAAO,EAAE,UAAU,EAAS,aAAa,EAAE,MAAM,aAAa,CAAC;AAI/D,wBAAgB,IAAI,CAClB,CAAC,EAAE,IAAI,EACP,KAAK,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,IAAI,EACrC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,IAAI,EACf,SAAS,EAAE,IAAI,EACf,MAAM,EAAE,MAAM,GACb,aAAa,CAAC,aAAa,CAAC,CAa9B"}

package/lib/renderers/svg/svg-geometries/svg-text.js

@@ -2,7 +2,7 @@ import { vec3TransRot, vec3RotCombine, vec3Zero } from "../../../abstract-3d.js"
 import { zElem } from "./shared.js";
 import { svgText } from "../svg-encoding.js";
 // dummy
-export function text(t, point, fill, parentPos, parentRot, factor, font) {
+export function text(t, point, fill, opts, parentPos, parentRot, factor) {
     const pos = vec3TransRot(t.pos, parentPos, parentRot);
     const rot = vec3RotCombine(parentRot, t.rot ?? vec3Zero);
     const texts = Array();
@@ -10,7 +10,7 @@ export function text(t, point, fill, parentPos, parentRot, factor, font) {
     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;
     }
     return texts;

package/lib/renderers/svg/svg-geometries/svg-text.js.map

@@ -1 +1 @@
-{"version":3,"file":"svg-text.js","sourceRoot":"","sources":["../../../../src/renderers/svg/svg-geometries/svg-text.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,YAAY,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnG,OAAO,EAAE,KAAK,EAAiB,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,QAAQ;AACR,MAAM,UAAU,IAAI,CAClB,CAAO,EACP,KAAqC,EACrC,IAAY,EACZ,SAAe,EACf,SAAe,EACf,MAAc,EACd,IAAY;IAEZ,MAAM,GAAG,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;IACtD,MAAM,GAAG,GAAG,cAAc,CAAC,SAAS,EAAE,CAAC,CAAC,GAAG,IAAI,QAAQ,CAAC,CAAC;IACzD,MAAM,KAAK,GAAG,KAAK,EAAiB,CAAC;IACrC,MAAM,QAAQ,GAAG,CAAC,CAAC,QAAQ,GAAG,MAAM,CAAC;IACrC,MAAM,OAAO,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACnC,IAAI,IAAI,GAAG,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,OAAO,CAAC,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;IACjF,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;QACxB,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1F,IAAI,IAAI,QAAQ,GAAG,GAAG,CAAC;IACzB,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}
+{"version":3,"file":"svg-text.js","sourceRoot":"","sources":["../../../../src/renderers/svg/svg-geometries/svg-text.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,YAAY,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnG,OAAO,EAAc,KAAK,EAAiB,MAAM,aAAa,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,QAAQ;AACR,MAAM,UAAU,IAAI,CAClB,CAAO,EACP,KAAqC,EACrC,IAAY,EACZ,IAAgB,EAChB,SAAe,EACf,SAAe,EACf,MAAc;IAEd,MAAM,GAAG,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;IACtD,MAAM,GAAG,GAAG,cAAc,CAAC,SAAS,EAAE,CAAC,CAAC,GAAG,IAAI,QAAQ,CAAC,CAAC;IACzD,MAAM,KAAK,GAAG,KAAK,EAAiB,CAAC;IACrC,MAAM,QAAQ,GAAG,CAAC,CAAC,QAAQ,GAAG,MAAM,CAAC;IACrC,MAAM,OAAO,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACnC,IAAI,IAAI,GAAG,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,OAAO,CAAC,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;IACjF,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;QACxB,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/F,IAAI,IAAI,QAAQ,GAAG,GAAG,CAAC;IACzB,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}

package/lib/renderers/svg/svg.d.ts

@@ -1,9 +1,7 @@
-import { Scene, View } from "../../abstract-3d.js";
-import { ImageDataUri } from "./svg-geometries/shared.js";
-export declare function toSvg(scene: Scene, view: View, stroke: number, scale?: {
-    readonly size: number;
-    readonly scaleByWidth: boolean;
-}, onlyStroke?: boolean, grayScale?: boolean, onlyStrokeFill?: string, font?: string, imageDataByUrl?: Record<string, ImageDataUri>, rotation?: number): {
+import { Scene } from "../../abstract-3d.js";
+import { SvgOptions } from "./svg-geometries/shared.js";
+import { Optional } from "../shared.js";
+export declare function toSvg(scene: Scene, options: Optional<SvgOptions>): {
     readonly image: string;
     readonly width: number;
     readonly height: number;

package/lib/renderers/svg/svg.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"svg.d.ts","sourceRoot":"","sources":["../../../src/renderers/svg/svg.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,EACL,IAAI,EAWL,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,YAAY,EAAiB,MAAM,4BAA4B,CAAC;AAYzE,wBAAgB,KAAK,CACnB,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,EACd,KAAK,CAAC,EAAE;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAA;CAAE,EACjE,UAAU,CAAC,EAAE,OAAO,EACpB,SAAS,CAAC,EAAE,OAAO,EACnB,cAAc,GAAE,MAA8B,EAC9C,IAAI,GAAE,MAAW,EACjB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,EAC7C,QAAQ,CAAC,EAAE,MAAM,GAChB;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAgE7E"}
+{"version":3,"file":"svg.d.ts","sourceRoot":"","sources":["../../../src/renderers/svg/svg.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,EAYN,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,UAAU,EAAiB,MAAM,4BAA4B,CAAC;AASvE,OAAO,EAAE,QAAQ,EAAgD,MAAM,cAAc,CAAC;AAGtF,wBAAgB,KAAK,CACnB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,GAC5B;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CA6D7E"}

package/lib/renderers/svg/svg.js

@@ -10,77 +10,89 @@ import { text } from "./svg-geometries/svg-text.js";
 import { cone } from "./svg-geometries/svg-cone.js";
 import { rotationForCameraPos, sizeCenterForCameraPos } from "../shared.js";
 import { svg } from "./svg-encoding.js";
-export function toSvg(scene, view, stroke, scale, onlyStroke, grayScale, onlyStrokeFill = "rgba(255,255,255,0)", font = "", imageDataByUrl, rotation) {
-    const factor = scale
-        ? scale.size /
-            (scale.scaleByWidth
-                ? view === "right" || view === "left"
+export function toSvg(scene, options) {
+    const opts = {
+        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();
     const point = (x, y) => 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 = { ...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));
+                elements.push(...svgMesh(m, pos, rot, point, factor, scene.dimensions_deprecated?.material ?? { normal: "" }, dimOpts));
             }
         }
     }
     const image = svg(width, height, elements.reduce((a, { element }) => `${a} ${element}`, ""));
     return { image, width, height };
 }
-function svgGroup(g, pos, rot, point, view, factor, onlyStroke, grayScale, onlyStrokeFill, font, stroke, imageDataByUrl) {
+function svgGroup(g, pos, rot, point, factor, opts) {
     const elements = Array();
     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;
 }
-function svgMesh(mesh, parentPos, parentRot, point, view, factor, material, onlyStroke, grayScale, background, font, stroke, imageDataByUrl) {
+function svgMesh(mesh, parentPos, parentRot, point, factor, material, opts) {
     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 [];

package/lib/renderers/svg/svg.js.map

@@ -1 +1 @@
-{"version":3,"file":"svg.js","sourceRoot":"","sources":["../../../src/renderers/svg/svg.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"svg.js","sourceRoot":"","sources":["../../../src/renderers/svg/svg.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abstract-3d",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "description": "Abstract 3D",
   "author": "Divid AB <info@divid.se>",
   "repository": "https://github.com/dividab/abstract-visuals/tree/master/packages/abstract-3d",
@@ -33,5 +33,5 @@
     "@types/three": "^0.174.0",
     "react": "^19.0.0"
   },
-  "gitHead": "be91668b1cef7bf6944910322f284e49cc4148c3"
+  "gitHead": "f9b3196bf3c739a34f254763cf7021c2dfadc3bc"
 }

package/src/renderers/dxf/dxf.ts

@@ -5,18 +5,25 @@ import { dxfBox } from "./dxf-geometries/dxf-box.js";
 import { dxfCylinder } from "./dxf-geometries/dxf-cylinder.js";
 import { dxfCone } from "./dxf-geometries/dxf-cone.js";
 import { dxfPolygon } from "./dxf-geometries/dxf-polygon.js";
-import { rotationForCameraPos, sizeCenterForCameraPos } from "../shared.js";
+import { Optional, rotationForCameraPos, sizeCenterForCameraPos } from "../shared.js";
 
-export const toDxf = (scene: Scene, view: View): string => {
-  const unitRot = vec3RotCombine(rotationForCameraPos(view), scene.rotation_deprecated ?? vec3Zero);
+export type DxfOptions = { readonly view: View };
+
+export const toDxf = (scene: Scene, options: Optional<DxfOptions>): string => {
+  const opts: DxfOptions = { view: options.view ?? "front" };
+  const unitRot = vec3RotCombine(rotationForCameraPos(opts.view), scene.rotation_deprecated ?? vec3Zero);
   const rotatedCenter = vec3Rot(scene.center_deprecated ?? vec3Zero, vec3Zero, scene.rotation_deprecated ?? vec3Zero);
   const [size, center] = sizeCenterForCameraPos(scene.size_deprecated, rotatedCenter, vec3Zero, 1);
   const id = "D171D";
-  const handleRef = {handle: 0x1000}; //make sure we start with a value higher than any other handle id's used in the header
-  return dxfHeader(size, center, id) + scene.groups.reduce((a, c) => a + dxfGroup(c, center, unitRot, handleRef), "") + dxfFooter(id);
+  const handleRef = { handle: 0x1000 }; //make sure we start with a value higher than any other handle id's used in the header
+  return (
+    dxfHeader(size, center, id) +
+    scene.groups.reduce((a, c) => a + dxfGroup(c, center, unitRot, handleRef), "") +
+    dxfFooter(id)
+  );
 };
 
-function dxfGroup(g: Group, parentPos: Vec3, parentRot: Vec3, handleRef: {handle: number}): string {
+function dxfGroup(g: Group, parentPos: Vec3, parentRot: Vec3, handleRef: { handle: number }): string {
   const pos = vec3TransRot(g.pos, parentPos, parentRot);
   const rot = vec3RotCombine(parentRot, g.rot ?? vec3Zero);
   return (
@@ -43,4 +50,4 @@ function dxfGroup(g: Group, parentPos: Vec3, parentRot: Vec3, handleRef: {handle
       }
     }, "") ?? "") + g.groups?.reduce((a, c) => a + dxfGroup(c, pos, rot, handleRef), "")
   );
-}
+}

package/src/renderers/react/react-scene.tsx

@@ -12,6 +12,7 @@ export interface ReactPopover {
   readonly pos: Vec3;
   readonly content: React.ReactNode;
 }
+export type SceneMouseEvent = ThreeEvent<MouseEvent>;
 
 export function ReactScene({
   scene,
@@ -45,13 +46,13 @@ export function ReactScene({
     id: string | undefined,
     rootData: Record<string, string> | undefined,
     data: Record<string, string> | undefined,
-    e: ThreeEvent<MouseEvent>
+    e: SceneMouseEvent
   ) => void;
   readonly onHoverGroup?: (
     id: string | undefined,
     rootData: Record<string, string> | undefined,
     data: Record<string, string> | undefined,
-    e: ThreeEvent<MouseEvent>
+    e: SceneMouseEvent
   ) => void;
   readonly onContextMenuGroup?: (
     id: string,
@@ -59,9 +60,9 @@ export function ReactScene({
     data: Record<string, string> | undefined,
     left: number,
     top: number,
-    e: ThreeEvent<MouseEvent>
+    e: SceneMouseEvent
   ) => void;
-  readonly onClickHotSpot?: (hotSpot: HotSpotInfo, e: ThreeEvent<MouseEvent>) => void;
+  readonly onClickHotSpot?: (hotSpot: HotSpotInfo, e: SceneMouseEvent) => void;
   readonly createGroupKey?: (g: Group, idx: number, rootData: Record<string, string> | undefined, id: string) => string;
   readonly createGroupId?: (g: Group) => string;
 }): React.JSX.Element {

package/src/renderers/react/react.tsx

@@ -7,7 +7,7 @@ import { ReactCamera, ControlsHelper, Camera } from "./react-camera.js";
 import { HotSpotInfo } from "./react-hotspot.js";
 import { MaterialState } from "./react-material.js";
 
-type ToReactProps = {
+type ReactProps = {
   readonly scene: Scene;
   readonly selectedId?: string | undefined;
   readonly activeHotSpots?: Record<string, HotSpotInfo> | undefined;
@@ -16,7 +16,7 @@ type ToReactProps = {
   readonly showHotSpotTexts?: boolean;
   readonly showDimensions?: boolean;
   readonly hotSpotTexts?: Record<string, string>;
-  readonly reactPopovers?: ReadonlyArray<ReactPopover>;
+  readonly popovers?: ReadonlyArray<ReactPopover>;
   readonly useAnimations?: boolean;
   readonly camera?: Camera;
   readonly view?: View;
@@ -57,7 +57,7 @@ export const toReact = memo(
     activeComponents,
     hoveredIdExternal,
     hotSpotTexts,
-    reactPopovers,
+    popovers: reactPopovers,
     showHotSpotTexts = false,
     showDimensions = true,
     useAnimations = false,
@@ -73,7 +73,7 @@ export const toReact = memo(
     onClickHotSpot,
     createGroupKey,
     createGroupId,
-  }: ToReactProps): React.JSX.Element => {
+  }: ReactProps): React.JSX.Element => {
     return (
       <Canvas dpr={[1, window.devicePixelRatio]} frameloop="demand" {...canvasProps}>
         {/* <Stats showPanel={0} className="stats" /> */}

package/src/renderers/shared.ts

@@ -198,3 +198,5 @@ export function shade(p: number, from: string, to?: string): string | undefined
       .slice(1, f[3]! > -1 || t[3]! > -1 ? undefined : -2)
   );
 }
+
+export type Optional<T> = { readonly [K in keyof T]?: T[K] };

package/src/renderers/svg/index.ts

@@ -1,3 +1,3 @@
 export * from "./svg.js";
 export { type EmbededImage } from "./svg-encoding.js";
-export { type ImageDataUri } from "./svg-geometries/shared.js";
+export type { ImageDataUri, SvgOptions } from "./svg-geometries/shared.js";

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

@@ -1,3 +1,5 @@
+import { View } from "../../../abstract-3d.js";
+
 export type zOrderElement = { readonly element: string; readonly zOrder: number };
 export const zElem = (element: string, zOrder: number): zOrderElement => ({ element, zOrder });
 
@@ -13,3 +15,15 @@ export type ImageDataUri =
   | `data:image/png;base64,${string}`
   | `data:image/jpeg;base64,${string}`
   | `data:image/svg+xml,${string}`;
+
+export type SvgOptions = {
+  readonly view: View;
+  readonly stroke: number;
+  readonly scale: { readonly size: number; readonly scaleByWidth: boolean } | undefined;
+  readonly onlyStroke: boolean;
+  readonly grayScale: boolean;
+  readonly onlyStrokeFill: string;
+  readonly font: string;
+  readonly imageDataByUrl: Record<string, ImageDataUri>;
+  readonly rotation: number;
+};

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

@@ -9,7 +9,7 @@ import {
   vec3,
   vec3ZMean,
 } from "../../../abstract-3d.js";
-import { gray, black, zElem, zOrderElement } from "./shared.js";
+import { gray, black, zElem, zOrderElement, SvgOptions } from "./shared.js";
 import { svgPolygon } from "../svg-encoding.js";
 import { rgbGrayScale } from "../../shared.js";
 
@@ -17,10 +17,7 @@ export function box(
   b: Box,
   point: (x: number, y: number) => Vec2,
   color: string,
-  onlyStroke: boolean | undefined,
-  grayScale: boolean | undefined,
-  stroke: number,
-  onlyStrokeFill: string,
+  opts: SvgOptions,
   parentPos: Vec3,
   parentRot: Vec3
 ): ReadonlyArray<zOrderElement> {
@@ -59,9 +56,9 @@ export function box(
       ? [[point(v6.x, v6.y), point(v2.x, v2.y), point(v3.x, v3.y), point(v7.x, v7.y)], rightMean]
       : [[point(v5.x, v5.y), point(v1.x, v1.y), point(v4.x, v4.y), point(v8.x, v8.y)], leftMean];
 
-  const [strokeColor, fill, strokeUse] = onlyStroke
-    ? [grayScale ? gray : color, onlyStrokeFill, stroke]
-    : [black, grayScale ? rgbGrayScale(color) : color, 0];
+  const [strokeColor, fill, strokeUse] = opts.onlyStroke
+    ? [opts.grayScale ? gray : color, opts.onlyStrokeFill, opts.stroke]
+    : [black, opts.grayScale ? rgbGrayScale(color) : color, 0];
 
   return [
     zElem(svgPolygon(frontBackPoints, fill, strokeColor, strokeUse), frontBackMean),

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

@@ -9,7 +9,7 @@ import {
   vec3ZMean,
   equals,
 } from "../../../abstract-3d.js";
-import { gray, stBW, zElem, zOrderElement, transparent } from "./shared.js";
+import { gray, stBW, zElem, zOrderElement, transparent, SvgOptions } from "./shared.js";
 import { svgCircle, svgPolygon } from "../svg-encoding.js";
 import { rgbGrayScale } from "../../shared.js";
 
@@ -17,10 +17,7 @@ export function cone(
   c: Cone,
   point: (x: number, y: number) => Vec2,
   color: string,
-  onlyStroke: boolean | undefined,
-  grayScale: boolean | undefined,
-  _stroke: number,
-  onlyStrokeFill: string,
+  opts: SvgOptions,
   parentPos: Vec3,
   parentRot: Vec3,
   factor: number
@@ -30,9 +27,9 @@ export function cone(
   const rot = vec3RotCombine(parentRot, c.rot ?? vec3Zero);
   const vec3tr = (p: Vec3): Vec3 => vec3TransRot(p, pos, rot);
 
-  const [stroke, fill] = onlyStroke
-    ? [grayScale ? gray : color, onlyStrokeFill]
-    : [transparent, grayScale ? rgbGrayScale(color) : color];
+  const [stroke, fill] = opts.onlyStroke
+    ? [opts.grayScale ? gray : color, opts.onlyStrokeFill]
+    : [transparent, opts.grayScale ? rgbGrayScale(color) : color];
   const zOrderComponents = Array<zOrderElement>();
 
   const sides = 8;

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

@@ -9,7 +9,7 @@ import {
   vec3ZMean,
   equals,
 } from "../../../abstract-3d.js";
-import { gray, stBW, transparent, zElem, zOrderElement } from "./shared.js";
+import { gray, stBW, SvgOptions, transparent, zElem, zOrderElement } from "./shared.js";
 import { svgCircle, svgPolygon } from "../svg-encoding.js";
 import { rgbGrayScale } from "../../shared.js";
 
@@ -17,10 +17,7 @@ export function cylinder(
   c: Cylinder,
   point: (x: number, y: number) => Vec2,
   color: string,
-  onlyStroke: boolean | undefined,
-  grayScale: boolean | undefined,
-  _stroke: number,
-  onlyStrokeFill: string,
+  opts: SvgOptions,
   parentPos: Vec3,
   parentRot: Vec3,
   factor: number
@@ -30,9 +27,9 @@ export function cylinder(
   const rot = vec3RotCombine(parentRot, c.rot ?? vec3Zero);
   const vec3tr = (p: Vec3): Vec3 => vec3TransRot(p, pos, rot);
 
-  const [stroke, fill] = onlyStroke
-    ? [grayScale ? gray : color, onlyStrokeFill]
-    : [transparent, grayScale ? rgbGrayScale(color) : color];
+  const [stroke, fill] = opts.onlyStroke
+    ? [opts.grayScale ? gray : color, opts.onlyStrokeFill]
+    : [transparent, opts.grayScale ? rgbGrayScale(color) : color];
   const zOrderComponents = Array<zOrderElement>();
 
   const sides = 8;

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

@@ -1,5 +1,5 @@
 import { Line, Vec2, Vec3, vec3TransRot, vec3ZMean } from "../../../abstract-3d.js";
-import { zElem, zOrderElement } from "./shared.js";
+import { SvgOptions, zElem, zOrderElement } from "./shared.js";
 import { svgLine } from "../svg-encoding.js";
 import { rgbGrayScale } from "../../shared.js";
 
@@ -7,8 +7,7 @@ export function line(
   l: Line,
   point: (x: number, y: number) => Vec2,
   fill: string,
-  grayScale: boolean | undefined,
-  _stroke: number,
+  opts: SvgOptions,
   parentPos: Vec3,
   parentRot: Vec3
 ): ReadonlyArray<zOrderElement> {
@@ -16,7 +15,7 @@ export function line(
   const v2 = vec3TransRot(l.end, parentPos, parentRot);
   return [
     zElem(
-      svgLine(point(v1.x, v1.y), point(v2.x, v2.y), grayScale ? rgbGrayScale(fill) : fill, l.thickness),
+      svgLine(point(v1.x, v1.y), point(v2.x, v2.y), opts.grayScale ? rgbGrayScale(fill) : fill, l.thickness),
       vec3ZMean(v1, v2)
     ),
   ];

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

@@ -13,7 +13,7 @@ import {
   vec3ZMean,
   Material,
 } from "../../../abstract-3d.js";
-import { gray, black, zElem, zOrderElement, ImageDataUri } from "./shared.js";
+import { gray, black, zElem, zOrderElement, ImageDataUri, SvgOptions } from "./shared.js";
 import { EmbededImage, svgImage, svgPolygon } from "../svg-encoding.js";
 import { rgbGrayScale } from "../../shared.js";
 
@@ -21,14 +21,9 @@ export function plane(
   p: Plane,
   point: (x: number, y: number) => Vec2,
   material: Material,
-  onlyStroke: boolean | undefined,
-  grayScale: boolean | undefined,
-  stroke: number,
-  onlyStrokeFill: string,
+  opts: SvgOptions,
   parentPos: Vec3,
-  parentRot: Vec3,
-  view: View,
-  imageDataByUrl: Record<string, ImageDataUri> | undefined
+  parentRot: Vec3
 ): ReadonlyArray<zOrderElement> {
   const half = vec2Scale(p.size, 0.5);
   const pos = vec3TransRot(p.pos, parentPos, parentRot);
@@ -40,14 +35,14 @@ export function plane(
   const v3 = vec3tr(half.x, half.y);
   const v4 = vec3tr(-half.x, half.y);
 
-  const imageData = material.imageUrl ? imageDataByUrl?.[material.imageUrl] : undefined;
+  const imageData = material.imageUrl ? opts.imageDataByUrl?.[material.imageUrl] : undefined;
   const image: EmbededImage | undefined = imageData?.startsWith(rawSvgPrefix)
     ? { type: "svg", svg: imageData.slice(rawSvgPrefix.length) }
     : material.imageUrl
     ? { type: "url", url: imageData ?? material.imageUrl }
     : undefined;
 
-  if (view === "front" && image) {
+  if (opts.view === "front" && image) {
     const [leftX, rightX] = v4.x > v2.x ? [v2.x, v4.x] : [v4.x, v2.x];
     const [bottomY, topY] = v4.y > v2.y ? [v4.y, v2.y] : [v2.y, v4.y];
     const bottomLeft = point(leftX, bottomY);
@@ -59,9 +54,9 @@ export function plane(
 
   const points = [point(v1.x, v1.y), point(v2.x, v2.y), point(v3.x, v3.y), point(v4.x, v4.y)];
 
-  const [strokeColor, fill, strokeThickness] = onlyStroke
-    ? [grayScale ? gray : material.normal, onlyStrokeFill, stroke]
-    : [black, grayScale ? rgbGrayScale(material.normal) : material.normal, 0];
+  const [strokeColor, fill, strokeThickness] = opts.onlyStroke
+    ? [opts.grayScale ? gray : material.normal, opts.onlyStrokeFill, opts.stroke]
+    : [black, opts.grayScale ? rgbGrayScale(material.normal) : material.normal, 0];
   return [zElem(svgPolygon(points, fill, strokeColor, strokeThickness), vec3ZMean(v1, v2, v3, v4))];
 }