1b-agent/OneCAD-Draft
1
0 Fork 0
forked from 1b-agent/opencadstudio-upstream
Code Pull Requests Activity

feat: node graph overlay; move to opencadcodec/opencadkernel/opencadgraph

Browse Source 
The codec and kernel repositories and crates are renamed opencadcodec and
opencadkernel. Inside OCS they are depended on under short keys, so code
reads `codec::`, `kernel::` and the new `graph::` (opencadgraph, the node
graph engine). File-format and protocol spellings stay as they were: the
ACIS product id `acadrust`, the ACADRUST_* switches and the plugin
version keys `acadrust_version` / `acadrust_source`.

A button left of MCP on the command line opens a translucent node graph
over the viewport, with a palette of object, input, math, logic, list,
text and geometry nodes added by click or drag. An object node owns
drawing entities and its rows are the Properties panel's own rows for
them: the single-object page is extracted from refresh_properties as
entity_property_sections, values use the control protocol's
property_json, and writes go through set_property_value with a property
target override, so the panel, MCP and the graph share one read/write
path. A list reaching an object row makes one entity per element. Each
graph action is one undo step; the canvas pans and zooms.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Hakan SevenandClaude Opus 5.5 committed 2026-09-25 07:34:23 +03:00
1 parent 56c04408d6
commit f537aff75c
430 files changed
+9925 -8540
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/entities/spline.rs
+53 -53
View File
@@ -1,6 +1,6 @@
use acadrust::entities::Spline;
use cadkernel::geom2d::Curve as KernelCurve;
use cadkernel::space::{NurbsCurve3, Parameterization};
use codec::entities::Spline;
use kernel::geom2d::Curve as KernelCurve;
use kernel::space::{NurbsCurve3, Parameterization};
use crate::command::EntityTransform;
use crate::entities::common::{
@@ -44,7 +44,7 @@ pub(crate) fn fit_nurbs3(spline: &Spline) -> Option<NurbsCurve3> {
if spline.flags.closed && points.first() != points.last() {
if let Some(first) = points.first().copied() { points.push(first); }
}
let tangent = |value: acadrust::types::Vector3| {
let tangent = |value: codec::types::Vector3| {
let value = [value.x, value.y, value.z];
(value.iter().map(|component| component * component).sum::<f64>() > 1e-18)
.then_some(value)
@@ -115,7 +115,7 @@ pub(crate) fn replace_with_nurbs(spline: &mut Spline, curve: &NurbsCurve3) {
spline.degree = curve.degree() as i32;
spline.knots = curve.knots().to_vec();
spline.control_points = curve.control_points().iter()
.map(|point| acadrust::types::Vector3::new(point[0], point[1], point[2])).collect();
.map(|point| codec::types::Vector3::new(point[0], point[1], point[2])).collect();
spline.weights = curve.weights().to_vec();
if !fit_points.is_empty() {
if let (Some(first), Some(point)) = (fit_points.first_mut(), spline.control_points.first()) {
@@ -126,8 +126,8 @@ pub(crate) fn replace_with_nurbs(spline: &mut Spline, curve: &NurbsCurve3) {
}
}
spline.fit_points = fit_points;
spline.begin_tangent = acadrust::types::Vector3::ZERO;
spline.end_tangent = acadrust::types::Vector3::ZERO;
spline.begin_tangent = codec::types::Vector3::ZERO;
spline.end_tangent = codec::types::Vector3::ZERO;
spline.flags.rational = spline.weights.windows(2)
.any(|pair| (pair[0] - pair[1]).abs() > 1e-12);
spline.flags.closed = false;
@@ -140,9 +140,9 @@ pub(crate) fn replace_with_nurbs(spline: &mut Spline, curve: &NurbsCurve3) {
/// constraints, not control-hull vertices, so their box can exclude the curve.
/// The shared kernel reconstructs the same spatial interpolation used by the
/// curve consumers, then its control hull bounds every point of that curve.
pub(crate) fn fit_geometry_bounds(spline: &Spline) -> Option<cadkernel::brep::Aabb> {
pub(crate) fn fit_geometry_bounds(spline: &Spline) -> Option<kernel::brep::Aabb> {
let curve = fit_nurbs3(spline)?;
cadkernel::brep::Aabb::around(curve.control_points().iter().copied())
kernel::brep::Aabb::around(curve.control_points().iter().copied())
}
fn to_render(spl: &Spline) -> RenderEntity {
let n = spl.control_points.len();
@@ -326,7 +326,7 @@ pub(crate) fn measurement_polyline(spl: &Spline) -> Vec<[f64; 3]> {
});
match NurbsCurve3::new(degree, controls, spl.knots.clone(), weights) {
Some(curve) => {
curve.tessellate_angle(cadkernel::tessellation::DEFAULT_ANGLE)
curve.tessellate_angle(kernel::tessellation::DEFAULT_ANGLE)
}
None => spl.control_points.iter().map(|p| [p.x, p.y, p.z]).collect(),
}
@@ -335,7 +335,7 @@ pub(crate) fn measurement_polyline(spl: &Spline) -> Vec<[f64; 3]> {
/// Sample a Catmull-Rom spline through `pts` into a dense polyline. The curve
/// passes through every input point; open ends use reflected phantom points so
/// they don't kink, closed curves wrap around.
fn catmull_rom_polyline(pts: &[acadrust::types::Vector3], closed: bool) -> Vec<[f64; 3]> {
fn catmull_rom_polyline(pts: &[codec::types::Vector3], closed: bool) -> Vec<[f64; 3]> {
let n = pts.len();
if n < 2 {
return pts.iter().map(|p| [p.x, p.y, p.z]).collect();
@@ -395,10 +395,10 @@ fn catmull_rom_polyline(pts: &[acadrust::types::Vector3], closed: bool) -> Vec<[
}
q
};
let sampled = cadkernel::tessellation::sample_curve3_angle(
let sampled = kernel::tessellation::sample_curve3_angle(
point_at,
tangent_at,
cadkernel::tessellation::DEFAULT_ANGLE,
kernel::tessellation::DEFAULT_ANGLE,
);
out.extend(sampled.into_iter().skip(usize::from(seg > 0)));
}
@@ -453,10 +453,10 @@ fn fit_spline_polyline(spl: &Spline) -> Vec<[f64; 3]> {
}
q
};
let sampled = cadkernel::tessellation::sample_curve3_angle(
let sampled = kernel::tessellation::sample_curve3_angle(
point_at,
tangent_at,
cadkernel::tessellation::DEFAULT_ANGLE,
kernel::tessellation::DEFAULT_ANGLE,
);
out.extend(sampled.into_iter().skip(usize::from(i > 0)));
}
@@ -475,7 +475,7 @@ fn periodic_fit_spline_polyline(spl: &Spline) -> Vec<[f64; 3]> {
_ => Parameterization::Chord,
};
NurbsCurve3::interpolate_periodic(&points, parameterization)
.map(|curve| curve.tessellate_angle(cadkernel::tessellation::DEFAULT_ANGLE))
.map(|curve| curve.tessellate_angle(kernel::tessellation::DEFAULT_ANGLE))
.unwrap_or_else(|| catmull_rom_polyline(&spl.fit_points, true))
}
@@ -505,7 +505,7 @@ fn fit_spline_slopes(spl: &Spline, p: &[[f64; 3]]) -> Option<(Vec<f64>, [Vec<f64
}
let h: Vec<f64> = (0..n - 1).map(|i| (t[i + 1] - t[i]).max(1e-9)).collect();
let nonzero = |v: &acadrust::types::Vector3| v.x * v.x + v.y * v.y + v.z * v.z > 1e-18;
let nonzero = |v: &codec::types::Vector3| v.x * v.x + v.y * v.y + v.z * v.z > 1e-18;
let begin = nonzero(&spl.begin_tangent).then(|| {
[
spl.begin_tangent.x,
@@ -576,7 +576,7 @@ fn thomas_solve(a: &[f64], b: &[f64], c: &[f64], d: &mut [f64]) {
pub(crate) const SPLINE_MODE_GRIP_ID: usize = usize::MAX - 1;
fn control_vertices(spline: &Spline) -> Vec<acadrust::types::Vector3> {
fn control_vertices(spline: &Spline) -> Vec<codec::types::Vector3> {
if !uses_fit_method(spline) {
return spline.control_points.clone();
}
@@ -591,7 +591,7 @@ fn control_vertices(spline: &Spline) -> Vec<acadrust::types::Vector3> {
.iter()
.map(|point| {
let point = planar.plane.point_at(*point);
acadrust::types::Vector3::new(point[0], point[1], point[2])
codec::types::Vector3::new(point[0], point[1], point[2])
})
.collect()
}
@@ -633,8 +633,8 @@ fn convert_to_control_method(spline: &mut Spline) -> bool {
let valid = spline.control_points.len() >= 2;
if valid {
spline.fit_points.clear();
spline.begin_tangent = acadrust::types::Vector3::ZERO;
spline.end_tangent = acadrust::types::Vector3::ZERO;
spline.begin_tangent = codec::types::Vector3::ZERO;
spline.end_tangent = codec::types::Vector3::ZERO;
spline.dwg_flags1 &= !1;
spline.dxf_flags &= !(32 | 1024);
}
@@ -653,7 +653,7 @@ fn convert_to_control_method(spline: &mut Spline) -> bool {
.iter()
.map(|point| {
let point = planar.plane.point_at(*point);
acadrust::types::Vector3::new(point[0], point[1], point[2])
codec::types::Vector3::new(point[0], point[1], point[2])
})
.collect();
spline.weights = if curve.is_rational() {
@@ -664,8 +664,8 @@ fn convert_to_control_method(spline: &mut Spline) -> bool {
spline.flags.rational = curve.is_rational();
spline.flags.planar = true;
spline.fit_points.clear();
spline.begin_tangent = acadrust::types::Vector3::ZERO;
spline.end_tangent = acadrust::types::Vector3::ZERO;
spline.begin_tangent = codec::types::Vector3::ZERO;
spline.end_tangent = codec::types::Vector3::ZERO;
true
}
@@ -685,7 +685,7 @@ fn convert_to_fit_method(spline: &mut Spline) -> bool {
true
}
fn derived_fit_points(spline: &Spline) -> Vec<acadrust::types::Vector3> {
fn derived_fit_points(spline: &Spline) -> Vec<codec::types::Vector3> {
if spline.flags.closed || spline.flags.periodic {
return Vec::new();
}
@@ -713,7 +713,7 @@ fn derived_fit_points(spline: &Spline) -> Vec<acadrust::types::Vector3> {
.into_iter()
.map(|parameter| {
let point = curve.point_at_knot(parameter);
acadrust::types::Vector3::new(point[0], point[1], point[2])
codec::types::Vector3::new(point[0], point[1], point[2])
})
.collect()
}
@@ -1167,7 +1167,7 @@ fn apply_transform(spline: &mut Spline, t: &EntityTransform) {
*p2,
*working_normal,
);
acadrust::Entity::apply_transform(spline, &transform);
codec::Entity::apply_transform(spline, &transform);
spline.flags.planar = crate::entities::curve::spline_is_planar(spline);
return;
}
@@ -1183,7 +1183,7 @@ fn apply_transform(spline: &mut Spline, t: &EntityTransform) {
}
impl RenderConvertible for Spline {
fn to_render(&self, _document: &acadrust::CadDocument) -> Option<RenderEntity> {
fn to_render(&self, _document: &codec::CadDocument) -> Option<RenderEntity> {
Some(to_render(self))
}
}
@@ -1286,11 +1286,11 @@ mod tests {
let mut spline = Spline::default();
spline.degree = 3;
spline.control_points = vec![
acadrust::types::Vector3::new(0.0, 0.0, 0.0),
acadrust::types::Vector3::new(1.0, 2.0, 0.0),
acadrust::types::Vector3::new(3.0, 3.0, 1.0),
acadrust::types::Vector3::new(5.0, 2.0, 0.0),
acadrust::types::Vector3::new(6.0, 0.0, 1.0),
codec::types::Vector3::new(0.0, 0.0, 0.0),
codec::types::Vector3::new(1.0, 2.0, 0.0),
codec::types::Vector3::new(3.0, 3.0, 1.0),
codec::types::Vector3::new(5.0, 2.0, 0.0),
codec::types::Vector3::new(6.0, 0.0, 1.0),
];
spline.knots = vec![0.0, 0.0, 0.0, 0.0, 0.5, 1.0, 1.0, 1.0, 1.0];
let pts = spline_knot_points(&spline);
@@ -1313,9 +1313,9 @@ mod tests {
let mut spline = Spline::default();
spline.degree = 3;
spline.fit_points = vec![
acadrust::types::Vector3::new(0.0, 0.0, 0.0),
acadrust::types::Vector3::new(4.0, 0.0, 1.0),
acadrust::types::Vector3::new(4.0, 3.0, 2.0),
codec::types::Vector3::new(0.0, 0.0, 0.0),
codec::types::Vector3::new(4.0, 0.0, 1.0),
codec::types::Vector3::new(4.0, 3.0, 2.0),
];
assert!(spline_knot_points(&spline).is_empty());
}
@@ -1325,12 +1325,12 @@ mod tests {
let mut spline = Spline::default();
spline.degree = 3;
spline.flags.closed = true;
spline.control_points.push(acadrust::types::Vector3::ZERO);
spline.control_points.push(codec::types::Vector3::ZERO);
spline.fit_points = vec![
acadrust::types::Vector3::new(0.0, 0.0, 0.0),
acadrust::types::Vector3::new(4.0, 0.0, 1.0),
acadrust::types::Vector3::new(4.0, 3.0, 2.0),
acadrust::types::Vector3::new(0.0, 3.0, 1.0),
codec::types::Vector3::new(0.0, 0.0, 0.0),
codec::types::Vector3::new(4.0, 0.0, 1.0),
codec::types::Vector3::new(4.0, 3.0, 2.0),
codec::types::Vector3::new(0.0, 3.0, 1.0),
];
let bounds = fit_geometry_bounds(&spline).unwrap();
@@ -1349,8 +1349,8 @@ mod tests {
fn fit_tolerance_is_editable_and_rejects_invalid_values() {
let mut spline = Spline::default();
spline.fit_points = vec![
acadrust::types::Vector3::ZERO,
acadrust::types::Vector3::new(1.0, 0.0, 0.0),
codec::types::Vector3::ZERO,
codec::types::Vector3::new(1.0, 0.0, 0.0),
];
spline.fit_tolerance = 0.25;
@@ -1373,8 +1373,8 @@ mod tests {
fn tangent_properties_edit_only_the_stored_component() {
let mut spline = Spline::default();
spline.fit_points = vec![
acadrust::types::Vector3::ZERO,
acadrust::types::Vector3::new(1.0, 1.0, 0.0),
codec::types::Vector3::ZERO,
codec::types::Vector3::new(1.0, 1.0, 0.0),
];
let start_y = properties(&spline)
@@ -1387,7 +1387,7 @@ mod tests {
apply_geom_prop(&mut spline, "start_tan_y", "2.5");
assert_eq!(
spline.begin_tangent,
acadrust::types::Vector3::new(0.0, 2.5, 0.0)
codec::types::Vector3::new(0.0, 2.5, 0.0)
);
}
@@ -1396,12 +1396,12 @@ mod tests {
let mut spline = Spline::default();
spline.degree = 3;
spline.control_points = vec![
acadrust::types::Vector3::new(0.0, 0.0, 0.0),
acadrust::types::Vector3::new(1.0, 3.0, 0.0),
acadrust::types::Vector3::new(4.0, 3.0, 0.0),
acadrust::types::Vector3::new(5.0, 0.0, 0.0),
codec::types::Vector3::new(0.0, 0.0, 0.0),
codec::types::Vector3::new(1.0, 3.0, 0.0),
codec::types::Vector3::new(4.0, 3.0, 0.0),
codec::types::Vector3::new(5.0, 0.0, 0.0),
];
spline.knots = cadkernel::space::clamped_uniform_knots(3, 4);
spline.knots = kernel::space::clamped_uniform_knots(3, 4);
let before = nurbs3(&spline).unwrap().point_at(0.37);
assert!(prepare_fit_point_view(&mut spline));
@@ -1411,8 +1411,8 @@ mod tests {
assert!(!uses_fit_method(&spline));
let after = nurbs3(&spline).unwrap().point_at(0.37);
assert!(
cadkernel::space::Vec3::from(before)
.distance(cadkernel::space::Vec3::from(after))
kernel::space::Vec3::from(before)
.distance(kernel::space::Vec3::from(after))
< 1.0e-12
);
}