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

swap prev and next logic (#1936)

Browse Source 
Signed-off-by: Jess Frazelle <github@jessfraz.com>
This commit is contained in:
Jess Frazelle
2024-03-27 11:26:06 -07:00
committed by GitHub
parent 4c93346f48
commit 32a2835d0e
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/kcl/getNextAdjacentEdge.md
View File

@ -20,11 +20,11 @@ const part001 = startSketchOn('XY')
|> line([0, 10], %, "thing") |> line([0, 10], %, "thing")
|> line([10, 0], %, "thing1") |> line([10, 0], %, "thing1")
|> line([0, -10], %, "thing2") |> line([0, -10], %, "thing2")
|> close(%) |> close(%, "thing3")
|> extrude(10, %) |> extrude(10, %)
|> fillet({ |> fillet({
radius: 2, radius: 2,
tags: [getNextAdjacentEdge("thing", %)] tags: [getNextAdjacentEdge("thing3", %)]
}, %) }, %)
``` ```

4
docs/kcl/getPreviousAdjacentEdge.md
View File

@ -20,11 +20,11 @@ const part001 = startSketchOn('XY')
|> line([0, 10], %, "thing") |> line([0, 10], %, "thing")
|> line([10, 0], %, "thing1") |> line([10, 0], %, "thing1")
|> line([0, -10], %, "thing2") |> line([0, -10], %, "thing2")
|> close(%) |> close(%, "thing3")
|> extrude(10, %) |> extrude(10, %)
|> fillet({ |> fillet({
radius: 2, radius: 2,
tags: [getPreviousAdjacentEdge("thing2", %)] tags: [getPreviousAdjacentEdge("thing3", %)]
}, %) }, %)
``` ```

4
docs/kcl/std.json
View File

@ -28183,7 +28183,7 @@
"unpublished": false, "unpublished": false,
"deprecated": false, "deprecated": false,
"examples": [ "examples": [
"const part001 = startSketchOn('XY')\n |> startProfileAt([0, 0], %)\n |> line([0, 10], %, \"thing\")\n |> line([10, 0], %, \"thing1\")\n |> line([0, -10], %, \"thing2\")\n |> close(%)\n |> extrude(10, %)\n |> fillet({\n radius: 2,\n tags: [getNextAdjacentEdge(\"thing\", %)]\n }, %)" "const part001 = startSketchOn('XY')\n |> startProfileAt([0, 0], %)\n |> line([0, 10], %, \"thing\")\n |> line([10, 0], %, \"thing1\")\n |> line([0, -10], %, \"thing2\")\n |> close(%, \"thing3\")\n |> extrude(10, %)\n |> fillet({\n radius: 2,\n tags: [getNextAdjacentEdge(\"thing3\", %)]\n }, %)"
] ]
}, },
{ {
@ -29755,7 +29755,7 @@
"unpublished": false, "unpublished": false,
"deprecated": false, "deprecated": false,
"examples": [ "examples": [
"const part001 = startSketchOn('XY')\n |> startProfileAt([0, 0], %)\n |> line([0, 10], %, \"thing\")\n |> line([10, 0], %, \"thing1\")\n |> line([0, -10], %, \"thing2\")\n |> close(%)\n |> extrude(10, %)\n |> fillet({\n radius: 2,\n tags: [getPreviousAdjacentEdge(\"thing2\", %)]\n }, %)" "const part001 = startSketchOn('XY')\n |> startProfileAt([0, 0], %)\n |> line([0, 10], %, \"thing\")\n |> line([10, 0], %, \"thing1\")\n |> line([0, -10], %, \"thing2\")\n |> close(%, \"thing3\")\n |> extrude(10, %)\n |> fillet({\n radius: 2,\n tags: [getPreviousAdjacentEdge(\"thing3\", %)]\n }, %)"
] ]
}, },
{ {

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

@ -204,9 +204,9 @@ pub async fn get_next_adjacent_edge(args: Args) -> Result<MemoryItem, KclError>
/// |> line([0, 10], %, "thing") /// |> line([0, 10], %, "thing")
/// |> line([10, 0], %, "thing1") /// |> line([10, 0], %, "thing1")
/// |> line([0, -10], %, "thing2") /// |> line([0, -10], %, "thing2")
/// |> close(%) /// |> close(%, "thing3")
/// |> extrude(10, %) /// |> extrude(10, %)
/// |> fillet({radius: 2, tags: [getNextAdjacentEdge("thing", %)]}, %) /// |> fillet({radius: 2, tags: [getNextAdjacentEdge("thing3", %)]}, %)
/// ``` /// ```
#[stdlib { #[stdlib {
name = "getNextAdjacentEdge", name = "getNextAdjacentEdge",
@ -233,7 +233,7 @@ async fn inner_get_next_adjacent_edge(
let resp = args let resp = args
.send_modeling_cmd( .send_modeling_cmd(
uuid::Uuid::new_v4(), uuid::Uuid::new_v4(),
ModelingCmd::Solid3DGetNextAdjacentEdge { ModelingCmd::Solid3DGetPrevAdjacentEdge {
edge_id: tagged_path.geo_meta.id, edge_id: tagged_path.geo_meta.id,
object_id: extrude_group.id, object_id: extrude_group.id,
face_id, face_id,
@ -241,7 +241,7 @@ async fn inner_get_next_adjacent_edge(
) )
.await?; .await?;
let kittycad::types::OkWebSocketResponseData::Modeling { let kittycad::types::OkWebSocketResponseData::Modeling {
modeling_response: kittycad::types::OkModelingCmdResponse::Solid3DGetNextAdjacentEdge { data: ajacent_edge }, modeling_response: kittycad::types::OkModelingCmdResponse::Solid3DGetPrevAdjacentEdge { data: ajacent_edge },
} = &resp } = &resp
else { else {
return Err(KclError::Engine(KclErrorDetails { return Err(KclError::Engine(KclErrorDetails {
@ -282,9 +282,9 @@ pub async fn get_previous_adjacent_edge(args: Args) -> Result<MemoryItem, KclErr
/// |> line([0, 10], %, "thing") /// |> line([0, 10], %, "thing")
/// |> line([10, 0], %, "thing1") /// |> line([10, 0], %, "thing1")
/// |> line([0, -10], %, "thing2") /// |> line([0, -10], %, "thing2")
/// |> close(%) /// |> close(%, "thing3")
/// |> extrude(10, %) /// |> extrude(10, %)
/// |> fillet({radius: 2, tags: [getPreviousAdjacentEdge("thing2", %)]}, %) /// |> fillet({radius: 2, tags: [getPreviousAdjacentEdge("thing3", %)]}, %)
/// ``` /// ```
#[stdlib { #[stdlib {
name = "getPreviousAdjacentEdge", name = "getPreviousAdjacentEdge",
@ -311,7 +311,7 @@ async fn inner_get_previous_adjacent_edge(
let resp = args let resp = args
.send_modeling_cmd( .send_modeling_cmd(
uuid::Uuid::new_v4(), uuid::Uuid::new_v4(),
ModelingCmd::Solid3DGetPrevAdjacentEdge { ModelingCmd::Solid3DGetNextAdjacentEdge {
edge_id: tagged_path.geo_meta.id, edge_id: tagged_path.geo_meta.id,
object_id: extrude_group.id, object_id: extrude_group.id,
face_id, face_id,
@ -319,7 +319,7 @@ async fn inner_get_previous_adjacent_edge(
) )
.await?; .await?;
let kittycad::types::OkWebSocketResponseData::Modeling { let kittycad::types::OkWebSocketResponseData::Modeling {
modeling_response: kittycad::types::OkModelingCmdResponse::Solid3DGetPrevAdjacentEdge { data: ajacent_edge }, modeling_response: kittycad::types::OkModelingCmdResponse::Solid3DGetNextAdjacentEdge { data: ajacent_edge },
} = &resp } = &resp
else { else {
return Err(KclError::Engine(KclErrorDetails { return Err(KclError::Engine(KclErrorDetails {

8
src/wasm-lib/tests/executor/main.rs
View File

@ -293,9 +293,9 @@ async fn serial_test_basic_fillet_cube_next_adjacent() {
|> line([0, 10], %, "thing") |> line([0, 10], %, "thing")
|> line([10, 0], %, "thing1") |> line([10, 0], %, "thing1")
|> line([0, -10], %, "thing2") |> line([0, -10], %, "thing2")
|> close(%) |> close(%, "thing3")
|> extrude(10, %) |> extrude(10, %)
|> fillet({radius: 2, tags: [getNextAdjacentEdge("thing", %)]}, %) |> fillet({radius: 2, tags: [getNextAdjacentEdge("thing3", %)]}, %)
"#; "#;
let result = execute_and_snapshot(code, kittycad::types::UnitLength::Mm) let result = execute_and_snapshot(code, kittycad::types::UnitLength::Mm)
@ -315,9 +315,9 @@ async fn serial_test_basic_fillet_cube_previous_adjacent() {
|> line([0, 10], %, "thing") |> line([0, 10], %, "thing")
|> line([10, 0], %, "thing1") |> line([10, 0], %, "thing1")
|> line([0, -10], %, "thing2") |> line([0, -10], %, "thing2")
|> close(%) |> close(%, "thing3")
|> extrude(10, %) |> extrude(10, %)
|> fillet({radius: 2, tags: [getPreviousAdjacentEdge("thing2", %)]}, %) |> fillet({radius: 2, tags: [getPreviousAdjacentEdge("thing3", %)]}, %)
"#; "#;
let result = execute_and_snapshot(code, kittycad::types::UnitLength::Mm) let result = execute_and_snapshot(code, kittycad::types::UnitLength::Mm)