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

Merge remote-tracking branch 'origin' into kurt-sketch-on-chamfer

Browse Source
This commit is contained in:
Kurt Hutten Irev-Dev
2024-09-20 14:11:14 +10:00
parent a5aa69badc 01cc9e751b
commit 8a08e84ff4
3 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1400,7 +1400,7 @@ dependencies = [
[[package]]
name = "kcl-lib"
version = "0.2.15"
version = "0.2.16"
dependencies = [
"anyhow",
"approx 0.5.1",

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

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

26
src/wasm-lib/kcl/src/settings/types/mod.rs
View File

@ -345,6 +345,32 @@ impl From<UnitLength> for kittycad::types::UnitLength {
}
}
impl From<kittycad_modeling_cmds::units::UnitLength> for UnitLength {
fn from(unit: kittycad_modeling_cmds::units::UnitLength) -> Self {
match unit {
kittycad_modeling_cmds::units::UnitLength::Centimeters => UnitLength::Cm,
kittycad_modeling_cmds::units::UnitLength::Feet => UnitLength::Ft,
kittycad_modeling_cmds::units::UnitLength::Inches => UnitLength::In,
kittycad_modeling_cmds::units::UnitLength::Meters => UnitLength::M,
kittycad_modeling_cmds::units::UnitLength::Millimeters => UnitLength::Mm,
kittycad_modeling_cmds::units::UnitLength::Yards => UnitLength::Yd,
}
}
}
impl From<UnitLength> for kittycad_modeling_cmds::units::UnitLength {
fn from(unit: UnitLength) -> Self {
match unit {
UnitLength::Cm => kittycad_modeling_cmds::units::UnitLength::Centimeters,
UnitLength::Ft => kittycad_modeling_cmds::units::UnitLength::Feet,
UnitLength::In => kittycad_modeling_cmds::units::UnitLength::Inches,
UnitLength::M => kittycad_modeling_cmds::units::UnitLength::Meters,
UnitLength::Mm => kittycad_modeling_cmds::units::UnitLength::Millimeters,
UnitLength::Yd => kittycad_modeling_cmds::units::UnitLength::Yards,
}
}
}
/// The types of controls for how to navigate the 3D view.
#[derive(Debug, Default, Eq, PartialEq, Clone, Deserialize, Serialize, JsonSchema, ts_rs::TS, Display, FromStr)]
#[ts(export)]