Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compute position of HalfEdges start vertex #1635

Merged
merged 10 commits into from
Mar 1, 2023
Merged

Compute position of HalfEdges start vertex #1635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
536e7af
Add `HalfEdge::start_position`
hannobraun Feb 28, 2023
6b2446a
Replace use of `SurfaceVertex::position`
hannobraun Feb 28, 2023
bea3bdd
Replace use of `SurfaceVertex::position`
hannobraun Feb 28, 2023
735377e
Prepare code for follow-on change
hannobraun Feb 28, 2023
4f8e147
Replace use of `SurfaceVertex::position`
hannobraun Feb 28, 2023
ed41ca2
Replace use of `SurfaceVertex::position`
hannobraun Feb 28, 2023
1b1a4a3
Prepare code for follow-on change
hannobraun Feb 28, 2023
942aeea
Replace use of `SurfaceVertex::position`
hannobraun Feb 28, 2023
9d18768
Replace use of `SurfaceVertex::position`
hannobraun Feb 28, 2023
d7fe518
Compute `HalfEdge` start position
hannobraun Feb 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/fj-kernel/src/algorithms/approx/edge.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ impl Approx for (&Handle<HalfEdge>, &Surface) {
let range = RangeOnPath { boundary };

let first = ApproxPoint::new(
half_edge.start_vertex().position(),
half_edge.start_position(),
half_edge.start_vertex().global_form().position(),
)
.with_source((half_edge.clone(), half_edge.boundary()[0]));
Expand Down
11 changes: 4 additions & 7 deletions crates/fj-kernel/src/algorithms/intersect/face_point.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,10 +318,7 @@ mod tests {
let edge = face
.exterior()
.half_edges()
.find(|edge| {
let vertex = edge.start_vertex();
vertex.position() == Point::from([0., 0.])
})
.find(|edge| edge.start_position() == Point::from([0., 0.]))
.unwrap();
assert_eq!(
intersection,
Expand Down Expand Up @@ -352,10 +349,10 @@ mod tests {
let vertex = face
.exterior()
.half_edges()
.map(|half_edge| half_edge.start_vertex().clone())
.find(|surface_vertex| {
surface_vertex.position() == Point::from([1., 0.])
.find(|half_edge| {
half_edge.start_position() == Point::from([1., 0.])
})
.map(|half_edge| half_edge.start_vertex().clone())
.unwrap();
assert_eq!(
intersection,
Expand Down
11 changes: 4 additions & 7 deletions crates/fj-kernel/src/algorithms/intersect/ray_face.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,10 +256,7 @@ mod tests {
let edge = face
.exterior()
.half_edges()
.find(|edge| {
let vertex = edge.start_vertex();
vertex.position() == Point::from([-1., 1.])
})
.find(|edge| edge.start_position() == Point::from([-1., 1.]))
.unwrap();
assert_eq!(
(&ray, &face).intersect(),
Expand Down Expand Up @@ -291,10 +288,10 @@ mod tests {
let vertex = face
.exterior()
.half_edges()
.map(|half_edge| half_edge.start_vertex().clone())
.find(|surface_vertex| {
surface_vertex.position() == Point::from([-1., -1.])
.find(|half_edge| {
half_edge.start_position() == Point::from([-1., -1.])
})
.map(|half_edge| half_edge.start_vertex().clone())
.unwrap();
assert_eq!(
(&ray, &face).intersect(),
Expand Down
3 changes: 1 addition & 2 deletions crates/fj-kernel/src/objects/full/cycle.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,7 @@ impl Cycle {
let mut sum = Scalar::ZERO;

for [a, b] in self.half_edges.as_slice().array_windows_ext() {
let [a, b] =
[a, b].map(|half_edge| half_edge.start_vertex().position());
let [a, b] = [a, b].map(|half_edge| half_edge.start_position());

sum += (b.u - a.u) * (b.v + a.v);
}
Expand Down
10 changes: 10 additions & 0 deletions crates/fj-kernel/src/objects/full/edge.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,16 @@ impl HalfEdge {
self.boundary
}

/// Compute the surface position where the half-edge starts
pub fn start_position(&self) -> Point<2> {
// Computing the surface position from the curve position is fine.
// `HalfEdge` "owns" its start position. There is no competing code that
// could compute the surface position from slightly different data.

let [start, _] = self.boundary;
self.curve.point_from_path_coords(start)
}

/// Access the vertex from where this half-edge starts
pub fn start_vertex(&self) -> &Handle<SurfaceVertex> {
&self.start_vertex
Expand Down