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

Update next/prev adjacency + tests to match engine (#3706)

Browse Source 
* update next/prev adjacency + tests to match engine

* quick tests fix post engine merge
This commit is contained in:
Mike Farrell
2024-09-03 13:34:31 -07:00
committed by GitHub
parent 0f3432b5a0
commit 3cbda10eab
4 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -304,7 +304,7 @@ async fn inner_get_next_adjacent_edge(tag: TagIdentifier, args: Args) -> Result<
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.id, edge_id: tagged_path.id,
object_id: tagged_path.sketch_group, object_id: tagged_path.sketch_group,
face_id, face_id,
@ -312,7 +312,7 @@ async fn inner_get_next_adjacent_edge(tag: TagIdentifier, args: Args) -> Result<
) )
.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 {
@ -386,7 +386,7 @@ async fn inner_get_previous_adjacent_edge(tag: TagIdentifier, args: Args) -> Res
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.id, edge_id: tagged_path.id,
object_id: tagged_path.sketch_group, object_id: tagged_path.sketch_group,
face_id, face_id,
@ -394,7 +394,7 @@ async fn inner_get_previous_adjacent_edge(tag: TagIdentifier, args: Args) -> Res
) )
.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 {

8
src/wasm-lib/tests/executor/inputs/extrude-inside-fn-with-tags.kcl
View File

@ -56,10 +56,10 @@ const bracketBody = bs
|> fillet({ |> fillet({
radius: radius, radius: radius,
tags: [ tags: [
getNextAdjacentEdge(bs.sketchGroup.tags.edge7), getPreviousAdjacentEdge(bs.sketchGroup.tags.edge7),
getNextAdjacentEdge(bs.sketchGroup.tags.edge2), getPreviousAdjacentEdge(bs.sketchGroup.tags.edge2),
getNextAdjacentEdge(bs.sketchGroup.tags.edge3), getPreviousAdjacentEdge(bs.sketchGroup.tags.edge3),
getNextAdjacentEdge(bs.sketchGroup.tags.edge6) getPreviousAdjacentEdge(bs.sketchGroup.tags.edge6)
] ]
}, %) }, %)

10
src/wasm-lib/tests/executor/inputs/global-tags.kcl
View File

@ -56,10 +56,10 @@ const bracketBody = bs
|> fillet({ |> fillet({
radius: radius, radius: radius,
tags: [ tags: [
getNextAdjacentEdge(bs.tags.edge7), getPreviousAdjacentEdge(bs.tags.edge7),
getNextAdjacentEdge(bs.tags.edge2), getPreviousAdjacentEdge(bs.tags.edge2),
getNextAdjacentEdge(bs.tags.edge3), getPreviousAdjacentEdge(bs.tags.edge3),
getNextAdjacentEdge(bs.tags.edge6) getPreviousAdjacentEdge(bs.tags.edge6)
] ]
}, %) }, %)
@ -89,7 +89,7 @@ const tabsR = startSketchOn(tabPlane)
radius: holeDiam / 2, radius: holeDiam / 2,
tags: [ tags: [
getNextAdjacentEdge(edge12), getNextAdjacentEdge(edge12),
getNextAdjacentEdge(edge13) getNextAdjacentEdge(edge11)
] ]
}, %) }, %)
|> patternLinear3d({ |> patternLinear3d({

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

@ -1287,7 +1287,7 @@ capScrew([0, 0.5, 0], 50, 37.5, 50, 25)
} }
#[tokio::test(flavor = "multi_thread")] #[tokio::test(flavor = "multi_thread")]
async fn kcl_test_bracket_with_fillets_ensure_fail_on_flush_source_ranges() { async fn kcl_test_bracket_with_fillets() {
let code = r#"// Shelf Bracket let code = r#"// Shelf Bracket
// This is a shelf bracket made out of 6061-T6 aluminum sheet metal. The required thickness is calculated based on a point load of 300 lbs applied to the end of the shelf. There are two brackets holding up the shelf, so the moment experienced is divided by 2. The shelf is 1 foot long from the wall. // This is a shelf bracket made out of 6061-T6 aluminum sheet metal. The required thickness is calculated based on a point load of 300 lbs applied to the end of the shelf. There are two brackets holding up the shelf, so the moment experienced is divided by 2. The shelf is 1 foot long from the wall.
@ -1328,11 +1328,7 @@ const bracket = startSketchOn('XY')
"#; "#;
let result = execute_and_snapshot(code, UnitLength::Mm).await; let result = execute_and_snapshot(code, UnitLength::Mm).await;
assert!(result.is_err()); assert!(result.is_ok());
assert_eq!(
result.err().unwrap().to_string(),
r#"engine: KclErrorDetails { source_ranges: [SourceRange([1329, 1430])], message: "Modeling command failed: [ApiError { error_code: BadRequest, message: \"Fillet failed\" }]" }"#
);
} }
#[tokio::test(flavor = "multi_thread")] #[tokio::test(flavor = "multi_thread")]
@ -1536,13 +1532,13 @@ const bracket = startSketchOn('XY')
|> fillet({ |> fillet({
radius: filletR, radius: filletR,
tags: [ tags: [
getPreviousAdjacentEdge(innerEdge) getNextAdjacentEdge(innerEdge)
] ]
}, %) }, %)
|> fillet({ |> fillet({
radius: filletR + thickness, radius: filletR + thickness,
tags: [ tags: [
getPreviousAdjacentEdge(outerEdge) getNextAdjacentEdge(outerEdge)
] ]
}, %) }, %)