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

Update kittycad.rs (#919)

Browse Source
This commit is contained in:
Adam Chalmers
2023-10-23 14:03:38 -07:00
committed by GitHub
parent 1e23be8f08
commit 318e4a0cc7
4 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src-tauri/Cargo.lock generated
View File

@ -122,6 +122,12 @@ dependencies = [
"system-deps 6.1.0", "system-deps 6.1.0",
] ]
[[package]]
name = "atomic"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba"
[[package]] [[package]]
name = "autocfg" name = "autocfg"
version = "1.1.0" version = "1.1.0"
@ -1658,9 +1664,9 @@ dependencies = [
[[package]] [[package]]
name = "kittycad" name = "kittycad"
version = "0.2.33" version = "0.2.38"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d341a81a4dfef43460d395c87d86c17e24affb96db0e7f4a35e8688f0e092344" checksum = "633a728fb7209b398b7fa5b67460cb7f3cdb268c6b2a9e81967dda464cfbb5c1"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@ -4314,6 +4320,7 @@ version = "1.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2"
dependencies = [ dependencies = [
"atomic",
"getrandom 0.2.9", "getrandom 0.2.9",
"serde", "serde",
] ]

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

@ -170,6 +170,12 @@ dependencies = [
"syn 2.0.38", "syn 2.0.38",
] ]
[[package]]
name = "atomic"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba"
[[package]] [[package]]
name = "atty" name = "atty"
version = "0.2.14" version = "0.2.14"
@ -1426,9 +1432,9 @@ dependencies = [
[[package]] [[package]]
name = "kittycad" name = "kittycad"
version = "0.2.33" version = "0.2.38"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d341a81a4dfef43460d395c87d86c17e24affb96db0e7f4a35e8688f0e092344" checksum = "633a728fb7209b398b7fa5b67460cb7f3cdb268c6b2a9e81967dda464cfbb5c1"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@ -1914,7 +1920,7 @@ dependencies = [
"bincode", "bincode",
"either", "either",
"fnv", "fnv",
"itertools 0.10.5", "itertools 0.11.0",
"lazy_static", "lazy_static",
"nom", "nom",
"quick-xml", "quick-xml",
@ -3466,6 +3472,7 @@ version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
dependencies = [ dependencies = [
"atomic",
"getrandom", "getrandom",
"serde", "serde",
"wasm-bindgen", "wasm-bindgen",

2
src/wasm-lib/kcl/src/std/sketch.rs
View File

@ -1049,6 +1049,8 @@ async fn inner_arc(data: ArcData, sketch_group: Box<SketchGroup>, args: Args) ->
segment: kittycad::types::PathSegment::Arc { segment: kittycad::types::PathSegment::Arc {
angle_start: angle_start.degrees(), angle_start: angle_start.degrees(),
angle_end: angle_end.degrees(), angle_end: angle_end.degrees(),
start: Some(angle_start.into()),
end: Some(angle_end.into()),
center: center.into(), center: center.into(),
radius, radius,
relative: false, relative: false,

10
src/wasm-lib/kcl/src/std/utils.rs
View File

@ -1,5 +1,7 @@
use std::f64::consts::PI; use std::f64::consts::PI;
use kittycad::types::UnitAngle;
use crate::{ use crate::{
errors::{KclError, KclErrorDetails}, errors::{KclError, KclErrorDetails},
executor::{Point2d, SourceRange}, executor::{Point2d, SourceRange},
@ -19,6 +21,14 @@ impl From<kittycad::types::Angle> for Angle {
} }
} }
impl From<Angle> for kittycad::types::Angle {
fn from(value: Angle) -> Self {
Self {
unit: UnitAngle::Degrees,
value: value.degrees,
}
}
}
impl Angle { impl Angle {
const ZERO: Self = Self { degrees: 0.0 }; const ZERO: Self = Self { degrees: 0.0 };
/// Make an angle of the given degrees. /// Make an angle of the given degrees.