circuit-json-to-gltf 0.0.140 → 0.0.141
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/dist/index.js +22 -13
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -17822,6 +17822,7 @@ var DEFAULT_GREEN_SOLDER_MASK = {
|
|
|
17822
17822
|
backgroundColor: "#0f4f30",
|
|
17823
17823
|
solderMaskWithCopperColor: "#17613b"
|
|
17824
17824
|
};
|
|
17825
|
+
var DEFAULT_FLEX_AMBER = "#cc9c33";
|
|
17825
17826
|
var BOARD_COLOR_PRESETS = {
|
|
17826
17827
|
green: DEFAULT_GREEN_SOLDER_MASK.backgroundColor,
|
|
17827
17828
|
red: "#8b1e1e",
|
|
@@ -17870,12 +17871,12 @@ var parseColor = (value) => {
|
|
|
17870
17871
|
if (resolved.startsWith("#")) return parseHexColor(resolved);
|
|
17871
17872
|
return parseRgbColor(resolved);
|
|
17872
17873
|
};
|
|
17874
|
+
var getSpecifiedColor = (value) => !value?.trim() || value.trim().toLowerCase() === "not_specified" ? void 0 : value;
|
|
17873
17875
|
var normalizeColor = (value) => {
|
|
17874
|
-
|
|
17875
|
-
|
|
17876
|
-
|
|
17877
|
-
|
|
17878
|
-
return parsed ? toHex(parsed) : value.trim();
|
|
17876
|
+
const specified = getSpecifiedColor(value);
|
|
17877
|
+
if (!specified) return void 0;
|
|
17878
|
+
const parsed = parseColor(specified);
|
|
17879
|
+
return parsed ? toHex(parsed) : specified.trim();
|
|
17879
17880
|
};
|
|
17880
17881
|
var mix = (color, target, amount) => color.map(
|
|
17881
17882
|
(channel, index) => clampByte(channel + (target[index] - channel) * amount)
|
|
@@ -17918,9 +17919,15 @@ function getBoardColorPalette(circuitJson, overrides = {}) {
|
|
|
17918
17919
|
(element) => element.type === "pcb_board"
|
|
17919
17920
|
);
|
|
17920
17921
|
const legacyBoard = board;
|
|
17921
|
-
const solderMaskColor = overrides.solderMaskColor ?? board?.solder_mask_color ?? legacyBoard?.soldermask_color;
|
|
17922
|
+
const solderMaskColor = getSpecifiedColor(overrides.solderMaskColor) ?? normalizeColor(board?.solder_mask_color) ?? normalizeColor(legacyBoard?.soldermask_color);
|
|
17922
17923
|
const silkscreenColor = overrides.silkscreenColor ?? board?.silkscreen_color;
|
|
17923
17924
|
if (!solderMaskColor) {
|
|
17925
|
+
if (board?.material === "flex") {
|
|
17926
|
+
return {
|
|
17927
|
+
...deriveBoardColorPalette(DEFAULT_FLEX_AMBER, silkscreenColor),
|
|
17928
|
+
boardSideColor: DEFAULT_FLEX_AMBER
|
|
17929
|
+
};
|
|
17930
|
+
}
|
|
17924
17931
|
return { silkscreenColor: normalizeColor(silkscreenColor) };
|
|
17925
17932
|
}
|
|
17926
17933
|
return deriveBoardColorPalette(solderMaskColor, silkscreenColor);
|
|
@@ -17929,8 +17936,9 @@ function getBoardColorPalette(circuitJson, overrides = {}) {
|
|
|
17929
17936
|
// lib/converters/board-renderer.ts
|
|
17930
17937
|
import { convertCircuitJsonToPcbSvg } from "circuit-to-svg";
|
|
17931
17938
|
async function renderBoardLayer(circuitJson, options) {
|
|
17939
|
+
const backgroundOverride = getSpecifiedColor(options.backgroundColor);
|
|
17932
17940
|
const palette = getBoardColorPalette(circuitJson, {
|
|
17933
|
-
solderMaskColor:
|
|
17941
|
+
solderMaskColor: backgroundOverride,
|
|
17934
17942
|
silkscreenColor: options.silkscreenColor
|
|
17935
17943
|
});
|
|
17936
17944
|
const {
|
|
@@ -17940,7 +17948,7 @@ async function renderBoardLayer(circuitJson, options) {
|
|
|
17940
17948
|
drillColor = "rgba(0,0,0,0.5)",
|
|
17941
17949
|
showPcbNotes = false
|
|
17942
17950
|
} = options;
|
|
17943
|
-
const backgroundColor =
|
|
17951
|
+
const backgroundColor = backgroundOverride ?? palette.backgroundColor ?? DEFAULT_GREEN_SOLDER_MASK.backgroundColor;
|
|
17944
17952
|
const silkscreenColor = options.silkscreenColor ?? palette.silkscreenColor ?? "#ffffff";
|
|
17945
17953
|
const solderMaskWithCopperColor = options.solderMaskWithCopperColor ?? palette.solderMaskWithCopperColor ?? DEFAULT_GREEN_SOLDER_MASK.solderMaskWithCopperColor;
|
|
17946
17954
|
const svg = convertCircuitJsonToPcbSvg(circuitJson, {
|
|
@@ -18035,11 +18043,12 @@ async function renderBoardTextures(circuitJson, {
|
|
|
18035
18043
|
drillColor,
|
|
18036
18044
|
showPcbNotes = false
|
|
18037
18045
|
}) {
|
|
18046
|
+
const backgroundOverride = getSpecifiedColor(backgroundColor);
|
|
18038
18047
|
const palette = getBoardColorPalette(circuitJson, {
|
|
18039
|
-
solderMaskColor:
|
|
18048
|
+
solderMaskColor: backgroundOverride,
|
|
18040
18049
|
silkscreenColor
|
|
18041
18050
|
});
|
|
18042
|
-
const resolvedBackgroundColor =
|
|
18051
|
+
const resolvedBackgroundColor = backgroundOverride ?? palette.backgroundColor ?? DEFAULT_GREEN_SOLDER_MASK.backgroundColor;
|
|
18043
18052
|
const resolvedSilkscreenColor = silkscreenColor ?? palette.silkscreenColor ?? "#ffffff";
|
|
18044
18053
|
const resolvedSolderMaskWithCopperColor = solderMaskWithCopperColor ?? palette.solderMaskWithCopperColor ?? DEFAULT_GREEN_SOLDER_MASK.solderMaskWithCopperColor;
|
|
18045
18054
|
const top = await renderBoardLayer(circuitJson, {
|
|
@@ -18086,7 +18095,6 @@ function convertCadSizeToSceneSize(size) {
|
|
|
18086
18095
|
}
|
|
18087
18096
|
async function convertCircuitJsonTo3D(inputCircuitJson, options = {}) {
|
|
18088
18097
|
const {
|
|
18089
|
-
pcbColor = "rgba(0,140,0,0.8)",
|
|
18090
18098
|
boardSideColor,
|
|
18091
18099
|
componentColor = "rgba(128,128,128,0.5)",
|
|
18092
18100
|
copperColor = "#C87B4B",
|
|
@@ -18114,11 +18122,12 @@ async function convertCircuitJsonTo3D(inputCircuitJson, options = {}) {
|
|
|
18114
18122
|
);
|
|
18115
18123
|
const db = cju(circuitJson);
|
|
18116
18124
|
const boxes = [];
|
|
18125
|
+
const pcbColorOverride = typeof options.pcbColor === "string" ? getSpecifiedColor(options.pcbColor) : options.pcbColor;
|
|
18117
18126
|
const palette = getBoardColorPalette(circuitJson, {
|
|
18118
|
-
solderMaskColor:
|
|
18127
|
+
solderMaskColor: pcbColorOverride !== void 0 ? colorToCssString(pcbColorOverride) : void 0,
|
|
18119
18128
|
silkscreenColor
|
|
18120
18129
|
});
|
|
18121
|
-
const resolvedPcbColor =
|
|
18130
|
+
const resolvedPcbColor = pcbColorOverride ?? palette.backgroundColor ?? "rgba(0,140,0,0.8)";
|
|
18122
18131
|
const resolvedBoardSideColor = boardSideColor ?? palette.boardSideColor;
|
|
18123
18132
|
const boardTextureColors = {
|
|
18124
18133
|
backgroundColor: palette.backgroundColor,
|