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

Bump kittycad.rs (#2936)

Browse Source 
* update kittycad.rs

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

* tauri bump

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

---------

Signed-off-by: Jess Frazelle <github@jessfraz.com>
This commit is contained in:
Jess Frazelle
2024-07-05 12:39:58 -07:00
committed by GitHub
parent fe28527ef9
commit 0a524d42f6
8 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src-tauri/Cargo.lock generated
View File

@ -2571,7 +2571,7 @@ dependencies = [
[[package]]
name = "kcl-lib"
version = "0.1.69"
version = "0.1.70"
dependencies = [
"anyhow",
"approx",
@ -2628,9 +2628,9 @@ dependencies = [
[[package]]
name = "kittycad"
version = "0.3.6"
version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af3de9bb4b1441f198689a9f64a8163a518377e30b348a784680e738985b95eb"
checksum = "e1777b503442fa4666564cc3ab237d456df853a09648a4b2bb09622d25d021a5"
dependencies = [
"anyhow",
"async-trait",

2
src-tauri/Cargo.toml
View File

@ -16,7 +16,7 @@ tauri-build = { version = "2.0.0-beta.18", features = [] }
[dependencies]
anyhow = "1"
kcl-lib = { version = "0.1.53", path = "../src/wasm-lib/kcl" }
kittycad = "0.3.5"
kittycad = "0.3.7"
log = "0.4.21"
oauth2 = "4.4.2"
serde_json = "1.0"

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

@ -1385,7 +1385,7 @@ dependencies = [
[[package]]
name = "kcl-lib"
version = "0.1.69"
version = "0.1.70"
dependencies = [
"anyhow",
"approx",
@ -1453,7 +1453,7 @@ dependencies = [
[[package]]
name = "kcl-test-server"
version = "0.1.1"
version = "0.1.2"
dependencies = [
"anyhow",
"hyper",
@ -1466,9 +1466,9 @@ dependencies = [
[[package]]
name = "kittycad"
version = "0.3.6"
version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af3de9bb4b1441f198689a9f64a8163a518377e30b348a784680e738985b95eb"
checksum = "e1777b503442fa4666564cc3ab237d456df853a09648a4b2bb09622d25d021a5"
dependencies = [
"anyhow",
"async-trait",

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

@ -69,7 +69,7 @@ members = [
]
[workspace.dependencies]
kittycad = { version = "0.3.6", default-features = false, features = ["js", "requests"] }
kittycad = { version = "0.3.7", default-features = false, features = ["js", "requests"] }
kittycad-modeling-session = "0.1.4"
[[test]]

4
src/wasm-lib/kcl-test-server/Cargo.toml
View File

@ -1,14 +1,14 @@
[package]
name = "kcl-test-server"
description = "A test server for KCL"
version = "0.1.1"
version = "0.1.2"
edition = "2021"
license = "MIT"
[dependencies]
anyhow = "1.0.86"
hyper = { version = "0.14.29", features = ["server"] }
kcl-lib = { version = "0.1.62", path = "../kcl" }
kcl-lib = { version = "0.1.70", path = "../kcl" }
pico-args = "0.5.0"
serde = { version = "1.0.203", features = ["derive"] }
serde_json = "1.0.120"

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.1.69"
version = "0.1.70"
edition = "2021"
license = "MIT"
repository = "https://github.com/KittyCAD/modeling-app"

8
src/wasm-lib/kcl/src/executor.rs
View File

@ -1359,6 +1359,8 @@ pub struct ExecutorSettings {
pub highlight_edges: bool,
/// Whether or not Screen Space Ambient Occlusion (SSAO) is enabled.
pub enable_ssao: bool,
// Show grid?
pub show_grid: bool,
}
impl Default for ExecutorSettings {
@ -1367,6 +1369,7 @@ impl Default for ExecutorSettings {
units: Default::default(),
highlight_edges: true,
enable_ssao: false,
show_grid: false,
}
}
}
@ -1377,6 +1380,7 @@ impl From<crate::settings::types::Configuration> for ExecutorSettings {
units: config.settings.modeling.base_unit,
highlight_edges: config.settings.modeling.highlight_edges.into(),
enable_ssao: config.settings.modeling.enable_ssao.into(),
show_grid: config.settings.modeling.show_scale_grid,
}
}
}
@ -1387,6 +1391,7 @@ impl From<crate::settings::types::project::ProjectConfiguration> for ExecutorSet
units: config.settings.modeling.base_unit,
highlight_edges: config.settings.modeling.highlight_edges.into(),
enable_ssao: config.settings.modeling.enable_ssao.into(),
show_grid: config.settings.modeling.show_scale_grid,
}
}
}
@ -1397,6 +1402,7 @@ impl From<crate::settings::types::ModelingSettings> for ExecutorSettings {
units: modeling.base_unit,
highlight_edges: modeling.highlight_edges.into(),
enable_ssao: modeling.enable_ssao.into(),
show_grid: modeling.show_scale_grid,
}
}
}
@ -1415,6 +1421,7 @@ impl ExecutorContext {
} else {
None
},
if settings.show_grid { Some(true) } else { None },
None,
None,
None,
@ -1478,6 +1485,7 @@ impl ExecutorContext {
units,
highlight_edges: true,
enable_ssao: false,
show_grid: false,
},
)
.await?;

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

@ -37,6 +37,7 @@ async fn new_context(units: UnitLength) -> Result<ExecutorContext> {
units,
highlight_edges: true,
enable_ssao: false,
show_grid: false,
},
)
.await?;