diff --git a/Cargo.lock b/Cargo.lock index 908fd44e9..180d49ae1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4373,7 +4373,7 @@ dependencies = [ [[package]] name = "opencadcodec" version = "0.6.0" -source = "git+https://github.com/HakanSeven12/opencadcodec.git?rev=2c2a3fb#2c2a3fb06f0401ccf867154891e9877528cc60f2" +source = "git+https://github.com/HakanSeven12/opencadcodec.git?rev=eaa6d79#eaa6d79155b7364196bb3bfde37a03f2d9cc375f" dependencies = [ "anyhow", "bitflags 2.13.1", @@ -4396,7 +4396,7 @@ dependencies = [ [[package]] name = "opencadgraph" version = "0.1.0" -source = "git+https://github.com/HakanSeven12/opencadgraph.git?rev=14275ea#14275eacf44ce97914043624156d3b559bda9640" +source = "git+https://github.com/HakanSeven12/opencadgraph.git?rev=9c17779#9c17779c9858e96f928166daa21c75aecc7e43e0" dependencies = [ "opencadkernel", "serde_json", @@ -4405,7 +4405,7 @@ dependencies = [ [[package]] name = "opencadkernel" version = "0.1.0" -source = "git+https://github.com/HakanSeven12/opencadkernel.git?rev=2dc2fca#2dc2fca897402f057162477bf0618f51f7a12434" +source = "git+https://github.com/HakanSeven12/opencadkernel.git?rev=bb355ca#bb355ca908dad6dba2e556bc85e3cebbb7e3cb60" dependencies = [ "cavalier_contours", "opencadcodec", @@ -4416,7 +4416,7 @@ dependencies = [ [[package]] name = "opencadkernel-constraints" version = "0.1.0" -source = "git+https://github.com/HakanSeven12/opencadkernel.git?rev=2dc2fca#2dc2fca897402f057162477bf0618f51f7a12434" +source = "git+https://github.com/HakanSeven12/opencadkernel.git?rev=bb355ca#bb355ca908dad6dba2e556bc85e3cebbb7e3cb60" dependencies = [ "nalgebra", ] diff --git a/Cargo.toml b/Cargo.toml index b6adad88b..f64990e5e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,10 +37,10 @@ rfd = "0.17" clap = { version = "4", features = ["derive", "string"] } env_logger = "0.11" log = "0.4" -codec = { package = "opencadcodec", git = "https://github.com/HakanSeven12/opencadcodec.git", rev = "2c2a3fb", features = ["serde"] } -kernel = { package = "opencadkernel", git = "https://github.com/HakanSeven12/opencadkernel.git", rev = "2dc2fca", features = ["acis", "offset"] } -kernel-constraints = { package = "opencadkernel-constraints", git = "https://github.com/HakanSeven12/opencadkernel.git", rev = "2dc2fca" } -graph = { package = "opencadgraph", git = "https://github.com/HakanSeven12/opencadgraph.git", rev = "14275ea" } +codec = { package = "opencadcodec", git = "https://github.com/HakanSeven12/opencadcodec.git", rev = "eaa6d79", features = ["serde"] } +kernel = { package = "opencadkernel", git = "https://github.com/HakanSeven12/opencadkernel.git", rev = "bb355ca", features = ["acis", "offset"] } +kernel-constraints = { package = "opencadkernel-constraints", git = "https://github.com/HakanSeven12/opencadkernel.git", rev = "bb355ca" } +graph = { package = "opencadgraph", git = "https://github.com/HakanSeven12/opencadgraph.git", rev = "9c17779" } dwg-thumbnailer = { path = "crates/dwg-thumbnailer" } # Shared SAVE serialization dispatch + web-worker wire format: one # implementation for the inline (fallback/native) path and the worker path. diff --git a/crates/ocs_plugin_api/Cargo.toml b/crates/ocs_plugin_api/Cargo.toml index 4f8fd37a7..7e247f1b3 100644 --- a/crates/ocs_plugin_api/Cargo.toml +++ b/crates/ocs_plugin_api/Cargo.toml @@ -15,7 +15,7 @@ serde_json = { version = "1", optional = true } # Pulled in only by the `host` feature, which adds the `opencadcodec`-typed # `HostApi` runtime surface. The default crate stays dependency-free so engine # crates and external tooling can depend on the manifest/ribbon contract cheaply. -codec = { package = "opencadcodec", git = "https://github.com/HakanSeven12/opencadcodec.git", rev = "2c2a3fb", optional = true, features = ["serde"] } +codec = { package = "opencadcodec", git = "https://github.com/HakanSeven12/opencadcodec.git", rev = "eaa6d79", optional = true, features = ["serde"] } # Runtime IPC and serialization (host feature only). interprocess = { version = "2", optional = true } @@ -39,7 +39,7 @@ serde_json = "1" serde = { version = "1", features = ["derive"] } cargo-lock = "11" # opencadcodec is scanned at build time to generate the embedded type registry. -codec = { package = "opencadcodec", git = "https://github.com/HakanSeven12/opencadcodec.git", rev = "2c2a3fb", features = ["serde"] } +codec = { package = "opencadcodec", git = "https://github.com/HakanSeven12/opencadcodec.git", rev = "eaa6d79", features = ["serde"] } [dev-dependencies] serde_json = "1" diff --git a/crates/ocs_save/Cargo.toml b/crates/ocs_save/Cargo.toml index 6423d9d8b..c3c9ddbd1 100644 --- a/crates/ocs_save/Cargo.toml +++ b/crates/ocs_save/Cargo.toml @@ -10,6 +10,6 @@ publish = false # exactly one implementation. No UI/app dependencies — only the codec + serde. [dependencies] -codec = { package = "opencadcodec", git = "https://github.com/HakanSeven12/opencadcodec.git", rev = "2c2a3fb", features = ["serde"] } +codec = { package = "opencadcodec", git = "https://github.com/HakanSeven12/opencadcodec.git", rev = "eaa6d79", features = ["serde"] } bincode = "1.3" serde = { version = "1", features = ["derive"] } diff --git a/crates/ocs_web_worker/Cargo.toml b/crates/ocs_web_worker/Cargo.toml index bad24241b..4f04e7327 100644 --- a/crates/ocs_web_worker/Cargo.toml +++ b/crates/ocs_web_worker/Cargo.toml @@ -8,7 +8,7 @@ publish = false crate-type = ["cdylib"] [dependencies] -codec = { package = "opencadcodec", git = "https://github.com/HakanSeven12/opencadcodec.git", rev = "2c2a3fb", features = ["serde"] } +codec = { package = "opencadcodec", git = "https://github.com/HakanSeven12/opencadcodec.git", rev = "eaa6d79", features = ["serde"] } bincode = "1.3" serde = { version = "1", features = ["derive"] } console_error_panic_hook = "0.1" diff --git a/plugins/opencad-python/Cargo.lock b/plugins/opencad-python/Cargo.lock index d9071180e..cebb85c28 100644 --- a/plugins/opencad-python/Cargo.lock +++ b/plugins/opencad-python/Cargo.lock @@ -1264,7 +1264,7 @@ dependencies = [ [[package]] name = "opencadcodec" version = "0.6.0" -source = "git+https://github.com/HakanSeven12/opencadcodec.git?rev=2c2a3fb#2c2a3fb06f0401ccf867154891e9877528cc60f2" +source = "git+https://github.com/HakanSeven12/opencadcodec.git?rev=eaa6d79#eaa6d79155b7364196bb3bfde37a03f2d9cc375f" dependencies = [ "anyhow", "bitflags", diff --git a/src/app/update/graphic_attributes.rs b/src/app/update/graphic_attributes.rs index b279d5dc9..3157cd1bc 100644 --- a/src/app/update/graphic_attributes.rs +++ b/src/app/update/graphic_attributes.rs @@ -97,6 +97,7 @@ fn set_hatch_graphic_attribute( g: channel(visible_color[1]), b: channel(visible_color[2]), }, + ..Default::default() }, codec::entities::hatch::GradientColorEntry { value: 1.0, @@ -105,6 +106,7 @@ fn set_hatch_graphic_attribute( g: 46, b: 46, }, + ..Default::default() }, ]; } @@ -688,10 +690,12 @@ impl OpenCADStudio { codec::entities::hatch::GradientColorEntry { value: 0.0, color: state.color_1, + ..Default::default() }, codec::entities::hatch::GradientColorEntry { value: 1.0, color: state.color_2, + ..Default::default() }, ]; hatch.pattern_angle = angle; diff --git a/src/app/update/mod.rs b/src/app/update/mod.rs index cc0edcf37..e112cda99 100644 --- a/src/app/update/mod.rs +++ b/src/app/update/mod.rs @@ -8142,6 +8142,7 @@ impl OpenCADStudio { codec::entities::hatch::GradientColorEntry { value, color: codec::types::Color::Index(7), + ..Default::default() }, ); } diff --git a/src/entities/text_support.rs b/src/entities/text_support.rs index ede8a8427..16e827685 100644 --- a/src/entities/text_support.rs +++ b/src/entities/text_support.rs @@ -676,7 +676,7 @@ pub fn adapt_mtext_paragraphs( ATab::Left(_) => TabKind::Left, ATab::Center(_) => TabKind::Center, ATab::Right(_) => TabKind::Right, - ATab::Decimal(_) => TabKind::Decimal, + ATab::Decimal(..) => TabKind::Decimal, }; TabStop { position: ts.position() as f32 * entity_height, diff --git a/src/scene/entity.rs b/src/scene/entity.rs index 4e0358c7c..5fa03261a 100644 --- a/src/scene/entity.rs +++ b/src/scene/entity.rs @@ -3176,10 +3176,12 @@ impl Scene { codec::entities::hatch::GradientColorEntry { value: 0.0, color: to_color(c0), + ..Default::default() }, codec::entities::hatch::GradientColorEntry { value: 1.0, color: to_color(c1), + ..Default::default() }, ]; } diff --git a/src/scene/hatch_boundary/tests.rs b/src/scene/hatch_boundary/tests.rs index f6f5c72c6..a0f334b11 100644 --- a/src/scene/hatch_boundary/tests.rs +++ b/src/scene/hatch_boundary/tests.rs @@ -17,10 +17,12 @@ fn gradient_stops_keep_entity_transparency() { codec::entities::hatch::GradientColorEntry { value: 0.0, color: codec::types::Color::Rgb { r: 255, g: 0, b: 0 }, + ..Default::default() }, codec::entities::hatch::GradientColorEntry { value: 1.0, color: codec::types::Color::Rgb { r: 0, g: 0, b: 255 }, + ..Default::default() }, ];