ByoungSooPark/modeling-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prepare change in fillet api (#5168)

Browse Source 
* updates

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* bump version

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* updates

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* more snaps

Signed-off-by: Jess Frazelle <github@jessfraz.com>

---------

Signed-off-by: Jess Frazelle <github@jessfraz.com>
This commit is contained in:
Jess Frazelle
2025-01-28 14:22:19 -08:00
committed by GitHub
parent 8ca8c49cc3
commit 69fec37107
16 changed files with 34 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/wasm-lib/Cargo.lock generated
View File

@ -1710,7 +1710,7 @@ dependencies = [
[[package]] [[package]]
name = "kcl-lib" name = "kcl-lib"
version = "0.2.30" version = "0.2.31"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"approx 0.5.1", "approx 0.5.1",
@ -1844,9 +1844,9 @@ dependencies = [
[[package]] [[package]]
name = "kittycad-modeling-cmds" name = "kittycad-modeling-cmds"
version = "0.2.92" version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c5fc91d0cdacd1c2ba906f564e58ce07c70a5c471f19b0f4c0b67e754077bfdc" checksum = "67a993046541732e3c3ddd8a0364b55b7b138a9258beff353b6e7a043a41dce3"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"chrono", "chrono",

2
src/wasm-lib/Cargo.toml
View File

@ -76,7 +76,7 @@ members = [
[workspace.dependencies] [workspace.dependencies]
http = "1" http = "1"
kittycad = { version = "0.3.28", default-features = false, features = ["js", "requests"] } kittycad = { version = "0.3.28", default-features = false, features = ["js", "requests"] }
kittycad-modeling-cmds = { version = "0.2.92", features = [ kittycad-modeling-cmds = { version = "0.2.93", features = [
"ts-rs", "ts-rs",
"websocket", "websocket",
] } ] }

2
src/wasm-lib/kcl/Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "kcl-lib" name = "kcl-lib"
description = "KittyCAD Language implementation and tools" description = "KittyCAD Language implementation and tools"
version = "0.2.30" version = "0.2.31"
edition = "2021" edition = "2021"
license = "MIT" license = "MIT"
repository = "https://github.com/KittyCAD/modeling-app" repository = "https://github.com/KittyCAD/modeling-app"

6
src/wasm-lib/kcl/src/std/chamfer.rs
View File

@ -143,10 +143,8 @@ async fn inner_chamfer(
radius: LengthUnit(data.length), radius: LengthUnit(data.length),
tolerance: LengthUnit(DEFAULT_TOLERANCE), // We can let the user set this in the future. tolerance: LengthUnit(DEFAULT_TOLERANCE), // We can let the user set this in the future.
cut_type: CutType::Chamfer, cut_type: CutType::Chamfer,
// We pass in the command id as the face id. // We make this a none so that we can remove it in the future.
// So the resulting face of the fillet will be the same. face_id: None,
// This is because that's how most other endpoints work.
face_id: Some(id),
}), }),
) )
.await?; .await?;

6
src/wasm-lib/kcl/src/std/fillet.rs
View File

@ -152,10 +152,8 @@ async fn inner_fillet(
radius: LengthUnit(data.radius), radius: LengthUnit(data.radius),
tolerance: LengthUnit(data.tolerance.unwrap_or(default_tolerance(&args.ctx.settings.units))), tolerance: LengthUnit(data.tolerance.unwrap_or(default_tolerance(&args.ctx.settings.units))),
cut_type: CutType::Fillet, cut_type: CutType::Fillet,
// We pass in the command id as the face id. // We make this a none so that we can remove it in the future.
// So the resulting face of the fillet will be the same. face_id: None,
// This is because that's how most other endpoints work.
face_id: Some(id),
}), }),
) )
.await?; .await?;

3
src/wasm-lib/kcl/tests/artifact_graph_example_code1/artifact_commands.snap
View File

@ -661,8 +661,7 @@ snapshot_kind: text
"edge_id": "[uuid]", "edge_id": "[uuid]",
"radius": 5.0, "radius": 5.0,
"tolerance": 0.0000001, "tolerance": 0.0000001,
"cut_type": "fillet", "cut_type": "fillet"
"face_id": "[uuid]"
} }
}, },
{ {

6
src/wasm-lib/kcl/tests/basic_fillet_cube_close_opposite/artifact_commands.snap
View File

@ -654,8 +654,7 @@ snapshot_kind: text
"edge_id": "[uuid]", "edge_id": "[uuid]",
"radius": 2.0, "radius": 2.0,
"tolerance": 0.0000001, "tolerance": 0.0000001,
"cut_type": "fillet", "cut_type": "fillet"
"face_id": "[uuid]"
} }
}, },
{ {
@ -671,8 +670,7 @@ snapshot_kind: text
"edge_id": "[uuid]", "edge_id": "[uuid]",
"radius": 2.0, "radius": 2.0,
"tolerance": 0.0000001, "tolerance": 0.0000001,
"cut_type": "fillet", "cut_type": "fillet"
"face_id": "[uuid]"
} }
} }
] ]

