forked from 1b-agent/opencadstudio-upstream
New annotations now place their text and reading geometry along the active UCS X axis (identity = world), so they read square to the user's coordinate system instead of world-horizontal: - TEXT / MTEXT: rotation defaults to the UCS X angle (DocumentTab::ucs_rotation_angle, model space only). - Linear dimensions: measure along the UCS axis the span is nearest, and bake the UCS X angle as the text rotation so the value reads square even under a style that forces horizontal text. DIMCONTINUE / DIMBASELINE derive their axis from the base dim's rotation (any angle), not a world H/V test. - LEADER: the MText annotation rotates to the UCS, and the hookline runs along the leader's horizontal_direction (set to UCS X), used by the renderer instead of world horizontal. - MLEADER: context.text_direction = UCS X drives both the text rotation and, in the renderer, the text side and dogleg/landing direction. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
182 lines
6.1 KiB
Rust
182 lines
6.1 KiB
Rust
// DIMBASELINE command — stacked baseline dimensions all measured from the same origin.
|
|
//
|
|
// Each new point becomes the second extension line origin of a new dimension.
|
|
// The first extension line is always the same base origin point.
|
|
// Each new dimension line is placed further from the baseline by DIMDLI (increment).
|
|
//
|
|
// Constructed from commands.rs after finding the last placed linear/aligned dimension.
|
|
|
|
use acadrust::entities::{Dimension, DimensionLinear};
|
|
use acadrust::types::Vector3;
|
|
use acadrust::EntityType;
|
|
use glam::Vec3;
|
|
|
|
use crate::command::{CadCommand, CmdResult};
|
|
use crate::modules::{IconKind, ModuleEvent, ToolDef};
|
|
use crate::scene::model::wire_model::WireModel;
|
|
|
|
pub const ICON: IconKind = IconKind::Svg(include_bytes!("../../../assets/icons/dim_baseline.svg"));
|
|
|
|
pub fn tool() -> ToolDef {
|
|
ToolDef {
|
|
id: "DIMBASELINE",
|
|
label: "Baseline",
|
|
icon: ICON,
|
|
event: ModuleEvent::Command("DIMBASELINE".to_string()),
|
|
}
|
|
}
|
|
|
|
/// Fallback stacking increment (world units) when no DimStyle is available.
|
|
const DEFAULT_DIMDLI: f32 = 1.5;
|
|
|
|
pub struct DimBaselineCommand {
|
|
/// Fixed first-extension-line origin (never changes).
|
|
base_p1: Vec3,
|
|
/// Direction along the measurement direction (0.0 = horizontal, PI/2 = vertical).
|
|
rotation: f64,
|
|
/// Unit vector perpendicular to the dimension axis, pointing toward the dim line side.
|
|
perp: Vec3,
|
|
/// Perpendicular distance of the NEXT dimension line from the extension-line axis.
|
|
next_offset: f32,
|
|
/// Stacking increment from the active DimStyle (DIMDLI).
|
|
dimdli: f32,
|
|
/// True once we have a base dimension loaded.
|
|
ready: bool,
|
|
}
|
|
|
|
impl DimBaselineCommand {
|
|
/// No base dim found — cancel immediately.
|
|
pub fn new() -> Self {
|
|
Self {
|
|
base_p1: Vec3::ZERO,
|
|
rotation: 0.0,
|
|
perp: Vec3::Y,
|
|
next_offset: DEFAULT_DIMDLI,
|
|
dimdli: DEFAULT_DIMDLI,
|
|
ready: false,
|
|
}
|
|
}
|
|
|
|
/// Build from the last placed dimension.
|
|
///
|
|
/// `p1` — first extension line origin (fixed baseline).
|
|
/// `p2` — second extension line origin of the base dim (unused for placement, kept for context).
|
|
/// `definition_point` — dim-line position of the base dim (defines perpendicular side).
|
|
/// `rotation` — 0.0 = horizontal, PI/2 = vertical.
|
|
/// `dimdli` — DimStyle stacking increment (use [`DEFAULT_DIMDLI`] when no style is active).
|
|
pub fn from_base(
|
|
p1: Vec3,
|
|
_p2: Vec3,
|
|
definition_point: Vec3,
|
|
rotation: f64,
|
|
dimdli: f32,
|
|
) -> Self {
|
|
// Measurement axis = the base dim's rotation angle (any angle, incl. a
|
|
// UCS-aligned one), not a world horizontal/vertical.
|
|
let axis = Vec3::new(rotation.cos() as f32, rotation.sin() as f32, 0.0);
|
|
let perp = Vec3::new(-axis.y, axis.x, 0.0);
|
|
let base_offset = (definition_point - p1).dot(perp);
|
|
let dimdli = if dimdli.abs() < 1e-6 {
|
|
DEFAULT_DIMDLI
|
|
} else {
|
|
dimdli
|
|
};
|
|
// Next baseline dim goes one DIMDLI further from the baseline.
|
|
let next_offset = base_offset + dimdli;
|
|
Self {
|
|
base_p1: p1,
|
|
rotation,
|
|
perp,
|
|
next_offset,
|
|
dimdli,
|
|
ready: true,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl CadCommand for DimBaselineCommand {
|
|
fn name(&self) -> &'static str {
|
|
"DIMBASELINE"
|
|
}
|
|
|
|
fn prompt(&self) -> String {
|
|
if !self.ready {
|
|
"DIMBASELINE No base dimension found. Place a dimension first.".into()
|
|
} else {
|
|
"DIMBASELINE Specify a second extension line origin (Enter to exit):".into()
|
|
}
|
|
}
|
|
|
|
fn on_point(&mut self, pt: Vec3) -> CmdResult {
|
|
if !self.ready {
|
|
return CmdResult::Cancel;
|
|
}
|
|
let p1 = self.base_p1;
|
|
let p2 = pt;
|
|
|
|
// Build a new linear dimension.
|
|
let mut dim = DimensionLinear::new(v3(p1), v3(p2));
|
|
dim.rotation = self.rotation;
|
|
|
|
let dim_line_pt = p1 + self.perp * self.next_offset;
|
|
let dim_line_pt2 = p2 + self.perp * self.next_offset;
|
|
dim.definition_point = v3(dim_line_pt);
|
|
dim.base.definition_point = v3(dim_line_pt);
|
|
dim.base.text_middle_point = v3((dim_line_pt + dim_line_pt2) * 0.5);
|
|
dim.base.insertion_point = dim.base.text_middle_point;
|
|
dim.base.actual_measurement = dim.measurement();
|
|
|
|
// Stack the next dim line further out.
|
|
self.next_offset += self.dimdli;
|
|
|
|
CmdResult::CommitEntity(EntityType::Dimension(Dimension::Linear(dim)))
|
|
}
|
|
|
|
fn on_enter(&mut self) -> CmdResult {
|
|
CmdResult::Cancel
|
|
}
|
|
|
|
fn on_mouse_move(&mut self, pt: Vec3) -> Option<WireModel> {
|
|
if !self.ready {
|
|
return None;
|
|
}
|
|
let p1 = self.base_p1;
|
|
let dim_line_pt = p1 + self.perp * self.next_offset;
|
|
let dim_line_pt2 = pt + self.perp * self.next_offset;
|
|
Some(WireModel {
|
|
name: "dimbase_preview".into(),
|
|
points: vec![
|
|
[p1.x, p1.y, p1.z],
|
|
[dim_line_pt.x, dim_line_pt.y, dim_line_pt.z],
|
|
[f32::NAN, 0.0, 0.0],
|
|
[pt.x, pt.y, pt.z],
|
|
[dim_line_pt2.x, dim_line_pt2.y, dim_line_pt2.z],
|
|
[f32::NAN, 0.0, 0.0],
|
|
[dim_line_pt.x, dim_line_pt.y, dim_line_pt.z],
|
|
[dim_line_pt2.x, dim_line_pt2.y, dim_line_pt2.z],
|
|
],
|
|
color: WireModel::CYAN,
|
|
selected: false,
|
|
pattern_length: 0.0,
|
|
pattern: [0.0; 8],
|
|
line_weight_px: 1.0,
|
|
snap_pts: vec![],
|
|
tangent_geoms: vec![],
|
|
aci: 0,
|
|
key_vertices: vec![],
|
|
aabb: WireModel::UNBOUNDED_AABB,
|
|
plinegen: true,
|
|
vp_scissor: None,
|
|
fill_tris: vec![],
|
|
})
|
|
}
|
|
}
|
|
|
|
fn v3(p: Vec3) -> Vector3 {
|
|
Vector3::new(p.x as f64, p.y as f64, p.z as f64)
|
|
}
|
|
|
|
|
|
// ── Autocomplete registry ─────────────────────────────────
|
|
inventory::submit!(crate::command::CommandRegistration { names: &["DBA", "DIMBASELINE"] }); // DimBaselineCommand
|