forked from 1b-agent/opencadstudio-upstream
feat: add Node snap points for MultiLeader vertices and connection points
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
1 parent
62b179e33e
commit
60be861cbe
1 file changed
+8
-2
@@ -6,7 +6,7 @@ use crate::entities::common::{diamond_grip, edit_prop as edit, ro_prop as ro, sq
|
|||||||
use crate::entities::traits::{Grippable, PropertyEditable, Transformable, TruckConvertible};
|
use crate::entities::traits::{Grippable, PropertyEditable, Transformable, TruckConvertible};
|
||||||
use crate::scene::acad_to_truck::{TruckEntity, TruckObject};
|
use crate::scene::acad_to_truck::{TruckEntity, TruckObject};
|
||||||
use crate::scene::object::{GripApply, GripDef, PropSection, PropValue, Property};
|
use crate::scene::object::{GripApply, GripDef, PropSection, PropValue, Property};
|
||||||
use crate::scene::wire_model::TangentGeom;
|
use crate::scene::wire_model::{SnapHint, TangentGeom};
|
||||||
|
|
||||||
// ── TruckConvertible ────────────────────────────────────────────────────────
|
// ── TruckConvertible ────────────────────────────────────────────────────────
|
||||||
|
|
||||||
@@ -49,11 +49,15 @@ fn to_truck(ml: &MultiLeader, document: &acadrust::CadDocument) -> Option<TruckE
|
|||||||
let mut points: Vec<[f32; 3]> = Vec::new();
|
let mut points: Vec<[f32; 3]> = Vec::new();
|
||||||
let mut tangents: Vec<TangentGeom> = Vec::new();
|
let mut tangents: Vec<TangentGeom> = Vec::new();
|
||||||
let mut key_verts: Vec<[f32; 3]> = Vec::new();
|
let mut key_verts: Vec<[f32; 3]> = Vec::new();
|
||||||
|
let mut snap_pts: Vec<(Vec3, SnapHint)> = Vec::new();
|
||||||
let mut first = true;
|
let mut first = true;
|
||||||
|
|
||||||
|
let node = |arr: [f32; 3]| (Vec3::from(arr), SnapHint::Node);
|
||||||
|
|
||||||
for root in &ml.context.leader_roots {
|
for root in &ml.context.leader_roots {
|
||||||
let cp = &root.connection_point;
|
let cp = &root.connection_point;
|
||||||
let cp_f = p3(cp);
|
let cp_f = p3(cp);
|
||||||
|
snap_pts.push(node(cp_f));
|
||||||
|
|
||||||
for line in &root.lines {
|
for line in &root.lines {
|
||||||
if line.points.is_empty() { continue; }
|
if line.points.is_empty() { continue; }
|
||||||
@@ -71,6 +75,7 @@ fn to_truck(ml: &MultiLeader, document: &acadrust::CadDocument) -> Option<TruckE
|
|||||||
}
|
}
|
||||||
for &c in &ctrl {
|
for &c in &ctrl {
|
||||||
key_verts.push(c);
|
key_verts.push(c);
|
||||||
|
snap_pts.push(node(c));
|
||||||
}
|
}
|
||||||
|
|
||||||
if ml.path_type == MultiLeaderPathType::Spline && ctrl.len() >= 2 {
|
if ml.path_type == MultiLeaderPathType::Spline && ctrl.len() >= 2 {
|
||||||
@@ -124,6 +129,7 @@ fn to_truck(ml: &MultiLeader, document: &acadrust::CadDocument) -> Option<TruckE
|
|||||||
let height = if ml.context.text_height > 0.0 { ml.context.text_height } else { ml.text_height };
|
let height = if ml.context.text_height > 0.0 { ml.context.text_height } else { ml.text_height };
|
||||||
let ins = &ml.context.text_location;
|
let ins = &ml.context.text_location;
|
||||||
let z = ins.z as f32;
|
let z = ins.z as f32;
|
||||||
|
snap_pts.push(node([ins.x as f32, ins.y as f32, z]));
|
||||||
let style = crate::entities::text_support::resolve_text_style("STANDARD", document);
|
let style = crate::entities::text_support::resolve_text_style("STANDARD", document);
|
||||||
let strokes = crate::scene::cxf::tessellate_text_ex(
|
let strokes = crate::scene::cxf::tessellate_text_ex(
|
||||||
[ins.x as f32, ins.y as f32],
|
[ins.x as f32, ins.y as f32],
|
||||||
@@ -147,7 +153,7 @@ fn to_truck(ml: &MultiLeader, document: &acadrust::CadDocument) -> Option<TruckE
|
|||||||
|
|
||||||
Some(TruckEntity {
|
Some(TruckEntity {
|
||||||
object: TruckObject::Lines(points),
|
object: TruckObject::Lines(points),
|
||||||
snap_pts: vec![],
|
snap_pts,
|
||||||
tangent_geoms: tangents,
|
tangent_geoms: tangents,
|
||||||
key_vertices: key_verts,
|
key_vertices: key_verts,
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in new issue
Block a user