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

Add fj_core::Instance #2191

Merged
merged 7 commits into from
Feb 5, 2024
Merged

Add fj_core::Instance #2191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
27c18e8
Add `Instance`
hannobraun Feb 2, 2024
1f24422
Add `Services` to `fj_core::Instance`
hannobraun Feb 2, 2024
bb70a10
Improve doc comment
hannobraun Feb 2, 2024
3d9ae2f
Add API for constructing `Instance`
hannobraun Feb 2, 2024
2fcf693
Make use of `Instance` in `fj-core` tests
hannobraun Feb 2, 2024
aa6dafa
Make use of `fj::core::Instance` in models
hannobraun Feb 2, 2024
382cdb3
Make more use of `fj::core::Instance` in models
hannobraun Feb 2, 2024
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
22 changes: 11 additions & 11 deletions crates/fj-core/src/algorithms/approx/curve.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,18 +181,18 @@ mod tests {
geometry::{CurveBoundary, GlobalPath, SurfaceGeometry, SurfacePath},
objects::{Curve, Surface},
operations::insert::Insert,
services::Services,
Instance,
};

#[test]
fn approx_line_on_flat_surface() {
let mut services = Services::new();
let mut core = Instance::new();

let curve = Curve::new().insert(&mut services);
let curve = Curve::new().insert(&mut core.services);
let (surface_path, boundary) =
SurfacePath::line_from_points([[1., 1.], [2., 1.]]);
let boundary = CurveBoundary::from(boundary);
let surface = services.objects.surfaces.xz_plane();
let surface = core.services.objects.surfaces.xz_plane();

let tolerance = 1.;
let approx =
Expand All @@ -203,9 +203,9 @@ mod tests {

#[test]
fn approx_line_on_curved_surface_but_not_along_curve() {
let mut services = Services::new();
let mut core = Instance::new();

let curve = Curve::new().insert(&mut services);
let curve = Curve::new().insert(&mut core.services);
let (surface_path, boundary) =
SurfacePath::line_from_points([[1., 1.], [2., 1.]]);
let boundary = CurveBoundary::from(boundary);
Expand All @@ -223,10 +223,10 @@ mod tests {

#[test]
fn approx_line_on_curved_surface_along_curve() {
let mut services = Services::new();
let mut core = Instance::new();

let global_path = GlobalPath::circle_from_radius(1.);
let curve = Curve::new().insert(&mut services);
let curve = Curve::new().insert(&mut core.services);
let surface_path = SurfacePath::line_from_points_with_coords([
([0.], [0., 1.]),
([TAU], [TAU, 1.]),
Expand Down Expand Up @@ -257,13 +257,13 @@ mod tests {

#[test]
fn approx_circle_on_flat_surface() {
let mut services = Services::new();
let mut core = Instance::new();

let curve = Curve::new().insert(&mut services);
let curve = Curve::new().insert(&mut core.services);
let surface_path =
SurfacePath::circle_from_center_and_radius([0., 0.], 1.);
let boundary = CurveBoundary::from([[0.], [TAU]]);
let surface = services.objects.surfaces.xz_plane();
let surface = core.services.objects.surfaces.xz_plane();

let tolerance = 1.;
let approx =
Expand Down
28 changes: 17 additions & 11 deletions crates/fj-core/src/algorithms/intersect/curve_edge.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,18 +73,21 @@ mod tests {

use crate::{
geometry::SurfacePath, objects::HalfEdge,
operations::build::BuildHalfEdge, services::Services,
operations::build::BuildHalfEdge, Instance,
};

use super::CurveEdgeIntersection;

#[test]
fn compute_edge_in_front_of_curve_origin() {
let mut services = Services::new();
let mut core = Instance::new();

let path = SurfacePath::u_axis();
let edge =
HalfEdge::line_segment([[1., -1.], [1., 1.]], None, &mut services);
let edge = HalfEdge::line_segment(
[[1., -1.], [1., 1.]],
None,
&mut core.services,
);

let intersection = CurveEdgeIntersection::compute(&path, &edge);

Expand All @@ -98,13 +101,13 @@ mod tests {

#[test]
fn compute_edge_behind_curve_origin() {
let mut services = Services::new();
let mut core = Instance::new();

let path = SurfacePath::u_axis();
let edge = HalfEdge::line_segment(
[[-1., -1.], [-1., 1.]],
None,
&mut services,
&mut core.services,
);

let intersection = CurveEdgeIntersection::compute(&path, &edge);
Expand All @@ -119,13 +122,13 @@ mod tests {

#[test]
fn compute_edge_parallel_to_curve() {
let mut services = Services::new();
let mut core = Instance::new();

let path = SurfacePath::u_axis();
let edge = HalfEdge::line_segment(
[[-1., -1.], [1., -1.]],
None,
&mut services,
&mut core.services,
);

let intersection = CurveEdgeIntersection::compute(&path, &edge);
Expand All @@ -135,11 +138,14 @@ mod tests {

#[test]
fn compute_edge_on_curve() {
let mut services = Services::new();
let mut core = Instance::new();

let path = SurfacePath::u_axis();
let edge =
HalfEdge::line_segment([[-1., 0.], [1., 0.]], None, &mut services);
let edge = HalfEdge::line_segment(
[[-1., 0.], [1., 0.]],
None,
&mut core.services,
);

let intersection = CurveEdgeIntersection::compute(&path, &edge);

Expand Down
36 changes: 19 additions & 17 deletions crates/fj-core/src/algorithms/intersect/curve_face.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,14 +160,14 @@ mod tests {
insert::Insert,
update::{UpdateFace, UpdateRegion},
},
services::Services,
Instance,
};

use super::CurveFaceIntersection;

#[test]
fn compute() {
let mut services = Services::new();
let mut core = Instance::new();

let (path, _) = SurfacePath::line_from_points([[-3., 0.], [-2., 0.]]);

Expand All @@ -186,21 +186,23 @@ mod tests {
[ 1., -1.],
];

let face =
Face::unbound(services.objects.surfaces.xy_plane(), &mut services)
.update_region(|region| {
region
.update_exterior(|_| {
Cycle::polygon(exterior_points, &mut services)
.insert(&mut services)
})
.add_interiors([Cycle::polygon(
interior_points,
&mut services,
)
.insert(&mut services)])
.insert(&mut services)
});
let face = Face::unbound(
core.services.objects.surfaces.xy_plane(),
&mut core.services,
)
.update_region(|region| {
region
.update_exterior(|_| {
Cycle::polygon(exterior_points, &mut core.services)
.insert(&mut core.services)
})
.add_interiors([Cycle::polygon(
interior_points,
&mut core.services,
)
.insert(&mut core.services)])
.insert(&mut core.services)
});

let expected =
CurveFaceIntersection::from_intervals([[[1.], [2.]], [[4.], [5.]]]);
Expand Down
30 changes: 15 additions & 15 deletions crates/fj-core/src/algorithms/intersect/face_face.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,14 @@ mod tests {
insert::Insert,
update::{UpdateFace, UpdateRegion},
},
services::Services,
Instance,
};

use super::FaceFaceIntersection;

#[test]
fn compute_no_intersection() {
let mut services = Services::new();
let mut core = Instance::new();

#[rustfmt::skip]
let points = [
Expand All @@ -86,17 +86,17 @@ mod tests {
[1., 2.],
];
let [a, b] = [
services.objects.surfaces.xy_plane(),
services.objects.surfaces.xz_plane(),
core.services.objects.surfaces.xy_plane(),
core.services.objects.surfaces.xz_plane(),
]
.map(|surface| {
Face::unbound(surface, &mut services).update_region(|region| {
Face::unbound(surface, &mut core.services).update_region(|region| {
region
.update_exterior(|_| {
Cycle::polygon(points, &mut services)
.insert(&mut services)
Cycle::polygon(points, &mut core.services)
.insert(&mut core.services)
})
.insert(&mut services)
.insert(&mut core.services)
})
});

Expand All @@ -106,7 +106,7 @@ mod tests {

#[test]
fn compute_one_intersection() {
let mut services = Services::new();
let mut core = Instance::new();

#[rustfmt::skip]
let points = [
Expand All @@ -116,17 +116,17 @@ mod tests {
[-1., 1.],
];
let surfaces = [
services.objects.surfaces.xy_plane(),
services.objects.surfaces.xz_plane(),
core.services.objects.surfaces.xy_plane(),
core.services.objects.surfaces.xz_plane(),
];
let [a, b] = surfaces.clone().map(|surface| {
Face::unbound(surface, &mut services).update_region(|region| {
Face::unbound(surface, &mut core.services).update_region(|region| {
region
.update_exterior(|_| {
Cycle::polygon(points, &mut services)
.insert(&mut services)
Cycle::polygon(points, &mut core.services)
.insert(&mut core.services)
})
.insert(&mut services)
.insert(&mut core.services)
})
});

Expand Down
Loading