forked from 1b-agent/opencadstudio-upstream
Reverse complete helix geometry and preserve top radius semantics
This commit is contained in:
1 parent
f80e9f742c
commit
25ac594d85
3 files changed
+36
-11
No files matched your search
+33
-9
@@ -52,10 +52,13 @@ fn spline_curve(spline: &Spline) -> Option<NurbsCurve3> {
|
|||||||
|
|
||||||
fn axis_frame(helix: &Helix) -> Option<(Vec3, Vec3, Vec3)> {
|
fn axis_frame(helix: &Helix) -> Option<(Vec3, Vec3, Vec3)> {
|
||||||
let base = point(helix.axis_base_point);
|
let base = point(helix.axis_base_point);
|
||||||
let axis = point(helix.axis_vector).normalize()?;
|
let tangent = spline_curve(&helix.spline).map(|curve| curve.tangent_at(0.0)).unwrap_or([0.0;3]);
|
||||||
let radial = point(helix.start_point) - base;
|
let (axis, radial, _) = HelixCurve::frame_from_points(base.to_array(),point(helix.axis_vector).to_array(),point(helix.start_point).to_array(),tangent)?;
|
||||||
let start_direction = (radial - axis * radial.dot(axis)).normalize()?;
|
Some((base,Vec3::from(axis),Vec3::from(radial)))
|
||||||
Some((base, axis, start_direction))
|
}
|
||||||
|
|
||||||
|
fn base_radius(helix: &Helix) -> Option<f64> {
|
||||||
|
radius_from_axis(helix, point(helix.start_point))
|
||||||
}
|
}
|
||||||
|
|
||||||
fn radius_from_axis(helix: &Helix, value: Vec3) -> Option<f64> {
|
fn radius_from_axis(helix: &Helix, value: Vec3) -> Option<f64> {
|
||||||
@@ -77,7 +80,7 @@ fn kernel_curve(helix: &Helix, top_radius: f64) -> Option<HelixCurve> {
|
|||||||
base_center: base.to_array(),
|
base_center: base.to_array(),
|
||||||
axis_direction: axis.to_array(),
|
axis_direction: axis.to_array(),
|
||||||
start_direction: start_direction.to_array(),
|
start_direction: start_direction.to_array(),
|
||||||
base_radius: helix.radius,
|
base_radius: base_radius(helix)?,
|
||||||
top_radius,
|
top_radius,
|
||||||
height: helix.turns * helix.turn_height,
|
height: helix.turns * helix.turn_height,
|
||||||
turns: helix.turns,
|
turns: helix.turns,
|
||||||
@@ -89,6 +92,27 @@ fn kernel_curve(helix: &Helix, top_radius: f64) -> Option<HelixCurve> {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Reverse generating parameters together with the exact stored spline.
|
||||||
|
pub(crate) fn reversed(helix: &Helix) -> Option<Helix> {
|
||||||
|
let original_curve = spline_curve(&helix.spline)?;
|
||||||
|
let parameters = kernel_curve(helix,top_radius(helix))?.reversed()?;
|
||||||
|
let mut result = helix.clone();
|
||||||
|
result.axis_base_point = vector(Vec3::from(parameters.base_center));
|
||||||
|
result.axis_vector = vector(Vec3::from(parameters.axis_direction));
|
||||||
|
result.start_point = vector(Vec3::from(original_curve.point_at(1.0)));
|
||||||
|
result.radius = parameters.top_radius;
|
||||||
|
// Reverse the evaluated curve itself instead of fitting it again.
|
||||||
|
let reversed_curve=original_curve.reversed()?;
|
||||||
|
result.spline.control_points=reversed_curve.control_points().iter().map(|point|Vector3::new(point[0],point[1],point[2])).collect();
|
||||||
|
result.spline.fit_points.reverse();
|
||||||
|
result.spline.weights=if helix.spline.weights.is_empty(){Vec::new()}else{reversed_curve.weights().to_vec()};
|
||||||
|
result.spline.knots=reversed_curve.knots().to_vec();
|
||||||
|
let begin=helix.spline.begin_tangent;let end=helix.spline.end_tangent;
|
||||||
|
result.spline.begin_tangent=Vector3::new(-end.x,-end.y,-end.z);
|
||||||
|
result.spline.end_tangent=Vector3::new(-begin.x,-begin.y,-begin.z);
|
||||||
|
Some(result)
|
||||||
|
}
|
||||||
|
|
||||||
fn projected_direction(direction: Vec3, axis: Vec3) -> Option<Vec3> {
|
fn projected_direction(direction: Vec3, axis: Vec3) -> Option<Vec3> {
|
||||||
(direction - axis * direction.dot(axis)).normalize()
|
(direction - axis * direction.dot(axis)).normalize()
|
||||||
}
|
}
|
||||||
@@ -111,6 +135,7 @@ fn rebuild(helix: &mut Helix, top_radius: f64) -> bool {
|
|||||||
let Some(nurbs) = curve.nurbs() else {
|
let Some(nurbs) = curve.nurbs() else {
|
||||||
return false;
|
return false;
|
||||||
};
|
};
|
||||||
|
helix.radius = top_radius;
|
||||||
helix.spline.degree = nurbs.degree() as i32;
|
helix.spline.degree = nurbs.degree() as i32;
|
||||||
helix.spline.knots = nurbs.knots().to_vec();
|
helix.spline.knots = nurbs.knots().to_vec();
|
||||||
helix.spline.control_points = nurbs
|
helix.spline.control_points = nurbs
|
||||||
@@ -194,7 +219,7 @@ fn properties(helix: &Helix) -> Vec<PropSection> {
|
|||||||
edit(t!("Height").as_ref(), "height", height),
|
edit(t!("Height").as_ref(), "height", height),
|
||||||
edit(t!("Turns").as_ref(), "turns", helix.turns),
|
edit(t!("Turns").as_ref(), "turns", helix.turns),
|
||||||
edit(t!("Turn height").as_ref(), "turn_height", helix.turn_height),
|
edit(t!("Turn height").as_ref(), "turn_height", helix.turn_height),
|
||||||
edit(t!("Base radius").as_ref(), "base_radius", helix.radius),
|
edit(t!("Base radius").as_ref(), "base_radius", base_radius(helix).unwrap_or(0.0)),
|
||||||
edit(t!("Top radius").as_ref(), "top_radius", top_radius),
|
edit(t!("Top radius").as_ref(), "top_radius", top_radius),
|
||||||
choice(t!("Twist").as_ref(), "twist", &twist, &twist_options),
|
choice(t!("Twist").as_ref(), "twist", &twist, &twist_options),
|
||||||
ro(t!("Turn slope").as_ref(), "turn_slope", format_angle(turn_slope)),
|
ro(t!("Turn slope").as_ref(), "turn_slope", format_angle(turn_slope)),
|
||||||
@@ -284,7 +309,6 @@ fn apply_geom_prop(helix: &mut Helix, field: &str, value: &str) {
|
|||||||
let Some((base, _, start_direction)) = axis_frame(helix) else {
|
let Some((base, _, start_direction)) = axis_frame(helix) else {
|
||||||
return;
|
return;
|
||||||
};
|
};
|
||||||
helix.radius = number;
|
|
||||||
helix.start_point = vector(base + start_direction * number);
|
helix.start_point = vector(base + start_direction * number);
|
||||||
}
|
}
|
||||||
"top_radius" if number >= 0.0 => {
|
"top_radius" if number >= 0.0 => {
|
||||||
@@ -303,6 +327,7 @@ fn apply_geom_prop(helix: &mut Helix, field: &str, value: &str) {
|
|||||||
fn apply_grip(helix: &mut Helix, grip_id: usize, apply: GripApply) {
|
fn apply_grip(helix: &mut Helix, grip_id: usize, apply: GripApply) {
|
||||||
let original = helix.clone();
|
let original = helix.clone();
|
||||||
let top = top_radius(helix);
|
let top = top_radius(helix);
|
||||||
|
let Some(base_radius) = base_radius(helix) else { return; };
|
||||||
let Some((base, axis, start_direction)) = axis_frame(helix) else {
|
let Some((base, axis, start_direction)) = axis_frame(helix) else {
|
||||||
return;
|
return;
|
||||||
};
|
};
|
||||||
@@ -334,7 +359,6 @@ fn apply_grip(helix: &mut Helix, grip_id: usize, apply: GripApply) {
|
|||||||
if radius <= EPSILON {
|
if radius <= EPSILON {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
helix.radius = radius;
|
|
||||||
helix.start_point = vector(base + radial);
|
helix.start_point = vector(base + radial);
|
||||||
}
|
}
|
||||||
(2, GripApply::Absolute(position)) => {
|
(2, GripApply::Absolute(position)) => {
|
||||||
@@ -362,7 +386,7 @@ fn apply_grip(helix: &mut Helix, grip_id: usize, apply: GripApply) {
|
|||||||
*helix = original;
|
*helix = original;
|
||||||
return;
|
return;
|
||||||
};
|
};
|
||||||
helix.start_point = vector(base + start_direction * helix.radius);
|
helix.start_point = vector(base + start_direction * base_radius);
|
||||||
}
|
}
|
||||||
(3, GripApply::Absolute(position)) => {
|
(3, GripApply::Absolute(position)) => {
|
||||||
let position = kernel(position);
|
let position = kernel(position);
|
||||||
|
|||||||
@@ -134,7 +134,7 @@ impl HelixCommand {
|
|||||||
let start = self.center + start_direction * curve.base_radius;
|
let start = self.center + start_direction * curve.base_radius;
|
||||||
helix.start_point = Vector3::new(start.x, start.y, start.z);
|
helix.start_point = Vector3::new(start.x, start.y, start.z);
|
||||||
helix.axis_vector = Vector3::new(axis.x, axis.y, axis.z);
|
helix.axis_vector = Vector3::new(axis.x, axis.y, axis.z);
|
||||||
helix.radius = curve.base_radius;
|
helix.radius = curve.top_radius;
|
||||||
helix.turns = curve.turns;
|
helix.turns = curve.turns;
|
||||||
helix.turn_height = height / curve.turns;
|
helix.turn_height = height / curve.turns;
|
||||||
helix.handedness = self.counter_clockwise;
|
helix.handedness = self.counter_clockwise;
|
||||||
|
|||||||
@@ -76,6 +76,7 @@ impl ReverseCommand {
|
|||||||
Some(EntityType::Polyline3D(out))
|
Some(EntityType::Polyline3D(out))
|
||||||
}
|
}
|
||||||
EntityType::Spline(sp) => Some(EntityType::Spline(reverse_spline(sp))),
|
EntityType::Spline(sp) => Some(EntityType::Spline(reverse_spline(sp))),
|
||||||
|
EntityType::Helix(helix) => crate::entities::helix::reversed(helix).map(EntityType::Helix),
|
||||||
_ => None,
|
_ => None,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -199,7 +200,7 @@ impl CadCommand for ReverseCommand {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn prompt(&self) -> String {
|
fn prompt(&self) -> String {
|
||||||
t!("REVERSE Select line, polyline or spline to reverse:").into_owned()
|
t!("REVERSE Select line, polyline, spline or helix to reverse:").into_owned()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn needs_entity_pick(&self) -> bool {
|
fn needs_entity_pick(&self) -> bool {
|
||||||
|
|||||||
Reference in new issue
Block a user