2026-03-22 14:56:27 +03:00
|
|
|
|
use acadrust::entities::Point;
|
2026-06-17 11:13:12 +03:00
|
|
|
|
use acadrust::EntityType;
|
2026-03-22 14:56:27 +03:00
|
|
|
|
use truck_modeling::{builder, Point3};
|
|
|
|
|
|
|
|
|
|
|
|
use crate::command::EntityTransform;
|
|
|
|
|
|
use crate::entities::common::{edit_prop as edit, parse_f64, square_grip};
|
refactor(entities): collapse trait wrapper boilerplate via macro
Every entity file ended with the same three-trait wrapper block:
impl Grippable for T {
fn grips(&self) -> Vec<GripDef> { grips(self) }
fn apply_grip(&mut self, ...) { apply_grip(self, ...) }
}
impl PropertyEditable for T { ... }
impl Transformable for T { ... }
— 23 lines of pure delegation around five same-named free functions.
Replace with `crate::impl_entity_basics!(T);` (a macro in
entities/traits.rs that expands to the three trait impls).
Applied where the file already follows the free-fn delegation
convention (Arc, Circle, Ellipse, Insert, Leader, Line, LwPolyline,
MultiLeader, Ole2Frame, Point, Spline, Viewport). Files that inlined
the trait method bodies directly (Ray, XLine, Shape, Solid, Tolerance,
MLine, Mesh, Solid3D/Region/Body, Table, RasterImage, Wipeout,
Underlay, Hatch, Polyline, Polyline2D, Polyline3D, Dimension) left
alone — they already skip the indirection. Text/MText/Attribute use
the with-text-style flavour and will move once that variant is needed
beyond the existing two manual impls.
A second macro `impl_entity_basics_with_text_styles!` is included for
the text-like flavour but no entity uses it yet.
Net: -204 lines.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-26 17:16:06 +03:00
|
|
|
|
use crate::entities::traits::TruckConvertible;
|
2026-06-16 11:33:46 +03:00
|
|
|
|
use crate::scene::convert::acad_to_truck::{TruckEntity, TruckObject};
|
|
|
|
|
|
use crate::scene::model::object::{GripApply, GripDef, PropSection};
|
|
|
|
|
|
use crate::scene::model::wire_model::SnapHint;
|
2026-03-22 14:56:27 +03:00
|
|
|
|
|
2026-06-17 11:13:12 +03:00
|
|
|
|
/// Nominal viewport height (px) used to turn a relative PDSIZE percentage into
|
|
|
|
|
|
/// an on-screen pixel size. The exact viewport height isn't threaded into
|
|
|
|
|
|
/// tessellation; this reference keeps relative points a roughly constant
|
|
|
|
|
|
/// fraction of the screen across zoom levels.
|
|
|
|
|
|
const REL_REF_PX: f64 = 600.0;
|
|
|
|
|
|
|
|
|
|
|
|
/// Resolve a positive (absolute) PDSIZE to a world size. Relative/zero PDSIZE
|
|
|
|
|
|
/// is handled by [`relative_truck`] when a world-per-pixel factor is available;
|
|
|
|
|
|
/// without one it falls back to a small fixed world size.
|
2026-05-20 04:44:07 +03:00
|
|
|
|
fn pdsize_world(pdsize: f64) -> f64 {
|
|
|
|
|
|
if pdsize > 0.0 {
|
|
|
|
|
|
pdsize
|
|
|
|
|
|
} else {
|
|
|
|
|
|
2.0
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2026-06-17 11:13:12 +03:00
|
|
|
|
/// Build the truck entity for a point given the glyph half-size `s` in world
|
|
|
|
|
|
/// units. Shared by the header-driven path ([`to_truck`]) and the
|
|
|
|
|
|
/// viewport-aware relative path ([`relative_truck`]).
|
|
|
|
|
|
fn point_truck(pt: &Point, pdmode: i16, s: f64) -> TruckEntity {
|
|
|
|
|
|
let normal = (pt.normal.x, pt.normal.y, pt.normal.z);
|
|
|
|
|
|
let (wx, wy, wz) = crate::scene::view::transform::ocs_point_to_wcs(
|
|
|
|
|
|
(pt.location.x, pt.location.y, pt.location.z),
|
|
|
|
|
|
normal,
|
|
|
|
|
|
);
|
refactor(snap): producers emit f64 snap points (world_offset removal P3)
TruckEntity.snap_pts is now DVec3 and every entity producer builds snap
candidates straight from the acadrust f64 coordinates instead of casting
to f32 first (text, mtext, arc, circle, ellipse, point, shape, solid,
mline, mtext, attribute, tolerance, table, underlay, ole2frame, mesh,
multileader, dimension, block-cache). offset_snap_pts stays f64
throughout. Still offset-relative (inert) — but snap precision is no
longer capped at ~0.5 m by an early f32 cast, which fixes a latent
UTM-scale snap error and sets up the absolute-coordinate switch.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-06-23 22:10:29 +03:00
|
|
|
|
let snap = glam::DVec3::new(wx, wy, wz);
|
2026-06-17 11:13:12 +03:00
|
|
|
|
if pdmode == 0 {
|
|
|
|
|
|
// Default: a single vertex (driver handles the dot pixel).
|
|
|
|
|
|
let p = Point3::new(wx, wy, wz);
|
|
|
|
|
|
return TruckEntity {
|
|
|
|
|
|
object: TruckObject::Point(builder::vertex(p)),
|
|
|
|
|
|
snap_pts: vec![(snap, SnapHint::Node)],
|
|
|
|
|
|
tangent_geoms: vec![],
|
|
|
|
|
|
key_vertices: vec![],
|
|
|
|
|
|
fill_tris: vec![],
|
|
|
|
|
|
};
|
|
|
|
|
|
}
|
|
|
|
|
|
let pts = point_glyph(wx, wy, wz, pdmode, s);
|
|
|
|
|
|
if pts.is_empty() {
|
|
|
|
|
|
// PDMODE 1 = nothing — emit an empty Lines wire so picking still works.
|
|
|
|
|
|
return TruckEntity {
|
|
|
|
|
|
object: TruckObject::Lines(vec![]),
|
|
|
|
|
|
snap_pts: vec![(snap, SnapHint::Node)],
|
|
|
|
|
|
tangent_geoms: vec![],
|
|
|
|
|
|
key_vertices: vec![[wx, wy, wz]],
|
|
|
|
|
|
fill_tris: vec![],
|
|
|
|
|
|
};
|
|
|
|
|
|
}
|
|
|
|
|
|
TruckEntity {
|
|
|
|
|
|
object: TruckObject::Lines(pts),
|
|
|
|
|
|
snap_pts: vec![(snap, SnapHint::Node)],
|
|
|
|
|
|
tangent_geoms: vec![],
|
|
|
|
|
|
key_vertices: vec![[wx, wy, wz]],
|
|
|
|
|
|
fill_tris: vec![],
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/// Viewport-aware override for a relative (≤ 0) PDSIZE: size the glyph from the
|
|
|
|
|
|
/// world-per-pixel factor so the point stays a roughly constant on-screen size
|
|
|
|
|
|
/// across zoom. Returns `None` for an absolute PDSIZE, the size-independent
|
|
|
|
|
|
/// default dot (PDMODE 0), or when no `wpp` is available — the caller then uses
|
|
|
|
|
|
/// the normal header-driven path.
|
|
|
|
|
|
pub fn relative_truck(
|
|
|
|
|
|
entity: &EntityType,
|
|
|
|
|
|
document: &acadrust::CadDocument,
|
|
|
|
|
|
wpp: Option<f32>,
|
|
|
|
|
|
) -> Option<TruckEntity> {
|
|
|
|
|
|
let EntityType::Point(pt) = entity else {
|
|
|
|
|
|
return None;
|
|
|
|
|
|
};
|
|
|
|
|
|
let pdsize = document.header.point_display_size;
|
|
|
|
|
|
let pdmode = document.header.point_display_mode;
|
|
|
|
|
|
if pdsize > 0.0 || pdmode == 0 {
|
|
|
|
|
|
return None;
|
|
|
|
|
|
}
|
|
|
|
|
|
let wpp = wpp.filter(|w| *w > 0.0)?;
|
|
|
|
|
|
Some(point_truck(pt, pdmode, relative_world_size(pdsize, wpp) * 0.5))
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/// Full on-screen glyph size (world units) for a relative (≤ 0) PDSIZE at the
|
|
|
|
|
|
/// given world-per-pixel factor. PDSIZE 0 is the 5% default; negative is the
|
|
|
|
|
|
/// percentage. Used both for rendering and to seed an absolute size when the
|
|
|
|
|
|
/// user switches the Point Style dialog to absolute units.
|
|
|
|
|
|
pub fn relative_world_size(pdsize: f64, wpp: f32) -> f64 {
|
|
|
|
|
|
let pct = if pdsize == 0.0 { 5.0 } else { -pdsize };
|
|
|
|
|
|
(pct / 100.0) * REL_REF_PX * wpp as f64
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
fn point_glyph(cx: f64, cy: f64, z: f64, pdmode: i16, s_half: f64) -> Vec<[f64; 3]> {
|
2026-05-20 04:44:07 +03:00
|
|
|
|
// PDMODE bits:
|
|
|
|
|
|
// shape: 0=dot, 1=nothing, 2='+', 3='×', 4='|'
|
|
|
|
|
|
// +32 = enclose in a circle
|
|
|
|
|
|
// +64 = enclose in a square
|
|
|
|
|
|
// (+96 = both)
|
|
|
|
|
|
let shape = (pdmode & 0x0F) as i32;
|
|
|
|
|
|
let circle = (pdmode & 32) != 0;
|
|
|
|
|
|
let square = (pdmode & 64) != 0;
|
2026-06-17 11:13:12 +03:00
|
|
|
|
let s = s_half;
|
2026-05-20 04:44:07 +03:00
|
|
|
|
let nan = [f64::NAN, f64::NAN, f64::NAN];
|
|
|
|
|
|
let mut pts: Vec<[f64; 3]> = Vec::new();
|
|
|
|
|
|
let mut push_seg = |a: [f64; 3], b: [f64; 3]| {
|
|
|
|
|
|
if !pts.is_empty() {
|
|
|
|
|
|
pts.push(nan);
|
|
|
|
|
|
}
|
|
|
|
|
|
pts.push(a);
|
|
|
|
|
|
pts.push(b);
|
|
|
|
|
|
};
|
|
|
|
|
|
match shape {
|
|
|
|
|
|
// 0 = single dot — emit a tiny "+" so it's visible at any zoom.
|
|
|
|
|
|
0 => {
|
|
|
|
|
|
let d = s * 0.05;
|
|
|
|
|
|
push_seg([cx - d, cy, z], [cx + d, cy, z]);
|
|
|
|
|
|
push_seg([cx, cy - d, z], [cx, cy + d, z]);
|
|
|
|
|
|
}
|
|
|
|
|
|
1 => {} // explicit nothing
|
|
|
|
|
|
2 => {
|
|
|
|
|
|
push_seg([cx - s, cy, z], [cx + s, cy, z]);
|
|
|
|
|
|
push_seg([cx, cy - s, z], [cx, cy + s, z]);
|
|
|
|
|
|
}
|
|
|
|
|
|
3 => {
|
|
|
|
|
|
push_seg([cx - s, cy - s, z], [cx + s, cy + s, z]);
|
|
|
|
|
|
push_seg([cx - s, cy + s, z], [cx + s, cy - s, z]);
|
|
|
|
|
|
}
|
|
|
|
|
|
4 => {
|
|
|
|
|
|
push_seg([cx, cy - s, z], [cx, cy + s, z]);
|
|
|
|
|
|
}
|
|
|
|
|
|
_ => {
|
|
|
|
|
|
push_seg([cx - s, cy, z], [cx + s, cy, z]);
|
|
|
|
|
|
push_seg([cx, cy - s, z], [cx, cy + s, z]);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
if circle {
|
|
|
|
|
|
// 16-segment polyline circle.
|
|
|
|
|
|
const N: usize = 16;
|
|
|
|
|
|
let mut ring: Vec<[f64; 3]> = Vec::with_capacity(N + 1);
|
|
|
|
|
|
for i in 0..=N {
|
|
|
|
|
|
let a = i as f64 * std::f64::consts::TAU / N as f64;
|
|
|
|
|
|
ring.push([cx + a.cos() * s, cy + a.sin() * s, z]);
|
|
|
|
|
|
}
|
|
|
|
|
|
if !pts.is_empty() {
|
|
|
|
|
|
pts.push(nan);
|
|
|
|
|
|
}
|
|
|
|
|
|
pts.extend(ring);
|
|
|
|
|
|
}
|
|
|
|
|
|
if square {
|
|
|
|
|
|
let p1 = [cx - s, cy - s, z];
|
|
|
|
|
|
let p2 = [cx + s, cy - s, z];
|
|
|
|
|
|
let p3 = [cx + s, cy + s, z];
|
|
|
|
|
|
let p4 = [cx - s, cy + s, z];
|
|
|
|
|
|
if !pts.is_empty() {
|
|
|
|
|
|
pts.push(nan);
|
|
|
|
|
|
}
|
|
|
|
|
|
pts.extend_from_slice(&[p1, p2, p3, p4, p1]);
|
|
|
|
|
|
}
|
|
|
|
|
|
pts
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
fn to_truck(pt: &Point, document: &acadrust::CadDocument) -> TruckEntity {
|
|
|
|
|
|
let pdmode = document.header.point_display_mode;
|
2026-06-17 11:13:12 +03:00
|
|
|
|
let s = pdsize_world(document.header.point_display_size) * 0.5;
|
|
|
|
|
|
point_truck(pt, pdmode, s)
|
2026-03-22 14:56:27 +03:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
fn grips(pt: &Point) -> Vec<GripDef> {
|
2026-06-11 00:04:37 +03:00
|
|
|
|
let p = glam::DVec3::new(pt.location.x, pt.location.y, pt.location.z);
|
2026-03-22 14:56:27 +03:00
|
|
|
|
vec![square_grip(0, p)]
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
fn properties(pt: &Point) -> PropSection {
|
|
|
|
|
|
PropSection {
|
|
|
|
|
|
title: "Geometry".into(),
|
|
|
|
|
|
props: vec![
|
|
|
|
|
|
edit("X", "loc_x", pt.location.x),
|
|
|
|
|
|
edit("Y", "loc_y", pt.location.y),
|
|
|
|
|
|
edit("Z", "loc_z", pt.location.z),
|
|
|
|
|
|
],
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
fn apply_geom_prop(pt: &mut Point, field: &str, value: &str) {
|
|
|
|
|
|
let Some(v) = parse_f64(value) else {
|
|
|
|
|
|
return;
|
|
|
|
|
|
};
|
|
|
|
|
|
match field {
|
|
|
|
|
|
"loc_x" => pt.location.x = v,
|
|
|
|
|
|
"loc_y" => pt.location.y = v,
|
|
|
|
|
|
"loc_z" => pt.location.z = v,
|
|
|
|
|
|
_ => {}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
fn apply_grip(pt: &mut Point, _grip_id: usize, apply: GripApply) {
|
|
|
|
|
|
match apply {
|
|
|
|
|
|
GripApply::Absolute(p) => {
|
|
|
|
|
|
pt.location.x = p.x as f64;
|
|
|
|
|
|
pt.location.y = p.y as f64;
|
|
|
|
|
|
pt.location.z = p.z as f64;
|
|
|
|
|
|
}
|
|
|
|
|
|
GripApply::Translate(d) => {
|
|
|
|
|
|
pt.location.x += d.x as f64;
|
|
|
|
|
|
pt.location.y += d.y as f64;
|
|
|
|
|
|
pt.location.z += d.z as f64;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
fn apply_transform(pt: &mut Point, t: &EntityTransform) {
|
2026-06-16 11:33:46 +03:00
|
|
|
|
crate::scene::view::transform::apply_standard_entity_transform(pt, t, |entity, p1, p2| {
|
|
|
|
|
|
crate::scene::view::transform::reflect_xy_point(
|
2026-03-22 14:56:27 +03:00
|
|
|
|
&mut entity.location.x,
|
|
|
|
|
|
&mut entity.location.y,
|
|
|
|
|
|
p1,
|
|
|
|
|
|
p2,
|
|
|
|
|
|
);
|
|
|
|
|
|
});
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
impl TruckConvertible for Point {
|
2026-05-20 04:44:07 +03:00
|
|
|
|
fn to_truck(&self, document: &acadrust::CadDocument) -> Option<TruckEntity> {
|
|
|
|
|
|
Some(to_truck(self, document))
|
2026-03-22 14:56:27 +03:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
refactor(entities): collapse trait wrapper boilerplate via macro
Every entity file ended with the same three-trait wrapper block:
impl Grippable for T {
fn grips(&self) -> Vec<GripDef> { grips(self) }
fn apply_grip(&mut self, ...) { apply_grip(self, ...) }
}
impl PropertyEditable for T { ... }
impl Transformable for T { ... }
— 23 lines of pure delegation around five same-named free functions.
Replace with `crate::impl_entity_basics!(T);` (a macro in
entities/traits.rs that expands to the three trait impls).
Applied where the file already follows the free-fn delegation
convention (Arc, Circle, Ellipse, Insert, Leader, Line, LwPolyline,
MultiLeader, Ole2Frame, Point, Spline, Viewport). Files that inlined
the trait method bodies directly (Ray, XLine, Shape, Solid, Tolerance,
MLine, Mesh, Solid3D/Region/Body, Table, RasterImage, Wipeout,
Underlay, Hatch, Polyline, Polyline2D, Polyline3D, Dimension) left
alone — they already skip the indirection. Text/MText/Attribute use
the with-text-style flavour and will move once that variant is needed
beyond the existing two manual impls.
A second macro `impl_entity_basics_with_text_styles!` is included for
the text-like flavour but no entity uses it yet.
Net: -204 lines.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-26 17:16:06 +03:00
|
|
|
|
crate::impl_entity_basics!(Point);
|