forked from 1b-agent/opencadstudio-upstream
Move the 30 flat modules under src/scene/ into six folders by role: convert (entity→geometry), text (fonts/shaping), model (render models), pick (hit-test/selection/grips/xclip), view (camera/transform/render), cache (block + property caches). pipeline/ is unchanged. Full path migration — all `scene::X` references become `scene::<group>::X`, no compatibility re-exports. render.rs items that were `pub(super)` (parent was scene) become `pub(in crate::scene)` to keep their original scene-wide visibility. No behavior change; build and tests are green. Co-Authored-By: Claude Opus 4.8 <[email protected]>
273 lines
9.5 KiB
Rust
273 lines
9.5 KiB
Rust
use acadrust::entities::Spline;
|
|
use truck_modeling::{
|
|
base::{BoundedCurve, ParametricCurve, Vector4},
|
|
builder, BSplineCurve, Curve, Edge, KnotVec, NurbsCurve, Point3, Wire,
|
|
};
|
|
|
|
use crate::command::EntityTransform;
|
|
use crate::entities::common::{ro_prop as ro, square_grip};
|
|
use crate::entities::traits::TruckConvertible;
|
|
use crate::scene::convert::acad_to_truck::{TruckEntity, TruckObject};
|
|
use crate::scene::model::object::{GripApply, GripDef, PropSection};
|
|
|
|
fn to_truck(spl: &Spline) -> TruckEntity {
|
|
let n = spl.control_points.len();
|
|
if n < 2 {
|
|
return TruckEntity {
|
|
object: TruckObject::Point(builder::vertex(Point3::new(0.0, 0.0, 0.0))),
|
|
snap_pts: vec![],
|
|
tangent_geoms: vec![],
|
|
key_vertices: vec![],
|
|
fill_tris: vec![],
|
|
};
|
|
}
|
|
|
|
let knot_vec = if !spl.knots.is_empty() {
|
|
KnotVec::from(spl.knots.clone())
|
|
} else {
|
|
KnotVec::uniform_knot(spl.degree as usize, n - 1)
|
|
};
|
|
|
|
// Use rational NURBS when weights are provided (circles/conics stored as NURBS).
|
|
let use_nurbs = !spl.weights.is_empty() && spl.weights.len() == n;
|
|
let (p_start, p_end, curve) = if use_nurbs {
|
|
let homo_pts: Vec<Vector4> = spl
|
|
.control_points
|
|
.iter()
|
|
.zip(spl.weights.iter())
|
|
.map(|(p, &w)| {
|
|
let w = if w.abs() < 1e-12 { 1.0 } else { w };
|
|
Vector4::new(p.x * w, p.y * w, p.z * w, w)
|
|
})
|
|
.collect();
|
|
let nurbs = NurbsCurve::new(BSplineCurve::new(knot_vec, homo_pts));
|
|
let (t0, t1) = nurbs.range_tuple();
|
|
(nurbs.subs(t0), nurbs.subs(t1), Curve::NurbsCurve(nurbs))
|
|
} else {
|
|
let ctrl_pts: Vec<Point3> = spl
|
|
.control_points
|
|
.iter()
|
|
.map(|p| Point3::new(p.x, p.y, p.z))
|
|
.collect();
|
|
let bspline = BSplineCurve::new(knot_vec, ctrl_pts);
|
|
let (t0, t1) = bspline.range_tuple();
|
|
(
|
|
bspline.subs(t0),
|
|
bspline.subs(t1),
|
|
Curve::BSplineCurve(bspline),
|
|
)
|
|
};
|
|
|
|
let snap_source = if !spl.fit_points.is_empty() {
|
|
&spl.fit_points
|
|
} else {
|
|
&spl.control_points
|
|
};
|
|
let key_vertices: Vec<[f64; 3]> = snap_source.iter().map(|p| [p.x, p.y, p.z]).collect();
|
|
|
|
let is_closed = spl.flags.closed || spl.flags.periodic;
|
|
let gap = {
|
|
let dx = (p_end.x - p_start.x) as f32;
|
|
let dy = (p_end.y - p_start.y) as f32;
|
|
let dz = (p_end.z - p_start.z) as f32;
|
|
(dx * dx + dy * dy + dz * dz).sqrt()
|
|
};
|
|
|
|
let object = if is_closed && gap > 1e-6 {
|
|
let v_start = builder::vertex(p_start);
|
|
let v_end = builder::vertex(p_end);
|
|
let v_close = builder::vertex(p_start);
|
|
let main_edge = Edge::new(&v_start, &v_end, curve);
|
|
let close_edge = builder::line(&v_end, &v_close);
|
|
let wire: Wire = [main_edge, close_edge].into_iter().collect();
|
|
TruckObject::Contour(wire)
|
|
} else {
|
|
let v_start = builder::vertex(p_start);
|
|
let v_end = builder::vertex(p_end);
|
|
let edge = Edge::new(&v_start, &v_end, curve);
|
|
TruckObject::Curve(edge)
|
|
};
|
|
|
|
TruckEntity {
|
|
object,
|
|
snap_pts: vec![],
|
|
tangent_geoms: vec![],
|
|
key_vertices,
|
|
fill_tris: vec![],
|
|
}
|
|
}
|
|
|
|
fn grips(spline: &Spline) -> Vec<GripDef> {
|
|
spline
|
|
.control_points
|
|
.iter()
|
|
.enumerate()
|
|
.map(|(i, p)| square_grip(i, glam::DVec3::new(p.x, p.y, p.z)))
|
|
.collect()
|
|
}
|
|
|
|
fn properties(spline: &Spline) -> PropSection {
|
|
PropSection {
|
|
title: "Geometry".into(),
|
|
props: vec![
|
|
ro("Degree", "degree", spline.degree.to_string()),
|
|
ro(
|
|
"Control Pts",
|
|
"ctrl_pts",
|
|
spline.control_points.len().to_string(),
|
|
),
|
|
ro("Fit Pts", "fit_pts", spline.fit_points.len().to_string()),
|
|
],
|
|
}
|
|
}
|
|
|
|
fn apply_geom_prop(_spline: &mut Spline, _field: &str, _value: &str) {}
|
|
|
|
fn apply_grip(spline: &mut Spline, grip_id: usize, apply: GripApply) {
|
|
if let Some(cp) = spline.control_points.get_mut(grip_id) {
|
|
match apply {
|
|
GripApply::Absolute(p) => {
|
|
cp.x = p.x as f64;
|
|
cp.y = p.y as f64;
|
|
cp.z = p.z as f64;
|
|
}
|
|
GripApply::Translate(d) => {
|
|
cp.x += d.x as f64;
|
|
cp.y += d.y as f64;
|
|
cp.z += d.z as f64;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
fn apply_transform(spline: &mut Spline, t: &EntityTransform) {
|
|
crate::scene::view::transform::apply_standard_entity_transform(spline, t, |entity, p1, p2| {
|
|
for cp in &mut entity.control_points {
|
|
crate::scene::view::transform::reflect_xy_point(&mut cp.x, &mut cp.y, p1, p2);
|
|
}
|
|
for fp in &mut entity.fit_points {
|
|
crate::scene::view::transform::reflect_xy_point(&mut fp.x, &mut fp.y, p1, p2);
|
|
}
|
|
});
|
|
}
|
|
|
|
impl TruckConvertible for Spline {
|
|
fn to_truck(&self, _document: &acadrust::CadDocument) -> Option<TruckEntity> {
|
|
Some(to_truck(self))
|
|
}
|
|
}
|
|
|
|
impl crate::entities::traits::Grippable for Spline {
|
|
fn grips(&self) -> Vec<GripDef> {
|
|
grips(self)
|
|
}
|
|
fn apply_grip(&mut self, grip_id: usize, apply: GripApply) {
|
|
apply_grip(self, grip_id, apply);
|
|
}
|
|
fn grip_menu(&self, _grip_id: usize) -> Vec<crate::scene::model::object::GripMenuItem> {
|
|
use crate::scene::model::object::{GripMenuAction, GripMenuItem};
|
|
vec![
|
|
GripMenuItem {
|
|
label: "Stretch",
|
|
action: GripMenuAction::Stretch,
|
|
},
|
|
GripMenuItem {
|
|
label: "Add Vertex",
|
|
action: GripMenuAction::AddVertex,
|
|
},
|
|
GripMenuItem {
|
|
label: "Remove Vertex",
|
|
action: GripMenuAction::RemoveVertex,
|
|
},
|
|
GripMenuItem {
|
|
label: "Refine Vertices",
|
|
action: GripMenuAction::RefineVertices,
|
|
},
|
|
]
|
|
}
|
|
fn apply_grip_menu(&mut self, grip_id: usize, action: crate::scene::model::object::GripMenuAction) {
|
|
use crate::scene::model::object::GripMenuAction as A;
|
|
let n = self.control_points.len();
|
|
let min_cv = (self.degree as usize).saturating_add(1).max(2);
|
|
match action {
|
|
A::AddVertex if grip_id < n => {
|
|
let i1 = (grip_id + 1).min(n - 1);
|
|
if i1 == grip_id {
|
|
return;
|
|
}
|
|
let p0 = &self.control_points[grip_id];
|
|
let p1 = &self.control_points[i1];
|
|
let mid = acadrust::types::Vector3::new(
|
|
(p0.x + p1.x) * 0.5,
|
|
(p0.y + p1.y) * 0.5,
|
|
(p0.z + p1.z) * 0.5,
|
|
);
|
|
self.control_points.insert(i1, mid);
|
|
if !self.weights.is_empty() && self.weights.len() == n {
|
|
let w = (self.weights[grip_id] + self.weights[i1.min(self.weights.len() - 1)])
|
|
* 0.5;
|
|
self.weights.insert(i1, w);
|
|
}
|
|
// Clear knots so to_truck rebuilds a uniform knot vector
|
|
// for the new CV count.
|
|
self.knots.clear();
|
|
}
|
|
A::RemoveVertex if grip_id < n && n > min_cv => {
|
|
self.control_points.remove(grip_id);
|
|
if grip_id < self.weights.len() {
|
|
self.weights.remove(grip_id);
|
|
}
|
|
self.knots.clear();
|
|
}
|
|
A::RefineVertices => {
|
|
// Insert a CV between every adjacent pair (chord midpoints)
|
|
// and rebuild a uniform knot vector.
|
|
if n >= 2 {
|
|
let mut refined = Vec::with_capacity(n * 2 - 1);
|
|
let mut refined_w = Vec::with_capacity(n * 2 - 1);
|
|
let has_w = !self.weights.is_empty() && self.weights.len() == n;
|
|
for i in 0..n {
|
|
refined.push(self.control_points[i].clone());
|
|
if has_w {
|
|
refined_w.push(self.weights[i]);
|
|
}
|
|
if i + 1 < n {
|
|
let a = &self.control_points[i];
|
|
let b = &self.control_points[i + 1];
|
|
refined.push(acadrust::types::Vector3::new(
|
|
(a.x + b.x) * 0.5,
|
|
(a.y + b.y) * 0.5,
|
|
(a.z + b.z) * 0.5,
|
|
));
|
|
if has_w {
|
|
refined_w.push((self.weights[i] + self.weights[i + 1]) * 0.5);
|
|
}
|
|
}
|
|
}
|
|
self.control_points = refined;
|
|
if has_w {
|
|
self.weights = refined_w;
|
|
}
|
|
self.knots.clear();
|
|
}
|
|
}
|
|
_ => {}
|
|
}
|
|
}
|
|
}
|
|
|
|
impl crate::entities::traits::PropertyEditable for Spline {
|
|
fn geometry_properties(&self, _text_style_names: &[String]) -> PropSection {
|
|
properties(self)
|
|
}
|
|
fn apply_geom_prop(&mut self, field: &str, value: &str) {
|
|
apply_geom_prop(self, field, value);
|
|
}
|
|
}
|
|
|
|
impl crate::entities::traits::Transformable for Spline {
|
|
fn apply_transform(&mut self, t: &EntityTransform) {
|
|
apply_transform(self, t);
|
|
}
|
|
}
|