6
src/wasm-lib/kcl/tests/basic_fillet_cube_end/artifact_commands.snap
View File

@ -654,8 +654,7 @@ snapshot_kind: text
"edge_id": "[uuid]", "edge_id": "[uuid]",
"radius": 2.0, "radius": 2.0,
"tolerance": 0.0000001, "tolerance": 0.0000001,
"cut_type": "fillet", "cut_type": "fillet"
"face_id": "[uuid]"
} }
}, },
{ {
@ -671,8 +670,7 @@ snapshot_kind: text
"edge_id": "[uuid]", "edge_id": "[uuid]",
"radius": 2.0, "radius": 2.0,
"tolerance": 0.0000001, "tolerance": 0.0000001,
"cut_type": "fillet", "cut_type": "fillet"
"face_id": "[uuid]"
} }
} }
] ]

3
src/wasm-lib/kcl/tests/basic_fillet_cube_next_adjacent/artifact_commands.snap
View File

@ -654,8 +654,7 @@ snapshot_kind: text
"edge_id": "[uuid]", "edge_id": "[uuid]",
"radius": 2.0, "radius": 2.0,
"tolerance": 0.0000001, "tolerance": 0.0000001,
"cut_type": "fillet", "cut_type": "fillet"
"face_id": "[uuid]"
} }
} }
] ]

3
src/wasm-lib/kcl/tests/basic_fillet_cube_previous_adjacent/artifact_commands.snap
View File

@ -654,8 +654,7 @@ snapshot_kind: text
"edge_id": "[uuid]", "edge_id": "[uuid]",
"radius": 2.0, "radius": 2.0,
"tolerance": 0.0000001, "tolerance": 0.0000001,
"cut_type": "fillet", "cut_type": "fillet"
"face_id": "[uuid]"
} }
} }
] ]

6
src/wasm-lib/kcl/tests/basic_fillet_cube_start/artifact_commands.snap
View File

@ -640,8 +640,7 @@ snapshot_kind: text
"edge_id": "[uuid]", "edge_id": "[uuid]",
"radius": 2.0, "radius": 2.0,
"tolerance": 0.0000001, "tolerance": 0.0000001,
"cut_type": "fillet", "cut_type": "fillet"
"face_id": "[uuid]"
} }
}, },
{ {
@ -657,8 +656,7 @@ snapshot_kind: text
"edge_id": "[uuid]", "edge_id": "[uuid]",
"radius": 2.0, "radius": 2.0,
"tolerance": 0.0000001, "tolerance": 0.0000001,
"cut_type": "fillet", "cut_type": "fillet"
"face_id": "[uuid]"
} }
} }
] ]

12
src/wasm-lib/kcl/tests/fillet-and-shell/artifact_commands.snap
View File

@ -2487,8 +2487,7 @@ snapshot_kind: text
"edge_id": "[uuid]", "edge_id": "[uuid]",
"radius": 1.0, "radius": 1.0,
"tolerance": 0.0000001, "tolerance": 0.0000001,
"cut_type": "fillet", "cut_type": "fillet"
"face_id": "[uuid]"
} }
}, },
{ {
@ -2504,8 +2503,7 @@ snapshot_kind: text
"edge_id": "[uuid]", "edge_id": "[uuid]",
"radius": 1.0, "radius": 1.0,
"tolerance": 0.0000001, "tolerance": 0.0000001,
"cut_type": "fillet", "cut_type": "fillet"
"face_id": "[uuid]"
} }
}, },
{ {
@ -2521,8 +2519,7 @@ snapshot_kind: text
"edge_id": "[uuid]", "edge_id": "[uuid]",
"radius": 1.0, "radius": 1.0,
"tolerance": 0.0000001, "tolerance": 0.0000001,
"cut_type": "fillet", "cut_type": "fillet"
"face_id": "[uuid]"
} }
}, },
{ {
@ -2538,8 +2535,7 @@ snapshot_kind: text
"edge_id": "[uuid]", "edge_id": "[uuid]",
"radius": 1.0, "radius": 1.0,
"tolerance": 0.0000001, "tolerance": 0.0000001,
"cut_type": "fillet", "cut_type": "fillet"
"face_id": "[uuid]"
} }
}, },
{ {

12
src/wasm-lib/kcl/tests/pentagon_fillet_sugar/artifact_commands.snap
View File

@ -782,8 +782,7 @@ snapshot_kind: text
"edge_id": "[uuid]", "edge_id": "[uuid]",
"radius": 5.0, "radius": 5.0,
"tolerance": 0.0000001, "tolerance": 0.0000001,
"cut_type": "fillet", "cut_type": "fillet"
"face_id": "[uuid]"
} }
}, },
{ {
@ -799,8 +798,7 @@ snapshot_kind: text
"edge_id": "[uuid]", "edge_id": "[uuid]",
"radius": 5.0, "radius": 5.0,
"tolerance": 0.0000001, "tolerance": 0.0000001,
"cut_type": "fillet", "cut_type": "fillet"
"face_id": "[uuid]"
} }
}, },
{ {
@ -1009,8 +1007,7 @@ snapshot_kind: text
"edge_id": "[uuid]", "edge_id": "[uuid]",
"radius": 5.0, "radius": 5.0,
"tolerance": 0.0000001, "tolerance": 0.0000001,
"cut_type": "fillet", "cut_type": "fillet"
"face_id": "[uuid]"
} }
}, },
{ {
@ -1026,8 +1023,7 @@ snapshot_kind: text
"edge_id": "[uuid]", "edge_id": "[uuid]",
"radius": 5.0, "radius": 5.0,
"tolerance": 0.0000001, "tolerance": 0.0000001,
"cut_type": "fillet", "cut_type": "fillet"
"face_id": "[uuid]"
} }
} }
] ]

