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.
250 lines
4.2 KiB
Plaintext
250 lines
4.2 KiB
Plaintext
---
|
|
source: kcl-lib/src/simulation_tests.rs
|
|
description: Artifact commands basic_fillet_cube_end.kcl
|
|
---
|
|
[
|
|
{
|
|
"cmdId": "[uuid]",
|
|
"range": [],
|
|
"command": {
|
|
"type": "edge_lines_visible",
|
|
"hidden": false
|
|
}
|
|
},
|
|
{
|
|
"cmdId": "[uuid]",
|
|
"range": [],
|
|
"command": {
|
|
"type": "object_visible",
|
|
"object_id": "[uuid]",
|
|
"hidden": true
|
|
}
|
|
},
|
|
{
|
|
"cmdId": "[uuid]",
|
|
"range": [],
|
|
"command": {
|
|
"type": "object_visible",
|
|
"object_id": "[uuid]",
|
|
"hidden": true
|
|
}
|
|
},
|
|
{
|
|
"cmdId": "[uuid]",
|
|
"range": [],
|
|
"command": {
|
|
"type": "make_plane",
|
|
"origin": {
|
|
"x": 0.0,
|
|
"y": 0.0,
|
|
"z": 0.0
|
|
},
|
|
"x_axis": {
|
|
"x": 1.0,
|
|
"y": 0.0,
|
|
"z": 0.0
|
|
},
|
|
"y_axis": {
|
|
"x": 0.0,
|
|
"y": 1.0,
|
|
"z": 0.0
|
|
},
|
|
"size": 60.0,
|
|
"clobber": false,
|
|
"hide": true
|
|
}
|
|
},
|
|
{
|
|
"cmdId": "[uuid]",
|
|
"range": [],
|
|
"command": {
|
|
"type": "enable_sketch_mode",
|
|
"entity_id": "[uuid]",
|
|
"ortho": false,
|
|
"animated": false,
|
|
"adjust_camera": false,
|
|
"planar_normal": {
|
|
"x": 0.0,
|
|
"y": 0.0,
|
|
"z": 1.0
|
|
}
|
|
}
|
|
},
|
|
{
|
|
"cmdId": "[uuid]",
|
|
"range": [],
|
|
"command": {
|
|
"type": "move_path_pen",
|
|
"path": "[uuid]",
|
|
"to": {
|
|
"x": 0.0,
|
|
"y": 0.0,
|
|
"z": 0.0
|
|
}
|
|
}
|
|
},
|
|
{
|
|
"cmdId": "[uuid]",
|
|
"range": [],
|
|
"command": {
|
|
"type": "sketch_mode_disable"
|
|
}
|
|
},
|
|
{
|
|
"cmdId": "[uuid]",
|
|
"range": [],
|
|
"command": {
|
|
"type": "start_path"
|
|
}
|
|
},
|
|
{
|
|
"cmdId": "[uuid]",
|
|
"range": [],
|
|
"command": {
|
|
"type": "extend_path",
|
|
"path": "[uuid]",
|
|
"segment": {
|
|
"type": "line",
|
|
"end": {
|
|
"x": 0.0,
|
|
"y": 10.0,
|
|
"z": 0.0
|
|
},
|
|
"relative": true
|
|
}
|
|
}
|
|
},
|
|
{
|
|
"cmdId": "[uuid]",
|
|
"range": [],
|
|
"command": {
|
|
"type": "extend_path",
|
|
"path": "[uuid]",
|
|
"segment": {
|
|
"type": "line",
|
|
"end": {
|
|
"x": 10.0,
|
|
"y": 0.0,
|
|
"z": 0.0
|
|
},
|
|
"relative": true
|
|
}
|
|
}
|
|
},
|
|
{
|
|
"cmdId": "[uuid]",
|
|
"range": [],
|
|
"command": {
|
|
"type": "extend_path",
|
|
"path": "[uuid]",
|
|
"segment": {
|
|
"type": "line",
|
|
"end": {
|
|
"x": 0.0,
|
|
"y": -10.0,
|
|
"z": 0.0
|
|
},
|
|
"relative": true
|
|
}
|
|
}
|
|
},
|
|
{
|
|
"cmdId": "[uuid]",
|
|
"range": [],
|
|
"command": {
|
|
"type": "close_path",
|
|
"path_id": "[uuid]"
|
|
}
|
|
},
|
|
{
|
|
"cmdId": "[uuid]",
|
|
"range": [],
|
|
"command": {
|
|
"type": "enable_sketch_mode",
|
|
"entity_id": "[uuid]",
|
|
"ortho": false,
|
|
"animated": false,
|
|
"adjust_camera": false,
|
|
"planar_normal": {
|
|
"x": 0.0,
|
|
"y": 0.0,
|
|
"z": 1.0
|
|
}
|
|
}
|
|
},
|
|
{
|
|
"cmdId": "[uuid]",
|
|
"range": [],
|
|
"command": {
|
|
"type": "extrude",
|
|
"target": "[uuid]",
|
|
"distance": 10.0,
|
|
"faces": null,
|
|
"opposite": "None"
|
|
}
|
|
},
|
|
{
|
|
"cmdId": "[uuid]",
|
|
"range": [],
|
|
"command": {
|
|
"type": "object_bring_to_front",
|
|
"object_id": "[uuid]"
|
|
}
|
|
},
|
|
{
|
|
"cmdId": "[uuid]",
|
|
"range": [],
|
|
"command": {
|
|
"type": "sketch_mode_disable"
|
|
}
|
|
},
|
|
{
|
|
"cmdId": "[uuid]",
|
|
"range": [],
|
|
"command": {
|
|
"type": "solid3d_get_adjacency_info",
|
|
"object_id": "[uuid]",
|
|
"edge_id": "[uuid]"
|
|
}
|
|
},
|
|
{
|
|
"cmdId": "[uuid]",
|
|
"range": [],
|
|
"command": {
|
|
"type": "solid3d_get_extrusion_face_info",
|
|
"object_id": "[uuid]",
|
|
"edge_id": "[uuid]"
|
|
}
|
|
},
|
|
{
|
|
"cmdId": "[uuid]",
|
|
"range": [],
|
|
"command": {
|
|
"type": "solid3d_fillet_edge",
|
|
"object_id": "[uuid]",
|
|
"edge_id": null,
|
|
"edge_ids": [
|
|
"[uuid]",
|
|
"[uuid]"
|
|
],
|
|
"radius": 2.0,
|
|
"tolerance": 0.0000001,
|
|
"cut_type": "fillet",
|
|
"strategy": "automatic",
|
|
"extra_face_ids": [
|
|
"[uuid]"
|
|
]
|
|
}
|
|
},
|
|
{
|
|
"cmdId": "[uuid]",
|
|
"range": [],
|
|
"command": {
|
|
"type": "solid3d_get_opposite_edge",
|
|
"object_id": "[uuid]",
|
|
"edge_id": "[uuid]",
|
|
"face_id": "[uuid]"
|
|
}
|
|
}
|
|
]
|