-
-
Notifications
You must be signed in to change notification settings - Fork 119
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1967 from hannobraun/boundary
Merge `BoundaryOnCurve` and `BoundingVertices`
- Loading branch information
Showing
9 changed files
with
111 additions
and
74 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,95 @@ | ||
| use std::{ | ||
| cmp::Ordering, | ||
| hash::{Hash, Hasher}, | ||
| }; | ||
|
|
||
| use fj_math::Point; | ||
|
|
||
| use crate::{objects::Vertex, storage::HandleWrapper}; | ||
|
|
||
| /// A boundary on a curve | ||
| #[derive(Clone, Copy, Debug, Eq, PartialEq, Hash, Ord, PartialOrd)] | ||
| pub struct BoundaryOnCurve { | ||
| /// | ||
| /// This struct is generic, because different situations require different | ||
| /// representations of a boundary. In some cases, curve coordinates are enough, | ||
| /// in other cases, vertices are required, and sometimes you need both. | ||
| #[derive(Clone, Copy, Debug)] | ||
| pub struct CurveBoundary<T: CurveBoundaryElement> { | ||
| /// The raw representation of the boundary | ||
| pub inner: [Point<1>; 2], | ||
| pub inner: [T::Repr; 2], | ||
| } | ||
|
|
||
| impl BoundaryOnCurve { | ||
| impl<T: CurveBoundaryElement> CurveBoundary<T> { | ||
| /// Reverse the direction of the boundary | ||
| /// | ||
| /// Returns a new instance of this struct, which has its direction reversed. | ||
| #[must_use] | ||
| pub fn reverse(self) -> Self { | ||
| let [a, b] = self.inner; | ||
| Self { inner: [b, a] } | ||
| } | ||
|
|
||
| /// Normalize the boundary | ||
| /// | ||
| /// Returns a new instance of this struct, which has the bounding elements | ||
| /// in a defined order. This can be used to compare a boundary while | ||
| /// disregarding its direction. | ||
| #[must_use] | ||
| pub fn normalize(mut self) -> Self { | ||
| self.inner.sort(); | ||
| self | ||
| } | ||
| } | ||
|
|
||
| impl<T: CurveBoundaryElement> Eq for CurveBoundary<T> {} | ||
|
|
||
| impl<T: CurveBoundaryElement> PartialEq for CurveBoundary<T> { | ||
| fn eq(&self, other: &Self) -> bool { | ||
| self.inner == other.inner | ||
| } | ||
| } | ||
|
|
||
| impl<T> From<[T; 2]> for BoundaryOnCurve | ||
| impl<S, T: CurveBoundaryElement> From<[S; 2]> for CurveBoundary<T> | ||
| where | ||
| T: Into<Point<1>>, | ||
| S: Into<T::Repr>, | ||
| { | ||
| fn from(boundary: [T; 2]) -> Self { | ||
| fn from(boundary: [S; 2]) -> Self { | ||
| let inner = boundary.map(Into::into); | ||
| Self { inner } | ||
| } | ||
| } | ||
|
|
||
| impl<T: CurveBoundaryElement> Hash for CurveBoundary<T> { | ||
| fn hash<H: Hasher>(&self, state: &mut H) { | ||
| self.inner.hash(state); | ||
| } | ||
| } | ||
|
|
||
| impl<T: CurveBoundaryElement> Ord for CurveBoundary<T> { | ||
| fn cmp(&self, other: &Self) -> Ordering { | ||
| self.inner.cmp(&other.inner) | ||
| } | ||
| } | ||
|
|
||
| impl<T: CurveBoundaryElement> PartialOrd for CurveBoundary<T> { | ||
| fn partial_cmp(&self, other: &Self) -> Option<Ordering> { | ||
| self.inner.partial_cmp(&other.inner) | ||
| } | ||
| } | ||
|
|
||
| /// An element of a curve boundary | ||
| /// | ||
| /// Used for the type parameter of [`CurveBoundary`]. | ||
| pub trait CurveBoundaryElement { | ||
| /// The representation the curve boundary element | ||
| /// | ||
| /// This is the actual data stored in [`CurveBoundary`]. | ||
| type Repr: Eq + Hash + Ord; | ||
| } | ||
|
|
||
| impl CurveBoundaryElement for Point<1> { | ||
| type Repr = Self; | ||
| } | ||
|
|
||
| impl CurveBoundaryElement for Vertex { | ||
| type Repr = HandleWrapper<Vertex>; | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,11 @@ | ||
| //! Types that are tied to objects, but aren't objects themselves | ||
| mod boundary; | ||
| mod bounding_vertices; | ||
| mod path; | ||
| mod surface; | ||
|
|
||
| pub use self::{ | ||
| boundary::BoundaryOnCurve, | ||
| bounding_vertices::BoundingVertices, | ||
| boundary::{CurveBoundary, CurveBoundaryElement}, | ||
| path::{GlobalPath, SurfacePath}, | ||
| surface::SurfaceGeometry, | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.