85ccc6900c
KCL's `fillet` function takes an array of edges to fillet. Previously this would do `n` fillet API commands, one per edge. This PR combines them all into one call, which should improve performance. You can see the effect in the artifact_commands snapshots, e.g. `rust/kcl-lib/tests/kcl_samples/axial-fan/artifact_commands.snap`
Besides performance, this should fix a bug where some KCL fillets would fail, when they should have succeeded. Example from @max-mrgrsk:
```kcl
sketch001 = startSketchOn(XY)
|> startProfile(at = [-12, -6])
|> line(end = [0, 12], tag = $seg04)
|> line(end = [24, 0], tag = $seg03)
|> line(end = [0, -12], tag = $seg02)
|> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $seg01)
|> close()
extrude001 = extrude(
sketch001,
length = 12,
tagEnd = $capEnd001,
tagStart = $capStart001,
)
|> fillet(
radius = 5,
tags = [
getCommonEdge(faces = [seg02, capEnd001]),
getCommonEdge(faces = [seg01, capEnd001]),
getCommonEdge(faces = [seg03, capEnd001]),
getCommonEdge(faces = [seg04, capEnd001])
],
)
```
This program fails on main, but succeeds on this branch.
6.4 KiB
6.4 KiB
flowchart LR
subgraph path4 [Path]
4["Path<br>[2083, 2108, 0]"]
%% [ProgramBodyItem { index: 20 }, VariableDeclarationDeclaration, VariableDeclarationInit, PipeBodyItem { index: 1 }]
7["Segment<br>[2114, 2172, 0]"]
%% [ProgramBodyItem { index: 20 }, VariableDeclarationDeclaration, VariableDeclarationInit, PipeBodyItem { index: 2 }]
8["Segment<br>[2178, 2217, 0]"]
%% [ProgramBodyItem { index: 20 }, VariableDeclarationDeclaration, VariableDeclarationInit, PipeBodyItem { index: 3 }]
9["Segment<br>[2223, 2270, 0]"]
%% [ProgramBodyItem { index: 20 }, VariableDeclarationDeclaration, VariableDeclarationInit, PipeBodyItem { index: 4 }]
10["Segment<br>[2276, 2322, 0]"]
%% [ProgramBodyItem { index: 20 }, VariableDeclarationDeclaration, VariableDeclarationInit, PipeBodyItem { index: 5 }]
11["Segment<br>[2328, 2367, 0]"]
%% [ProgramBodyItem { index: 20 }, VariableDeclarationDeclaration, VariableDeclarationInit, PipeBodyItem { index: 6 }]
12["Segment<br>[2373, 2443, 0]"]
%% [ProgramBodyItem { index: 20 }, VariableDeclarationDeclaration, VariableDeclarationInit, PipeBodyItem { index: 7 }]
13["Segment<br>[2449, 2456, 0]"]
%% [ProgramBodyItem { index: 20 }, VariableDeclarationDeclaration, VariableDeclarationInit, PipeBodyItem { index: 8 }]
17[Solid2d]
end
subgraph path5 [Path]
5["Path<br>[2601, 2791, 0]"]
%% [ProgramBodyItem { index: 21 }, VariableDeclarationDeclaration, VariableDeclarationInit, PipeBodyItem { index: 1 }]
14["Segment<br>[2601, 2791, 0]"]
%% [ProgramBodyItem { index: 21 }, VariableDeclarationDeclaration, VariableDeclarationInit, PipeBodyItem { index: 1 }]
18[Solid2d]
end
subgraph path6 [Path]
6["Path<br>[3225, 3427, 0]"]
%% [ProgramBodyItem { index: 22 }, VariableDeclarationDeclaration, VariableDeclarationInit, PipeBodyItem { index: 1 }]
15["Segment<br>[3225, 3427, 0]"]
%% [ProgramBodyItem { index: 22 }, VariableDeclarationDeclaration, VariableDeclarationInit, PipeBodyItem { index: 1 }]
16[Solid2d]
end
1["Plane<br>[2060, 2077, 0]"]
%% [ProgramBodyItem { index: 20 }, VariableDeclarationDeclaration, VariableDeclarationInit, PipeBodyItem { index: 0 }]
2["StartSketchOnFace<br>[2555, 2595, 0]"]
%% [ProgramBodyItem { index: 21 }, VariableDeclarationDeclaration, VariableDeclarationInit, PipeBodyItem { index: 0 }]
3["StartSketchOnFace<br>[3179, 3219, 0]"]
%% [ProgramBodyItem { index: 22 }, VariableDeclarationDeclaration, VariableDeclarationInit, PipeBodyItem { index: 0 }]
19["Sweep Extrusion<br>[2462, 2488, 0]"]
%% [ProgramBodyItem { index: 20 }, VariableDeclarationDeclaration, VariableDeclarationInit, PipeBodyItem { index: 9 }]
20["Sweep Extrusion<br>[3077, 3114, 0]"]
%% [ProgramBodyItem { index: 21 }, VariableDeclarationDeclaration, VariableDeclarationInit, PipeBodyItem { index: 4 }]
21["Sweep Extrusion<br>[3077, 3114, 0]"]
%% [ProgramBodyItem { index: 21 }, VariableDeclarationDeclaration, VariableDeclarationInit, PipeBodyItem { index: 4 }]
22["Sweep Extrusion<br>[3077, 3114, 0]"]
%% [ProgramBodyItem { index: 21 }, VariableDeclarationDeclaration, VariableDeclarationInit, PipeBodyItem { index: 4 }]
23["Sweep Extrusion<br>[3077, 3114, 0]"]
%% [ProgramBodyItem { index: 21 }, VariableDeclarationDeclaration, VariableDeclarationInit, PipeBodyItem { index: 4 }]
24["Sweep Extrusion<br>[3542, 3579, 0]"]
%% [ProgramBodyItem { index: 22 }, VariableDeclarationDeclaration, VariableDeclarationInit, PipeBodyItem { index: 3 }]
25["Sweep Extrusion<br>[3542, 3579, 0]"]
%% [ProgramBodyItem { index: 22 }, VariableDeclarationDeclaration, VariableDeclarationInit, PipeBodyItem { index: 3 }]
26[Wall]
%% face_code_ref=Missing NodePath
27[Wall]
%% face_code_ref=Missing NodePath
28[Wall]
%% face_code_ref=Missing NodePath
29[Wall]
%% face_code_ref=Missing NodePath
30[Wall]
%% face_code_ref=Missing NodePath
31[Wall]
%% face_code_ref=Missing NodePath
32[Wall]
%% face_code_ref=[ProgramBodyItem { index: 21 }, VariableDeclarationDeclaration, VariableDeclarationInit, PipeBodyItem { index: 0 }]
33[Wall]
%% face_code_ref=[ProgramBodyItem { index: 22 }, VariableDeclarationDeclaration, VariableDeclarationInit, PipeBodyItem { index: 0 }]
34["Cap Start"]
%% face_code_ref=Missing NodePath
35["Cap End"]
%% face_code_ref=Missing NodePath
36["SweepEdge Opposite"]
37["SweepEdge Opposite"]
38["SweepEdge Opposite"]
39["SweepEdge Opposite"]
40["SweepEdge Opposite"]
41["SweepEdge Opposite"]
42["SweepEdge Opposite"]
43["SweepEdge Opposite"]
44["SweepEdge Adjacent"]
45["SweepEdge Adjacent"]
46["SweepEdge Adjacent"]
47["SweepEdge Adjacent"]
48["SweepEdge Adjacent"]
49["SweepEdge Adjacent"]
50["SweepEdge Adjacent"]
51["SweepEdge Adjacent"]
52["EdgeCut Fillet<br>[3596, 3676, 0]"]
%% [ProgramBodyItem { index: 23 }, ExpressionStatementExpr]
53["EdgeCut Fillet<br>[3677, 3754, 0]"]
%% [ProgramBodyItem { index: 24 }, ExpressionStatementExpr]
54["EdgeCut Fillet<br>[3780, 3922, 0]"]
%% [ProgramBodyItem { index: 25 }, ExpressionStatementExpr]
1 --- 4
32 x--> 2
33 x--> 3
4 --- 7
4 --- 8
4 --- 9
4 --- 10
4 --- 11
4 --- 12
4 --- 13
4 --- 17
4 ---- 19
5 --- 14
5 --- 18
5 ---- 21
32 --- 5
6 --- 15
6 --- 16
6 ---- 25
33 --- 6
7 --- 31
7 x--> 34
7 --- 38
7 --- 46
8 --- 30
8 x--> 34
8 --- 39
8 --- 47
8 --- 54
9 --- 32
9 x--> 34
9 --- 40
9 --- 48
10 --- 33
10 x--> 34
10 --- 41
10 --- 49
11 --- 29
11 x--> 34
11 --- 42
11 --- 50
12 --- 28
12 x--> 34
12 --- 43
12 --- 51
14 --- 26
14 x--> 32
14 --- 36
14 --- 44
15 --- 27
15 x--> 33
15 --- 37
15 --- 45
19 --- 28
19 --- 29
19 --- 30
19 --- 31
19 --- 32
19 --- 33
19 --- 34
19 --- 35
19 --- 38
19 --- 39
19 --- 40
19 --- 41
19 --- 42
19 --- 43
19 --- 46
19 --- 47
19 --- 48
19 --- 49
19 --- 50
19 --- 51
21 --- 26
21 --- 36
21 --- 44
25 --- 27
25 --- 37
25 --- 45
26 --- 36
26 --- 44
27 --- 37
27 --- 45
37 <--x 28
28 --- 43
50 <--x 28
28 --- 51
29 --- 42
49 <--x 29
29 --- 50
30 --- 39
46 <--x 30
30 --- 47
36 <--x 31
31 --- 38
31 --- 46
51 <--x 31
32 --- 40
47 <--x 32
32 --- 48
33 --- 41
48 <--x 33
33 --- 49
38 <--x 35
39 <--x 35
40 <--x 35
41 <--x 35
42 <--x 35
43 <--x 35
48 <--x 52
51 <--x 53