9
src/wasm-lib/kcl/tests/sketch-on-chamfer-two-times-different-order/artifact_commands.snap
View File

@ -675,8 +675,7 @@ snapshot_kind: text
"edge_id": "[uuid]", "edge_id": "[uuid]",
"radius": 20.0, "radius": 20.0,
"tolerance": 0.0000001, "tolerance": 0.0000001,
"cut_type": "fillet", "cut_type": "fillet"
"face_id": "[uuid]"
} }
}, },
{ {
@ -692,8 +691,7 @@ snapshot_kind: text
"edge_id": "[uuid]", "edge_id": "[uuid]",
"radius": 50.0, "radius": 50.0,
"tolerance": 0.0000001, "tolerance": 0.0000001,
"cut_type": "chamfer", "cut_type": "chamfer"
"face_id": "[uuid]"
} }
}, },
{ {
@ -709,8 +707,7 @@ snapshot_kind: text
"edge_id": "[uuid]", "edge_id": "[uuid]",
"radius": 50.0, "radius": 50.0,
"tolerance": 0.0000001, "tolerance": 0.0000001,
"cut_type": "chamfer", "cut_type": "chamfer"
"face_id": "[uuid]"
} }
}, },
{ {

9
src/wasm-lib/kcl/tests/sketch-on-chamfer-two-times/artifact_commands.snap
View File

@ -675,8 +675,7 @@ snapshot_kind: text
"edge_id": "[uuid]", "edge_id": "[uuid]",
"radius": 20.0, "radius": 20.0,
"tolerance": 0.0000001, "tolerance": 0.0000001,
"cut_type": "fillet", "cut_type": "fillet"
"face_id": "[uuid]"
} }
}, },
{ {
@ -692,8 +691,7 @@ snapshot_kind: text
"edge_id": "[uuid]", "edge_id": "[uuid]",
"radius": 50.0, "radius": 50.0,
"tolerance": 0.0000001, "tolerance": 0.0000001,
"cut_type": "chamfer", "cut_type": "chamfer"
"face_id": "[uuid]"
} }
}, },
{ {
@ -709,8 +707,7 @@ snapshot_kind: text
"edge_id": "[uuid]", "edge_id": "[uuid]",
"radius": 50.0, "radius": 50.0,
"tolerance": 0.0000001, "tolerance": 0.0000001,
"cut_type": "chamfer", "cut_type": "chamfer"
"face_id": "[uuid]"
} }
}, },
{ {

6
src/wasm-lib/kcl/tests/sketch_on_face_after_fillets_referencing_face/artifact_commands.snap
View File

@ -766,8 +766,7 @@ snapshot_kind: text
"edge_id": "[uuid]", "edge_id": "[uuid]",
"radius": 0.25, "radius": 0.25,
"tolerance": 0.0000001, "tolerance": 0.0000001,
"cut_type": "fillet", "cut_type": "fillet"
"face_id": "[uuid]"
} }
}, },
{ {
@ -783,8 +782,7 @@ snapshot_kind: text
"edge_id": "[uuid]", "edge_id": "[uuid]",
"radius": 0.5707134902949093, "radius": 0.5707134902949093,
"tolerance": 0.0000001, "tolerance": 0.0000001,
"cut_type": "fillet", "cut_type": "fillet"
"face_id": "[uuid]"
} }
}, },
{ {