diff --git a/Cargo.lock b/Cargo.lock index b2ce432..aff1458 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1172,6 +1172,12 @@ dependencies = [ "serde_core", ] +[[package]] +name = "glam" +version = "0.34.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "627003914c6057c9c8f0832ee4f870b5a4f599d0cfa83f4072675114860cd0ff" + [[package]] name = "glifo" version = "0.1.1" @@ -2287,7 +2293,7 @@ name = "omsi-geometry" version = "0.1.0" source = "git+https://github.com/openOMSI-org/openOMSI?rev=c4738ed6f43f11b4c06ead299af7ac74280d5c5b#c4738ed6f43f11b4c06ead299af7ac74280d5c5b" dependencies = [ - "glam", + "glam 0.30.10", "log", "omsi-cfg", "omsi-map", @@ -2335,7 +2341,7 @@ version = "0.1.0" source = "git+https://github.com/openOMSI-org/openOMSI?rev=c4738ed6f43f11b4c06ead299af7ac74280d5c5b#c4738ed6f43f11b4c06ead299af7ac74280d5c5b" dependencies = [ "encoding_rs", - "glam", + "glam 0.30.10", "log", "omsi-cfg", "thiserror 2.0.21", @@ -2411,7 +2417,7 @@ dependencies = [ "embed-resource", "env_logger", "full_moon", - "glam", + "glam 0.34.3", "gltf", "image", "log", @@ -2457,7 +2463,7 @@ dependencies = [ name = "openmapper-mesh" version = "0.1.0" dependencies = [ - "glam", + "glam 0.30.10", "serde", "serde_json", "zip", diff --git a/Cargo.toml b/Cargo.toml index 456a8bd..8f2ca65 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,7 +28,7 @@ egui = { git = "https://github.com/openOMSI-org/egui-openomsi", rev = "0119a7a0a egui-wgpu = { git = "https://github.com/openOMSI-org/egui-openomsi", rev = "0119a7a0a8de46a931640912685605223f28da04", default-features = false } egui-winit = { git = "https://github.com/openOMSI-org/egui-openomsi", rev = "0119a7a0a8de46a931640912685605223f28da04", default-features = false, features = ["clipboard", "links", "wayland", "x11"] } -glam = "0.30" +glam = "0.34" # openMapper's own polygon meshes: primitives, booleans, modifiers, UVs, baking, export openmapper-mesh = { path = "crates/mesh" } # editing one map together (src/collab): the connection, and openOMSI's own Cloudflare tunnel