circuit-json-to-simple-3d 0.0.3 → 0.0.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +15 -2
- package/bun.lock +18 -5
- package/dist/index.d.ts +13 -3
- package/dist/index.js +69 -18
- package/lib/getDefaultCameraForPcbBoard.ts +24 -8
- package/lib/index.ts +26 -20
- package/lib/types.ts +26 -0
- package/lib/utils/get-background-color-from-options.ts +29 -0
- package/lib/utils/is-valid-color.ts +10 -0
- package/package.json +2 -1
- package/tests/__snapshots__/custom-camera.snap.svg +427 -0
- package/tests/__snapshots__/empty-options.snap.svg +449 -0
- package/tests/__snapshots__/old-style-options.snap.svg +449 -0
- package/tests/__snapshots__/zoom-0.5x.snap.svg +449 -0
- package/tests/__snapshots__/zoom-1x.snap.svg +449 -0
- package/tests/__snapshots__/zoom-2x.snap.svg +449 -0
- package/tests/backward-compatibility.test.ts +38 -0
- package/tests/cases/__snapshots__/high-res.snap.svg +449 -0
- package/tests/cases/__snapshots__/invalid-color.snap.svg +449 -0
- package/tests/cases/__snapshots__/invalid-zoom.snap.svg +449 -0
- package/tests/cases/__snapshots__/low-res.snap.svg +449 -0
- package/tests/cases/different-resolution-rendering.test.ts +26 -0
- package/tests/cases/edge-cases-and-error-handling.test.ts +24 -0
- package/tests/examples/__snapshots__/advanced-example.snap.svg +449 -0
- package/tests/examples/__snapshots__/background-example.snap.svg +439 -0
- package/tests/examples/__snapshots__/basic-usage.snap.svg +449 -0
- package/tests/examples/__snapshots__/blue-background.snap.svg +449 -0
- package/tests/examples/__snapshots__/dimension-example.snap.svg +449 -0
- package/tests/examples/__snapshots__/large-size.snap.svg +449 -0
- package/tests/examples/__snapshots__/red-background.snap.svg +449 -0
- package/tests/examples/__snapshots__/small-size.snap.svg +449 -0
- package/tests/examples/__snapshots__/solid-color-example.snap.svg +437 -0
- package/tests/examples/__snapshots__/transparent-background.snap.svg +449 -0
- package/tests/examples/__snapshots__/zoom-example.snap.svg +449 -0
- package/tests/examples/__snapshots__/zoom-with-red-bg.snap.svg +439 -0
- package/tests/examples/background-color-options-solid-colors.test.ts +39 -0
- package/tests/examples/combined-options-zoom-with-background.test.ts +18 -0
- package/tests/examples/comprehensive-examples-all-new-features.test.ts +84 -0
- package/tests/examples/dimension-options.test.ts +28 -0
- package/tests/zoom-options-different-zoom-levels.test.ts +34 -0
package/README.md
CHANGED
|
@@ -3,13 +3,26 @@
|
|
|
3
3
|
Convert Circuit JSON into a simplified 3d representation, suitable for visual
|
|
4
4
|
snapshot testing or inspecting prior to assembly.
|
|
5
5
|
|
|
6
|
-

