rei-mirrors/Fornjot
1
0
Fork 0
mirror of https://github.com/hannobraun/Fornjot synced 2025-05-10 21:08:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Consolidate redundant code

Browse Source
This commit is contained in:
Hanno Braun 2025-04-28 13:45:36 +02:00
parent a58fac6e1b
commit 400b9e49d6
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
experiments/2025-03-18/src/geometry/curve.rs
View File

@ -43,7 +43,7 @@ impl AnchoredCurve {
}
pub fn point_from_local(&self, point: Point<1>) -> Point<3> {
self.floating.point_from_local(point)
self.origin + self.floating.point_from_local(point)
}
pub fn project_point(&self, point: Point<3>) -> Point<1> {
@ -82,7 +82,7 @@ pub type FloatingCurve = Box<dyn CurveGeometry>;
pub trait CurveGeometry {
fn clone_curve_geometry(&self) -> FloatingCurve;
fn point_from_local(&self, point: Point<1>) -> Point<3>;
fn point_from_local(&self, point: Point<1>) -> Vector<3>;
fn project_point(&self, point: Point<3>) -> Point<1>;
fn translate(&self, offset: Vector<3>) -> FloatingCurve;
@ -103,10 +103,10 @@ impl CurveGeometry for (Point<3>, Circle) {
Box::new(*self)
}
fn point_from_local(&self, point: Point<1>) -> Point<3> {
let (offset, circle) = *self;
fn point_from_local(&self, point: Point<1>) -> Vector<3> {
let (_, circle) = *self;
offset + circle.vector_from_local_point(point)
circle.vector_from_local_point(point)
}
fn project_point(&self, point: Point<3>) -> Point<1> {
@ -141,10 +141,10 @@ impl CurveGeometry for (Point<3>, Line) {
Box::new(*self)
}
fn point_from_local(&self, point: Point<1>) -> Point<3> {
let (origin, line) = *self;
fn point_from_local(&self, point: Point<1>) -> Vector<3> {
let (_, line) = *self;
origin + line.vector_from_local_point(point)
line.vector_from_local_point(point)
}
fn project_point(&self, point: Point<3>) -> Point<1> {