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

Merge GlobalCurve into GlobalEdge #1610

Merged
merged 25 commits into from
Feb 22, 2023
Merged

Merge GlobalCurve into GlobalEdge #1610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
1e12986
Make function accessible from sibling modules
hannobraun Feb 21, 2023
f1fbfa1
Move tests
hannobraun Feb 21, 2023
3e9fe65
Rewrite tests to approximate `HalfEdge`
hannobraun Feb 21, 2023
703ecf7
Refactor
hannobraun Feb 21, 2023
e2428aa
Refactor
hannobraun Feb 21, 2023
4d2c5e8
Refactor
hannobraun Feb 21, 2023
4534580
Fix word in doc comment
hannobraun Feb 21, 2023
7c38fc2
Rewrite tests to approximate `HalfEdge`
hannobraun Feb 22, 2023
f29ad93
Inline `Curve` approximation
hannobraun Feb 22, 2023
1809244
Move function to where it's used
hannobraun Feb 22, 2023
e25c3ee
Update function name
hannobraun Feb 22, 2023
9ac29b0
Merge `CurveApprox` into `HalfEdgeApprox`
hannobraun Feb 22, 2023
f28c265
Remove `fmt::Display` impl for `HalfEdge`
hannobraun Feb 22, 2023
087401b
Move approximation caching code to `edge` module
hannobraun Feb 22, 2023
e7d8b24
Use `GlobalEdge` as approximation cache key
hannobraun Feb 22, 2023
073531e
Update name of `GlobalEdgeApprox`
hannobraun Feb 22, 2023
5f2156c
Update name of `EdgeCache`
hannobraun Feb 22, 2023
69f5e09
Update name of struct field
hannobraun Feb 22, 2023
52816b6
Avoid useless allocation
hannobraun Feb 22, 2023
6c71792
Simplify variable name
hannobraun Feb 22, 2023
2e83206
Update doc comments
hannobraun Feb 22, 2023
abfc679
Remove `GlobalCurve` reference from `GlobalEdge`
hannobraun Feb 22, 2023
a6fbe51
Remove outdated remark from doc comment
hannobraun Feb 22, 2023
e271693
Don't mention `GlobalCurve` in doc comment
hannobraun Feb 22, 2023
d3d7488
Remove unused code
hannobraun Feb 22, 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
332 changes: 0 additions & 332 deletions crates/fj-kernel/src/algorithms/approx/curve.rs
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions crates/fj-kernel/src/algorithms/approx/cycle.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ use fj_math::Segment;
use crate::objects::{Cycle, Surface};

use super::{
curve::CurveCache, edge::HalfEdgeApprox, Approx, ApproxPoint, Tolerance,
edge::{EdgeCache, HalfEdgeApprox},
Approx, ApproxPoint, Tolerance,
};

impl Approx for (&Cycle, &Surface) {
type Approximation = CycleApprox;
type Cache = CurveCache;
type Cache = EdgeCache;

fn approx_with_cache(
self,
Expand Down
Loading