|
|
7
7
|
|
|
8
8
|
## Usage
|
|
9
9
|
|
|
10
10
|
```ts
|
|
11
11
|
import { convertCircuitJsonToSimple3dSvg } from "circuit-json-to-simple-3d"
|
|
12
12
|
|
|
13
|
+
// Basic usage
|
|
13
14
|
convertCircuitJsonToSimple3dSvg(circuitJson)
|
|
14
15
|
// <svg>...</svg>
|
|
15
|
-
|
|
16
|
+
|
|
17
|
+
// With options
|
|
18
|
+
convertCircuitJsonToSimple3dSvg(circuitJson, {
|
|
19
|
+
anglePreset: "angle1", // "angle1" | "angle2" | "left" | "right" | "left-raised" | "right-raised"
|
|
20
|
+
defaultZoomMultiplier: 1.5, // Zoom level multiplier
|
|
21
|
+
background: {
|
|
22
|
+
color: "#ffffff", // CSS color value
|
|
23
|
+
opacity: 0.8 // Opacity (0-1)
|
|
24
|
+
},
|
|
25
|
+
width: 800, // SVG width
|
|
26
|
+
height: 600, // SVG height
|
|
27
|
+
})
|
|
28
|
+
```
|
package/bun.lock
CHANGED
|
@@ -12,6 +12,7 @@
|
|
|
12
12
|
"circuit-json": "^0.0.180",
|
|
13
13
|
"circuit-json-to-connectivity-map": "^0.0.22",
|
|
14
14
|
"circuit-to-svg": "^0.0.145",
|
|
15
|
+
"color": "^5.0.0",
|
|
15
16
|
"tsup": "^8.5.0",
|
|
16
17
|
},
|
|
17
18
|
"peerDependencies": {
|
|
@@ -206,15 +207,15 @@
|
|
|
206
207
|
|
|
207
208
|
"circuit-to-svg": ["circuit-to-svg@0.0.145", "", { "dependencies": { "@types/node": "^22.5.5", "bun-types": "^1.1.40", "svgson": "^5.3.1", "transformation-matrix": "^2.16.1" }, "peerDependencies": { "@tscircuit/circuit-json-util": "*", "@tscircuit/footprinter": "*", "circuit-json": "*", "schematic-symbols": "*" } }, "sha512-bp0Oxg5ljDs+3Okw2yd1b/KWv7+9pRYsaQ1HSQtnNctBxNsppNqbPTRILBtnAMQTvnl8Rep2E8hQ9huSotxbeQ=="],
|
|
208
209
|
|
|
209
|
-
"color": ["color@
|
|
210
|
+
"color": ["color@5.0.0", "", { "dependencies": { "color-convert": "^3.0.1", "color-string": "^2.0.0" } }, "sha512-16BlyiuyLq3MLxpRWyOTiWsO3ii/eLQLJUQXBSNcxMBBSnyt1ee9YUdaozQp03ifwm5woztEZGDbk9RGVuCsdw=="],
|
|
210
211
|
|
|
211
|
-
"color-convert": ["color-convert@
|
|
212
|
+
"color-convert": ["color-convert@3.1.0", "", { "dependencies": { "color-name": "^2.0.0" } }, "sha512-TVoqAq8ZDIpK5lsQY874DDnu65CSsc9vzq0wLpNQ6UMBq81GSZocVazPiBbYGzngzBOIRahpkTzCLVe2at4MfA=="],
|
|
212
213
|
|
|
213
214
|
"color-diff": ["color-diff@1.4.0", "", {}, "sha512-4oDB/o78lNdppbaqrg0HjOp7pHmUc+dfCxWKWFnQg6AB/1dkjtBDop3RZht5386cq9xBUDRvDvSCA7WUlM9Jqw=="],
|
|
214
215
|
|
|
215
|
-
"color-name": ["color-name@
|
|
216
|
+
"color-name": ["color-name@2.0.0", "", {}, "sha512-SbtvAMWvASO5TE2QP07jHBMXKafgdZz8Vrsrn96fiL+O92/FN/PLARzUW5sKt013fjAprK2d2iCn2hk2Xb5oow=="],
|
|
216
217
|
|
|
217
|
-
"color-string": ["color-string@
|
|
218
|
+
"color-string": ["color-string@2.0.1", "", { "dependencies": { "color-name": "^2.0.0" } }, "sha512-5z9FbYTZPAo8iKsNEqRNv+OlpBbDcoE+SY9GjLfDUHEfcNNV7tS9eSAlFHEaub/r5tBL9LtskAeq1l9SaoZ5tQ=="],
|
|
218
219
|
|
|
219
220
|
"commander": ["commander@4.1.1", "", {}, "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="],
|
|
220
221
|
|
|
@@ -472,10 +473,12 @@
|
|
|
472
473
|
|
|
473
474
|
"circuit-to-svg/transformation-matrix": ["transformation-matrix@2.16.1", "", {}, "sha512-tdtC3wxVEuzU7X/ydL131Q3JU5cPMEn37oqVLITjRDSDsnSHVFzW2JiCLfZLIQEgWzZHdSy3J6bZzvKEN24jGA=="],
|
|
474
475
|
|
|
475
|
-
"color/color-convert": ["color-convert@
|
|
476
|
+
"parse-color/color-convert": ["color-convert@0.5.3", "", {}, "sha512-RwBeO/B/vZR3dfKL1ye/vx8MHZ40ugzpyfeVG5GsiuGnrlMWe2o8wxBbLCpw9CsxV+wHuzYlCiWnybrIA0ling=="],
|
|
476
477
|
|
|
477
478
|
"prebuild-install/tar-fs": ["tar-fs@2.1.2", "", { "dependencies": { "chownr": "^1.1.1", "mkdirp-classic": "^0.5.2", "pump": "^3.0.0", "tar-stream": "^2.1.4" } }, "sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA=="],
|
|
478
479
|
|
|
480
|
+
"sharp/color": ["color@4.2.3", "", { "dependencies": { "color-convert": "^2.0.1", "color-string": "^1.9.0" } }, "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A=="],
|
|
481
|
+
|
|
479
482
|
"string-width-cjs/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="],
|
|
480
483
|
|
|
481
484
|
"string-width-cjs/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],
|
|
@@ -490,6 +493,10 @@
|
|
|
490
493
|
|
|
491
494
|
"prebuild-install/tar-fs/tar-stream": ["tar-stream@2.2.0", "", { "dependencies": { "bl": "^4.0.3", "end-of-stream": "^1.4.1", "fs-constants": "^1.0.0", "inherits": "^2.0.3", "readable-stream": "^3.1.1" } }, "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ=="],
|
|
492
495
|
|
|
496
|
+
"sharp/color/color-convert": ["color-convert@2.0.1", "", { "dependencies": { "color-name": "~1.1.4" } }, "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="],
|
|
497
|
+
|
|
498
|
+
"sharp/color/color-string": ["color-string@1.9.1", "", { "dependencies": { "color-name": "^1.0.0", "simple-swizzle": "^0.2.2" } }, "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg=="],
|
|
499
|
+
|
|
493
500
|
"string-width-cjs/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="],
|
|
494
501
|
|
|
495
502
|
"wrap-ansi-cjs/ansi-styles/color-convert": ["color-convert@2.0.1", "", { "dependencies": { "color-name": "~1.1.4" } }, "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="],
|
|
@@ -497,5 +504,11 @@
|
|
|
497
504
|
"wrap-ansi-cjs/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="],
|
|
498
505
|
|
|
499
506
|
"wrap-ansi-cjs/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="],
|
|
507
|
+
|
|
508
|
+
"sharp/color/color-convert/color-name": ["color-name@1.1.4", "", {}, "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="],
|
|
509
|
+
|
|
510
|
+
"sharp/color/color-string/color-name": ["color-name@1.1.4", "", {}, "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="],
|
|
511
|
+
|
|
512
|
+
"wrap-ansi-cjs/ansi-styles/color-convert/color-name": ["color-name@1.1.4", "", {}, "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="],
|
|
500
513
|
}
|
|
501
514
|
}
|
package/dist/index.d.ts
CHANGED
|
@@ -2,7 +2,11 @@ import { CircuitJson } from 'circuit-json';
|
|
|
2
2
|
|
|
3
3
|
type AnglePreset = "angle1" | "angle2" | "left" | "right" | "left-raised" | "right-raised";
|
|
4
4
|
|
|
5
|
-
|
|
5
|
+
interface BackgroundOptions {
|
|
6
|
+
color?: string;
|
|
7
|
+
opacity?: number;
|
|
8
|
+
}
|
|
9
|
+
interface Simple3dSvgOptions {
|
|
6
10
|
camera?: {
|
|
7
11
|
position: {
|
|
8
12
|
x: number;
|
|
@@ -17,6 +21,12 @@ declare function convertCircuitJsonToSimple3dSvg(circuitJson: CircuitJson, opts?
|
|
|
17
21
|
focalLength?: number;
|
|
18
22
|
};
|
|
19
23
|
anglePreset?: AnglePreset;
|
|
20
|
-
|
|
24
|
+
defaultZoomMultiplier?: number;
|
|
25
|
+
background?: BackgroundOptions;
|
|
26
|
+
width?: number;
|
|
27
|
+
height?: number;
|
|
28
|
+
}
|
|
21
29
|
|
|
22
|
-
|
|
30
|
+
declare function convertCircuitJsonToSimple3dSvg(circuitJson: CircuitJson, opts?: Simple3dSvgOptions): Promise<string>;
|
|
31
|
+
|
|
32
|
+
export { type AnglePreset, type BackgroundOptions, type Simple3dSvgOptions, convertCircuitJsonToSimple3dSvg };
|
package/dist/index.js
CHANGED
|
@@ -3,37 +3,84 @@ import { cju } from "@tscircuit/circuit-json-util";
|
|
|
3
3
|
import { renderScene } from "@tscircuit/simple-3d-svg";
|
|
4
4
|
|
|
5
5
|
// lib/getDefaultCameraForPcbBoard.ts
|
|
6
|
-
function getDefaultCameraForPcbBoard(pcbBoard, anglePreset = "angle1") {
|
|
6
|
+
function getDefaultCameraForPcbBoard(pcbBoard, anglePreset = "angle1", defaultZoomMultiplier) {
|
|
7
7
|
const w = pcbBoard.width;
|
|
8
8
|
const h = pcbBoard.height;
|
|
9
|
-
const cx = pcbBoard.center?.x;
|
|
10
|
-
const cz = pcbBoard.center?.y;
|
|
11
|
-
const
|
|
9
|
+
const cx = pcbBoard.center?.x || 0;
|
|
10
|
+
const cz = pcbBoard.center?.y || 0;
|
|
11
|
+
const boardSize = Math.max(w, h);
|
|
12
|
+
let baseDist = boardSize * 1.5;
|
|
13
|
+
let effectiveZoomLevel;
|
|
14
|
+
if (defaultZoomMultiplier !== void 0) {
|
|
15
|
+
if (defaultZoomMultiplier > 0) {
|
|
16
|
+
effectiveZoomLevel = defaultZoomMultiplier;
|
|
17
|
+
baseDist = baseDist / effectiveZoomLevel;
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
const dist = baseDist;
|
|
12
21
|
let position;
|
|
13
22
|
if (anglePreset === "angle1") {
|
|
14
23
|
position = { x: cx - dist, y: dist, z: cz - dist };
|
|
15
24
|
} else if (anglePreset === "angle2") {
|
|
16
25
|
position = { x: cx + dist, y: dist, z: cz - dist };
|
|
17
26
|
} else if (anglePreset === "left") {
|
|
18
|
-
position = { x: cx - dist, y: 0, z:
|
|
27
|
+
position = { x: cx - dist, y: 0, z: cz };
|
|
19
28
|
} else if (anglePreset === "right") {
|
|
20
|
-
position = { x: cx + dist, y: 0, z:
|
|
29
|
+
position = { x: cx + dist, y: 0, z: cz };
|
|
21
30
|
} else if (anglePreset === "left-raised") {
|
|
22
|
-
position = { x: cx - dist, y: dist, z:
|
|
31
|
+
position = { x: cx - dist, y: dist, z: cz };
|
|
23
32
|
} else if (anglePreset === "right-raised") {
|
|
24
|
-
position = { x: cx + dist, y: dist, z:
|
|
33
|
+
position = { x: cx + dist, y: dist, z: cz };
|
|
25
34
|
} else {
|
|
26
35
|
throw new Error(`Unknown angle preset: ${anglePreset}`);
|
|
27
36
|
}
|
|
37
|
+
const focalLength = effectiveZoomLevel ? Math.max(1, 2 * effectiveZoomLevel) : 2;
|
|
28
38
|
return {
|
|
29
39
|
position,
|
|
30
40
|
lookAt: { x: cx, y: 0, z: cz },
|
|
31
|
-
focalLength
|
|
41
|
+
focalLength
|
|
32
42
|
};
|
|
33
43
|
}
|
|
34
44
|
|
|
35
45
|
// lib/index.ts
|
|
36
46
|
import { convertCircuitJsonToPcbSvg } from "circuit-to-svg";
|
|
47
|
+
|
|
48
|
+
// lib/utils/get-background-color-from-options.ts
|
|
49
|
+
import Color2 from "color";
|
|
50
|
+
|
|
51
|
+
// lib/utils/is-valid-color.ts
|
|
52
|
+
import Color from "color";
|
|
53
|
+
var isValidColor = (color) => {
|
|
54
|
+
try {
|
|
55
|
+
Color(color);
|
|
56
|
+
return true;
|
|
57
|
+
} catch {
|
|
58
|
+
return false;
|
|
59
|
+
}
|
|
60
|
+
};
|
|
61
|
+
|
|
62
|
+
// lib/utils/get-background-color-from-options.ts
|
|
63
|
+
function getColorFromBackgroundOptions(background) {
|
|
64
|
+
if (!background) return "lightgray";
|
|
65
|
+
if (background.color) {
|
|
66
|
+
if (background.opacity !== void 0) {
|
|
67
|
+
try {
|
|
68
|
+
const color = Color2(background.color);
|
|
69
|
+
const opacity = Math.max(0, Math.min(1, background.opacity));
|
|
70
|
+
return color.alpha(opacity).string();
|
|
71
|
+
} catch {
|
|
72
|
+
return "lightgray";
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
if (isValidColor(background.color)) {
|
|
76
|
+
return background.color;
|
|
77
|
+
}
|
|
78
|
+
return "lightgray";
|
|
79
|
+
}
|
|
80
|
+
return "lightgray";
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
// lib/index.ts
|
|
37
84
|
async function convertCircuitJsonToSimple3dSvg(circuitJson, opts = {}) {
|
|
38
85
|
const db = cju(circuitJson);
|
|
39
86
|
const boxes = [];
|
|
@@ -45,7 +92,6 @@ async function convertCircuitJsonToSimple3dSvg(circuitJson, opts = {}) {
|
|
|
45
92
|
colorOverrides: {
|
|
46
93
|
copper: {
|
|
47
94
|
top: "#ffe066",
|
|
48
|
-
// sort of a yellow
|
|
49
95
|
bottom: "#ffe066"
|
|
50
96
|
},
|
|
51
97
|
drill: "rgba(0,0,0,0.5)"
|
|
@@ -53,7 +99,11 @@ async function convertCircuitJsonToSimple3dSvg(circuitJson, opts = {}) {
|
|
|
53
99
|
}).replace("<svg", "<svg transform='scale(1, -1)'");
|
|
54
100
|
const pcbBoard = db.pcb_board.list()[0];
|
|
55
101
|
if (!pcbBoard) throw new Error("No pcb_board, can't render to 3d");
|
|
56
|
-
const camera = opts.camera ?? getDefaultCameraForPcbBoard(
|
|
102
|
+
const camera = opts.camera ?? getDefaultCameraForPcbBoard(
|
|
103
|
+
pcbBoard,
|
|
104
|
+
opts.anglePreset ?? "angle1",
|
|
105
|
+
opts.defaultZoomMultiplier
|
|
106
|
+
);
|
|
57
107
|
if (!camera.focalLength) {
|
|
58
108
|
camera.focalLength = 1;
|
|
59
109
|
}
|
|
@@ -97,14 +147,15 @@ async function convertCircuitJsonToSimple3dSvg(circuitJson, opts = {}) {
|
|
|
97
147
|
topLabelColor: "white"
|
|
98
148
|
});
|
|
99
149
|
}
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
);
|
|
150
|
+
const backgroundColor = getColorFromBackgroundOptions(opts.background);
|
|
151
|
+
const renderOptions = {
|
|
152
|
+
backgroundColor
|
|
153
|
+
};
|
|
154
|
+
if (opts.width) renderOptions.width = opts.width;
|
|
155
|
+
if (opts.height) renderOptions.height = opts.height;
|
|
156
|
+
return await renderScene({ boxes, camera }, renderOptions);
|
|
106
157
|
}
|
|
107
158
|
export {
|
|
108
159
|
convertCircuitJsonToSimple3dSvg
|
|
109
160
|
};
|
|
110
|
-
//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../lib/index.ts", "../lib/getDefaultCameraForPcbBoard.ts"],
  "sourcesContent": ["import type { CircuitJson } from \"circuit-json\"\nimport { cju } from \"@tscircuit/circuit-json-util\"\nimport { renderScene, type Box } from \"@tscircuit/simple-3d-svg\"\nimport {\n  getDefaultCameraForPcbBoard,\n  type AnglePreset,\n} from \"./getDefaultCameraForPcbBoard\"\nimport { convertCircuitJsonToPcbSvg } from \"circuit-to-svg\"\n\nexport async function convertCircuitJsonToSimple3dSvg(\n  circuitJson: CircuitJson,\n  opts: {\n    camera?: {\n      position: { x: number; y: number; z: number }\n      lookAt: { x: number; y: number; z: number }\n      focalLength?: number\n    }\n    anglePreset?: AnglePreset\n  } = {},\n): Promise<string> {\n  const db = cju(circuitJson)\n  const boxes: Box[] = []\n\n  const pcbTopSvg = convertCircuitJsonToPcbSvg(circuitJson, {\n    layer: \"top\",\n    matchBoardAspectRatio: true,\n    backgroundColor: \"transparent\",\n    drawPaddingOutsideBoard: false,\n    colorOverrides: {\n      copper: {\n        top: \"#ffe066\", // sort of a yellow\n        bottom: \"#ffe066\",\n      },\n      drill: \"rgba(0,0,0,0.5)\",\n    },\n  }).replace(\"<svg\", \"<svg transform='scale(1, -1)'\")\n  // console.log(pcbTopSvg)\n\n  const pcbBoard = db.pcb_board.list()[0]\n\n  if (!pcbBoard) throw new Error(\"No pcb_board, can't render to 3d\")\n\n  // TODO if camera not\n  const camera =\n    opts.camera ??\n    getDefaultCameraForPcbBoard(pcbBoard, opts.anglePreset ?? \"angle1\")\n  if (!camera.focalLength) {\n    camera.focalLength = 1\n  }\n\n  // pcb board as a thin green box lying in the X-Z plane\n  boxes.push({\n    center: {\n      x: pcbBoard.center.x,\n      y: 0,\n      z: pcbBoard.center.y,\n    },\n    size: {\n      x: pcbBoard.width,\n      y: pcbBoard.thickness,\n      z: pcbBoard.height,\n    },\n    faceImages: {\n      top: `data:image/svg+xml;base64,${btoa(pcbTopSvg)}`,\n    },\n    projectionSubdivision: 10,\n    color: \"rgba(0,140,0,0.8)\",\n  })\n\n  const DEFAULT_COMP_HEIGHT = 2 // mm \u2013 arbitrary extrusion for components\n\n  for (const comp of db.pcb_component.list()) {\n    const sourceComponent = db.source_component.get(comp.source_component_id)\n    const compHeight = Math.min(\n      Math.min(comp.width, comp.height),\n      DEFAULT_COMP_HEIGHT,\n    )\n    boxes.push({\n      center: {\n        x: comp.center.x,\n        y: pcbBoard.thickness / 2 + compHeight / 2,\n        z: comp.center.y,\n      },\n      size: {\n        x: comp.width,\n        y: compHeight,\n        z: comp.height,\n      },\n      color: \"rgba(128,128,128,0.5)\",\n      topLabel: sourceComponent?.name ?? \"?\",\n      topLabelColor: \"white\",\n    })\n  }\n\n  return await renderScene(\n    { boxes, camera },\n    {\n      backgroundColor: \"lightgray\",\n    },\n  )\n}\n", "import type { PcbBoard, Point3 } from \"circuit-json\"\nimport type { Camera } from \"@tscircuit/simple-3d-svg\"\n\nexport type AnglePreset =\n  | \"angle1\"\n  | \"angle2\"\n  | \"left\"\n  | \"right\"\n  | \"left-raised\"\n  | \"right-raised\"\n\nexport function getDefaultCameraForPcbBoard(\n  pcbBoard: PcbBoard,\n  anglePreset: AnglePreset = \"angle1\",\n): Camera {\n  const w = pcbBoard.width\n  const h = pcbBoard.height\n\n  const cx = pcbBoard.center?.x\n  const cz = pcbBoard.center?.y // pcb y \u2192 renderer z\n\n  const dist = Math.max(w, h) * 1.5 // * 10\n\n  let position: Point3\n  if (anglePreset === \"angle1\") {\n    position = { x: cx - dist, y: dist, z: cz - dist }\n  } else if (anglePreset === \"angle2\") {\n    position = { x: cx + dist, y: dist, z: cz - dist }\n  } else if (anglePreset === \"left\") {\n    position = { x: cx - dist, y: 0, z: 0 }\n  } else if (anglePreset === \"right\") {\n    position = { x: cx + dist, y: 0, z: 0 }\n  } else if (anglePreset === \"left-raised\") {\n    position = { x: cx - dist, y: dist, z: 0 }\n  } else if (anglePreset === \"right-raised\") {\n    position = { x: cx + dist, y: dist, z: 0 }\n  } else {\n    throw new Error(`Unknown angle preset: ${anglePreset}`)\n  }\n\n  return {\n    position,\n    lookAt: { x: cx, y: 0, z: cz },\n    focalLength: 2,\n  }\n}\n"],
  "mappings": ";AACA,SAAS,WAAW;AACpB,SAAS,mBAA6B;;;ACS/B,SAAS,4BACd,UACA,cAA2B,UACnB;AACR,QAAM,IAAI,SAAS;AACnB,QAAM,IAAI,SAAS;AAEnB,QAAM,KAAK,SAAS,QAAQ;AAC5B,QAAM,KAAK,SAAS,QAAQ;AAE5B,QAAM,OAAO,KAAK,IAAI,GAAG,CAAC,IAAI;AAE9B,MAAI;AACJ,MAAI,gBAAgB,UAAU;AAC5B,eAAW,EAAE,GAAG,KAAK,MAAM,GAAG,MAAM,GAAG,KAAK,KAAK;AAAA,EACnD,WAAW,gBAAgB,UAAU;AACnC,eAAW,EAAE,GAAG,KAAK,MAAM,GAAG,MAAM,GAAG,KAAK,KAAK;AAAA,EACnD,WAAW,gBAAgB,QAAQ;AACjC,eAAW,EAAE,GAAG,KAAK,MAAM,GAAG,GAAG,GAAG,EAAE;AAAA,EACxC,WAAW,gBAAgB,SAAS;AAClC,eAAW,EAAE,GAAG,KAAK,MAAM,GAAG,GAAG,GAAG,EAAE;AAAA,EACxC,WAAW,gBAAgB,eAAe;AACxC,eAAW,EAAE,GAAG,KAAK,MAAM,GAAG,MAAM,GAAG,EAAE;AAAA,EAC3C,WAAW,gBAAgB,gBAAgB;AACzC,eAAW,EAAE,GAAG,KAAK,MAAM,GAAG,MAAM,GAAG,EAAE;AAAA,EAC3C,OAAO;AACL,UAAM,IAAI,MAAM,yBAAyB,WAAW,EAAE;AAAA,EACxD;AAEA,SAAO;AAAA,IACL;AAAA,IACA,QAAQ,EAAE,GAAG,IAAI,GAAG,GAAG,GAAG,GAAG;AAAA,IAC7B,aAAa;AAAA,EACf;AACF;;;ADtCA,SAAS,kCAAkC;AAE3C,eAAsB,gCACpB,aACA,OAOI,CAAC,GACY;AACjB,QAAM,KAAK,IAAI,WAAW;AAC1B,QAAM,QAAe,CAAC;AAEtB,QAAM,YAAY,2BAA2B,aAAa;AAAA,IACxD,OAAO;AAAA,IACP,uBAAuB;AAAA,IACvB,iBAAiB;AAAA,IACjB,yBAAyB;AAAA,IACzB,gBAAgB;AAAA,MACd,QAAQ;AAAA,QACN,KAAK;AAAA;AAAA,QACL,QAAQ;AAAA,MACV;AAAA,MACA,OAAO;AAAA,IACT;AAAA,EACF,CAAC,EAAE,QAAQ,QAAQ,+BAA+B;AAGlD,QAAM,WAAW,GAAG,UAAU,KAAK,EAAE,CAAC;AAEtC,MAAI,CAAC,SAAU,OAAM,IAAI,MAAM,kCAAkC;AAGjE,QAAM,SACJ,KAAK,UACL,4BAA4B,UAAU,KAAK,eAAe,QAAQ;AACpE,MAAI,CAAC,OAAO,aAAa;AACvB,WAAO,cAAc;AAAA,EACvB;AAGA,QAAM,KAAK;AAAA,IACT,QAAQ;AAAA,MACN,GAAG,SAAS,OAAO;AAAA,MACnB,GAAG;AAAA,MACH,GAAG,SAAS,OAAO;AAAA,IACrB;AAAA,IACA,MAAM;AAAA,MACJ,GAAG,SAAS;AAAA,MACZ,GAAG,SAAS;AAAA,MACZ,GAAG,SAAS;AAAA,IACd;AAAA,IACA,YAAY;AAAA,MACV,KAAK,6BAA6B,KAAK,SAAS,CAAC;AAAA,IACnD;AAAA,IACA,uBAAuB;AAAA,IACvB,OAAO;AAAA,EACT,CAAC;AAED,QAAM,sBAAsB;AAE5B,aAAW,QAAQ,GAAG,cAAc,KAAK,GAAG;AAC1C,UAAM,kBAAkB,GAAG,iBAAiB,IAAI,KAAK,mBAAmB;AACxE,UAAM,aAAa,KAAK;AAAA,MACtB,KAAK,IAAI,KAAK,OAAO,KAAK,MAAM;AAAA,MAChC;AAAA,IACF;AACA,UAAM,KAAK;AAAA,MACT,QAAQ;AAAA,QACN,GAAG,KAAK,OAAO;AAAA,QACf,GAAG,SAAS,YAAY,IAAI,aAAa;AAAA,QACzC,GAAG,KAAK,OAAO;AAAA,MACjB;AAAA,MACA,MAAM;AAAA,QACJ,GAAG,KAAK;AAAA,QACR,GAAG;AAAA,QACH,GAAG,KAAK;AAAA,MACV;AAAA,MACA,OAAO;AAAA,MACP,UAAU,iBAAiB,QAAQ;AAAA,MACnC,eAAe;AAAA,IACjB,CAAC;AAAA,EACH;AAEA,SAAO,MAAM;AAAA,IACX,EAAE,OAAO,OAAO;AAAA,IAChB;AAAA,MACE,iBAAiB;AAAA,IACnB;AAAA,EACF;AACF;",
  "names": []
}

|
|
161
|
+
//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../lib/index.ts", "../lib/getDefaultCameraForPcbBoard.ts", "../lib/utils/get-background-color-from-options.ts", "../lib/utils/is-valid-color.ts"],
  "sourcesContent": ["import type { CircuitJson } from \"circuit-json\"\nimport { cju } from \"@tscircuit/circuit-json-util\"\nimport { renderScene, type Box } from \"@tscircuit/simple-3d-svg\"\nimport {\n  getDefaultCameraForPcbBoard,\n  type AnglePreset,\n} from \"./getDefaultCameraForPcbBoard\"\nimport { convertCircuitJsonToPcbSvg } from \"circuit-to-svg\"\nimport type {\n  Simple3dSvgOptions,\n  BackgroundOptions,\n  RenderSceneOptions,\n} from \"./types\"\nimport { getColorFromBackgroundOptions } from \"./utils/get-background-color-from-options\"\n\nexport async function convertCircuitJsonToSimple3dSvg(\n  circuitJson: CircuitJson,\n  opts: Simple3dSvgOptions = {},\n): Promise<string> {\n  const db = cju(circuitJson)\n  const boxes: Box[] = []\n\n  const pcbTopSvg = convertCircuitJsonToPcbSvg(circuitJson, {\n    layer: \"top\",\n    matchBoardAspectRatio: true,\n    backgroundColor: \"transparent\",\n    drawPaddingOutsideBoard: false,\n    colorOverrides: {\n      copper: {\n        top: \"#ffe066\",\n        bottom: \"#ffe066\",\n      },\n      drill: \"rgba(0,0,0,0.5)\",\n    },\n  }).replace(\"<svg\", \"<svg transform='scale(1, -1)'\")\n\n  const pcbBoard = db.pcb_board.list()[0]\n\n  if (!pcbBoard) throw new Error(\"No pcb_board, can't render to 3d\")\n\n  const camera =\n    opts.camera ??\n    getDefaultCameraForPcbBoard(\n      pcbBoard,\n      opts.anglePreset ?? \"angle1\",\n      opts.defaultZoomMultiplier,\n    )\n  if (!camera.focalLength) {\n    camera.focalLength = 1\n  }\n\n  boxes.push({\n    center: {\n      x: pcbBoard.center.x,\n      y: 0,\n      z: pcbBoard.center.y,\n    },\n    size: {\n      x: pcbBoard.width,\n      y: pcbBoard.thickness,\n      z: pcbBoard.height,\n    },\n    faceImages: {\n      top: `data:image/svg+xml;base64,${btoa(pcbTopSvg)}`,\n    },\n    projectionSubdivision: 10,\n    color: \"rgba(0,140,0,0.8)\",\n  })\n\n  const DEFAULT_COMP_HEIGHT = 2\n\n  for (const comp of db.pcb_component.list()) {\n    const sourceComponent = db.source_component.get(comp.source_component_id)\n    const compHeight = Math.min(\n      Math.min(comp.width, comp.height),\n      DEFAULT_COMP_HEIGHT,\n    )\n    boxes.push({\n      center: {\n        x: comp.center.x,\n        y: pcbBoard.thickness / 2 + compHeight / 2,\n        z: comp.center.y,\n      },\n      size: {\n        x: comp.width,\n        y: compHeight,\n        z: comp.height,\n      },\n      color: \"rgba(128,128,128,0.5)\",\n      topLabel: sourceComponent?.name ?? \"?\",\n      topLabelColor: \"white\",\n    })\n  }\n\n  const backgroundColor = getColorFromBackgroundOptions(opts.background)\n\n  const renderOptions: RenderSceneOptions = {\n    backgroundColor,\n  }\n\n  if (opts.width) renderOptions.width = opts.width\n  if (opts.height) renderOptions.height = opts.height\n\n  return await renderScene({ boxes, camera }, renderOptions)\n}\n\nexport type { Simple3dSvgOptions, BackgroundOptions, AnglePreset }\n", "import type { PcbBoard, Point3 } from \"circuit-json\"\nimport type { Camera } from \"@tscircuit/simple-3d-svg\"\n\nexport type AnglePreset =\n  | \"angle1\"\n  | \"angle2\"\n  | \"left\"\n  | \"right\"\n  | \"left-raised\"\n  | \"right-raised\"\n\nexport function getDefaultCameraForPcbBoard(\n  pcbBoard: PcbBoard,\n  anglePreset: AnglePreset = \"angle1\",\n  defaultZoomMultiplier?: number,\n): Camera {\n  const w = pcbBoard.width\n  const h = pcbBoard.height\n\n  const cx = pcbBoard.center?.x || 0\n  const cz = pcbBoard.center?.y || 0\n\n  const boardSize = Math.max(w, h)\n  let baseDist = boardSize * 1.5\n  let effectiveZoomLevel: number | undefined\n\n  if (defaultZoomMultiplier !== undefined) {\n    if (defaultZoomMultiplier > 0) {\n      effectiveZoomLevel = defaultZoomMultiplier\n      baseDist = baseDist / effectiveZoomLevel\n    }\n  }\n\n  const dist = baseDist\n\n  let position: Point3\n  if (anglePreset === \"angle1\") {\n    position = { x: cx - dist, y: dist, z: cz - dist }\n  } else if (anglePreset === \"angle2\") {\n    position = { x: cx + dist, y: dist, z: cz - dist }\n  } else if (anglePreset === \"left\") {\n    position = { x: cx - dist, y: 0, z: cz }\n  } else if (anglePreset === \"right\") {\n    position = { x: cx + dist, y: 0, z: cz }\n  } else if (anglePreset === \"left-raised\") {\n    position = { x: cx - dist, y: dist, z: cz }\n  } else if (anglePreset === \"right-raised\") {\n    position = { x: cx + dist, y: dist, z: cz }\n  } else {\n    throw new Error(`Unknown angle preset: ${anglePreset}`)\n  }\n\n  const focalLength = effectiveZoomLevel\n    ? Math.max(1, 2 * effectiveZoomLevel)\n    : 2\n\n  return {\n    position,\n    lookAt: { x: cx, y: 0, z: cz },\n    focalLength,\n  }\n}\n", "import Color from \"color\"\nimport type { BackgroundOptions } from \"../types\"\nimport { isValidColor } from \"./is-valid-color\"\n\nexport function getColorFromBackgroundOptions(\n  background?: BackgroundOptions,\n): string {\n  if (!background) return \"lightgray\"\n\n  if (background.color) {\n    if (background.opacity !== undefined) {\n      try {\n        const color = Color(background.color)\n        const opacity = Math.max(0, Math.min(1, background.opacity))\n        return color.alpha(opacity).string()\n      } catch {\n        return \"lightgray\"\n      }\n    }\n\n    if (isValidColor(background.color)) {\n      return background.color\n    }\n\n    return \"lightgray\"\n  }\n\n  return \"lightgray\"\n}\n", "import Color from \"color\"\n\nexport const isValidColor = (color: string): boolean => {\n  try {\n    Color(color)\n    return true\n  } catch {\n    return false\n  }\n}\n"],
  "mappings": "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",
  "names": ["Color", "Color"]
}

|
|
@@ -12,14 +12,26 @@ export type AnglePreset =
|
|
|
12
12
|
export function getDefaultCameraForPcbBoard(
|
|
13
13
|
pcbBoard: PcbBoard,
|
|
14
14
|
anglePreset: AnglePreset = "angle1",
|
|
15
|
+
defaultZoomMultiplier?: number,
|
|
15
16
|
): Camera {
|
|
16
17
|
const w = pcbBoard.width
|
|
17
18
|
const h = pcbBoard.height
|
|
18
19
|
|
|
19
|
-
const cx = pcbBoard.center?.x
|
|
20
|
-
const cz = pcbBoard.center?.y
|
|
20
|
+
const cx = pcbBoard.center?.x || 0
|
|
21
|
+
const cz = pcbBoard.center?.y || 0
|
|
21
22
|
|
|
22
|
-
const
|
|
23
|
+
const boardSize = Math.max(w, h)
|
|
24
|
+
let baseDist = boardSize * 1.5
|
|
25
|
+
let effectiveZoomLevel: number | undefined
|
|
26
|
+
|
|
27
|
+
if (defaultZoomMultiplier !== undefined) {
|
|
28
|
+
if (defaultZoomMultiplier > 0) {
|
|
29
|
+
effectiveZoomLevel = defaultZoomMultiplier
|
|
30
|
+
baseDist = baseDist / effectiveZoomLevel
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
const dist = baseDist
|
|
23
35
|
|
|
24
36
|
let position: Point3
|
|
25
37
|
if (anglePreset === "angle1") {
|
|
@@ -27,20 +39,24 @@ export function getDefaultCameraForPcbBoard(
|
|
|
27
39
|
} else if (anglePreset === "angle2") {
|
|
28
40
|
position = { x: cx + dist, y: dist, z: cz - dist }
|
|
29
41
|
} else if (anglePreset === "left") {
|
|
30
|
-
position = { x: cx - dist, y: 0, z:
|
|
42
|
+
position = { x: cx - dist, y: 0, z: cz }
|
|
31
43
|
} else if (anglePreset === "right") {
|
|
32
|
-
position = { x: cx + dist, y: 0, z:
|
|
44
|
+
position = { x: cx + dist, y: 0, z: cz }
|
|
33
45
|
} else if (anglePreset === "left-raised") {
|
|
34
|
-
position = { x: cx - dist, y: dist, z:
|
|
46
|
+
position = { x: cx - dist, y: dist, z: cz }
|
|
35
47
|
} else if (anglePreset === "right-raised") {
|
|
36
|
-
position = { x: cx + dist, y: dist, z:
|
|
48
|
+
position = { x: cx + dist, y: dist, z: cz }
|
|
37
49
|
} else {
|
|
38
50
|
throw new Error(`Unknown angle preset: ${anglePreset}`)
|
|
39
51
|
}
|
|
40
52
|
|
|
53
|
+
const focalLength = effectiveZoomLevel
|
|
54
|
+
? Math.max(1, 2 * effectiveZoomLevel)
|
|
55
|
+
: 2
|
|
56
|
+
|
|
41
57
|
return {
|
|
42
58
|
position,
|
|
43
59
|
lookAt: { x: cx, y: 0, z: cz },
|
|
44
|
-
focalLength
|
|
60
|
+
focalLength,
|
|
45
61
|
}
|
|
46
62
|
}
|
package/lib/index.ts
CHANGED
|
@@ -6,17 +6,16 @@ import {
|
|
|
6
6
|
type AnglePreset,
|
|
7
7
|
} from "./getDefaultCameraForPcbBoard"
|
|
8
8
|
import { convertCircuitJsonToPcbSvg } from "circuit-to-svg"
|
|
9
|
+
import type {
|
|
10
|
+
Simple3dSvgOptions,
|
|
11
|
+
BackgroundOptions,
|
|
12
|
+
RenderSceneOptions,
|
|
13
|
+
} from "./types"
|
|
14
|
+
import { getColorFromBackgroundOptions } from "./utils/get-background-color-from-options"
|
|
9
15
|
|
|
10
16
|
export async function convertCircuitJsonToSimple3dSvg(
|
|
11
17
|
circuitJson: CircuitJson,
|
|
12
|
-
opts: {
|
|
13
|
-
camera?: {
|
|
14
|
-
position: { x: number; y: number; z: number }
|
|
15
|
-
lookAt: { x: number; y: number; z: number }
|
|
16
|
-
focalLength?: number
|
|
17
|
-
}
|
|
18
|
-
anglePreset?: AnglePreset
|
|
19
|
-
} = {},
|
|
18
|
+
opts: Simple3dSvgOptions = {},
|
|
20
19
|
): Promise<string> {
|
|
21
20
|
const db = cju(circuitJson)
|
|
22
21
|
const boxes: Box[] = []
|
|
@@ -28,27 +27,28 @@ export async function convertCircuitJsonToSimple3dSvg(
|
|
|
28
27
|
drawPaddingOutsideBoard: false,
|
|
29
28
|
colorOverrides: {
|
|
30
29
|
copper: {
|
|
31
|
-
top: "#ffe066",
|
|
30
|
+
top: "#ffe066",
|
|
32
31
|
bottom: "#ffe066",
|
|
33
32
|
},
|
|
34
33
|
drill: "rgba(0,0,0,0.5)",
|
|
35
34
|
},
|
|
36
35
|
}).replace("<svg", "<svg transform='scale(1, -1)'")
|
|
37
|
-
// console.log(pcbTopSvg)
|
|
38
36
|
|
|
39
37
|
const pcbBoard = db.pcb_board.list()[0]
|
|
40
38
|
|
|
41
39
|
if (!pcbBoard) throw new Error("No pcb_board, can't render to 3d")
|
|
42
40
|
|
|
43
|
-
// TODO if camera not
|
|
44
41
|
const camera =
|
|
45
42
|
opts.camera ??
|
|
46
|
-
getDefaultCameraForPcbBoard(
|
|
43
|
+
getDefaultCameraForPcbBoard(
|
|
44
|
+
pcbBoard,
|
|
45
|
+
opts.anglePreset ?? "angle1",
|
|
46
|
+
opts.defaultZoomMultiplier,
|
|
47
|
+
)
|
|
47
48
|
if (!camera.focalLength) {
|
|
48
49
|
camera.focalLength = 1
|
|
49
50
|
}
|
|
50
51
|
|
|
51
|
-
// pcb board as a thin green box lying in the X-Z plane
|
|
52
52
|
boxes.push({
|
|
53
53
|
center: {
|
|
54
54
|
x: pcbBoard.center.x,
|
|
@@ -67,7 +67,7 @@ export async function convertCircuitJsonToSimple3dSvg(
|
|
|
67
67
|
color: "rgba(0,140,0,0.8)",
|
|
68
68
|
})
|
|
69
69
|
|
|
70
|
-
const DEFAULT_COMP_HEIGHT = 2
|
|
70
|
+
const DEFAULT_COMP_HEIGHT = 2
|
|
71
71
|
|
|
72
72
|
for (const comp of db.pcb_component.list()) {
|
|
73
73
|
const sourceComponent = db.source_component.get(comp.source_component_id)
|
|
@@ -92,10 +92,16 @@ export async function convertCircuitJsonToSimple3dSvg(
|
|
|
92
92
|
})
|
|
93
93
|
}
|
|
94
94
|
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
95
|
+
const backgroundColor = getColorFromBackgroundOptions(opts.background)
|
|
96
|
+
|
|
97
|
+
const renderOptions: RenderSceneOptions = {
|
|
98
|
+
backgroundColor,
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
if (opts.width) renderOptions.width = opts.width
|
|
102
|
+
if (opts.height) renderOptions.height = opts.height
|
|
103
|
+
|
|
104
|
+
return await renderScene({ boxes, camera }, renderOptions)
|
|
101
105
|
}
|
|
106
|
+
|
|
107
|
+
export type { Simple3dSvgOptions, BackgroundOptions, AnglePreset }
|
package/lib/types.ts
CHANGED
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import type { AnglePreset } from "./getDefaultCameraForPcbBoard"
|
|
2
|
+
|
|
3
|
+
export interface BackgroundOptions {
|
|
4
|
+
color?: string
|
|
5
|
+
opacity?: number
|
|
6
|
+
}
|
|
7
|
+
|
|
8
|
+
export interface Simple3dSvgOptions {
|
|
9
|
+
camera?: {
|
|
10
|
+
position: { x: number; y: number; z: number }
|
|
11
|
+
lookAt: { x: number; y: number; z: number }
|
|
12
|
+
focalLength?: number
|
|
13
|
+
}
|
|
14
|
+
anglePreset?: AnglePreset
|
|
15
|
+
defaultZoomMultiplier?: number
|
|
16
|
+
background?: BackgroundOptions
|
|
17
|
+
width?: number
|
|
18
|
+
height?: number
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
export interface RenderSceneOptions {
|
|
22
|
+
backgroundColor?: string
|
|
23
|
+
width?: number
|
|
24
|
+
height?: number
|
|
25
|
+
viewBox?: string
|
|
26
|
+
}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import Color from "color"
|
|
2
|
+
import type { BackgroundOptions } from "../types"
|
|
3
|
+
import { isValidColor } from "./is-valid-color"
|
|
4
|
+
|
|
5
|
+
export function getColorFromBackgroundOptions(
|
|
6
|
+
background?: BackgroundOptions,
|
|
7
|
+
): string {
|
|
8
|
+
if (!background) return "lightgray"
|
|
9
|
+
|
|
10
|
+
if (background.color) {
|
|
11
|
+
if (background.opacity !== undefined) {
|
|
12
|
+
try {
|
|
13
|
+
const color = Color(background.color)
|
|
14
|
+
const opacity = Math.max(0, Math.min(1, background.opacity))
|
|
15
|
+
return color.alpha(opacity).string()
|
|
16
|
+
} catch {
|
|
17
|
+
return "lightgray"
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
if (isValidColor(background.color)) {
|
|
22
|
+
return background.color
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
return "lightgray"
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
return "lightgray"
|
|
29
|
+
}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "circuit-json-to-simple-3d",
|
|
3
3
|
"main": "dist/index.js",
|
|
4
|
-
"version": "0.0.
|
|
4
|
+
"version": "0.0.5",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"scripts": {
|
|
7
7
|
"build": "tsup-node --dts --sourcemap inline --format esm ./lib/index.ts",
|
|
@@ -17,6 +17,7 @@
|
|
|
17
17
|
"circuit-json": "^0.0.180",
|
|
18
18
|
"circuit-json-to-connectivity-map": "^0.0.22",
|
|
19
19
|
"circuit-to-svg": "^0.0.145",
|
|
20
|
+
"color": "^5.0.0",
|
|
20
21
|
"tsup": "^8.5.0"
|
|
21
22
|
},
|
|
22
23
|
"peerDependencies": {
|