AI_Assistant/cad-editor
Watch
1
0
Fork
You've already forked cad-editor
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(text): let acadrust carry the rotation through a transform

Browse source 
The merged fix added the rotation update on this side, matching only
`EntityTransform::Rotate`. That left `Affine` -- which several entity
paths and the UCS world transform emit -- still dropping the angle, and
it sat against the contract this crate already relies on: MIRROR is
delegated precisely because acadrust's entity-aware paths "handle
direction flags, stored-angle conventions and bulges themselves", and
`mirror_text` did exactly that for the same field.

Moved upstream (acadrust 9ecaffc), where one helper carries the angle for
every entity that keeps one. That covers rotation, affine and reflection
in a single place, and closes the same gap for SHAPE and the ATTRIB pair,
which a rotation left facing the old way too -- attributes noticeably so,
since INSERT already turned itself while its attributes did not.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Hakan Seven 2026-08-07 11:48:53 +03:00
commit ca152de1c0
4 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -85,7 +85,7 @@ checksum = "366ffbaa4442f4684d91e2cd7c5ea7c4ed8add41959a31447066e279e432b618"
[[package]]
name = "acadrust"
version = "0.4.0"
source = "git+https://github.com/OpenAEC-Foundation/acadifc.git?rev=41149d7#41149d7ee06c56fd7472bf3c234b1fbba2ba5cde"
source = "git+https://github.com/OpenAEC-Foundation/acadifc.git?rev=9ecaffc#9ecaffc3f5c32bad61c9624b6acb03afe97a2863"
dependencies = [
"ahash 0.8.12",
"anyhow",

2
Cargo.toml
View file

@ -62,7 +62,7 @@ windows-sys = { version = "0.61", features = ["Win32_UI_Shell", "Win32_UI_Window
ashpd = { version = "0.13.13", default-features = false, features = ["async-io", "wayland"] }
[patch.crates-io]
acadrust = { git = "https://github.com/OpenAEC-Foundation/acadifc.git", rev = "41149d7" }
acadrust = { git = "https://github.com/OpenAEC-Foundation/acadifc.git", rev = "9ecaffc" }
iced_core = { git = "https://github.com/iced-rs/iced.git", rev = "23604ff22ab0aad9e00b9327cb7b8546ed84db39" }
iced_widget = { git = "https://github.com/iced-rs/iced.git", rev = "23604ff22ab0aad9e00b9327cb7b8546ed84db39" }

5
src/entities/mtext.rs
View file

@ -554,11 +554,6 @@ fn apply_transform(t: &mut MText, tr: &EntityTransform) {
let line_angle = dy.atan2(dx);
entity.rotation = 2.0 * line_angle - entity.rotation;
});
// Keep MTEXT's explicit rotation in sync with ROTATE / ALIGN.
if let EntityTransform::Rotate { angle_rad, .. } = tr {
t.rotation =
(t.rotation + *angle_rad).rem_euclid(std::f64::consts::TAU);
}
}
impl TruckConvertible for MText {

6
src/entities/text.rs
View file

@ -484,12 +484,6 @@ fn apply_transform(t: &mut Text, tr: &EntityTransform) {
entity.rotation = 2.0 * line_angle - entity.rotation;
entity.oblique_angle = -entity.oblique_angle;
});
// The generic entity transform moves the TEXT geometry, but acadrust
// does not update the DXF rotation field used by our text renderer.
if let EntityTransform::Rotate { angle_rad, .. } = tr {
t.rotation =
(t.rotation + *angle_rad).rem_euclid(std::f64::consts::TAU);
}
}
impl TruckConvertible for Text {