rei-mirrors/Fornjot
1
0
Fork 0
mirror of https://github.com/hannobraun/Fornjot synced 2025-05-23 03:01:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2143 from hannobraun/models

Browse Source 
Clean up code of models
This commit is contained in:
Hanno Braun 2023-12-15 13:47:17 +01:00 committed by GitHub
commit d882a63b2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 57 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -2989,6 +2989,7 @@ dependencies = [
name = "split"
version = "0.1.0"
dependencies = [
"cuboid",
"fj",
]

32
models/cuboid/src/lib.rs
View File

@ -19,22 +19,22 @@ pub fn model(
) -> Handle<Solid> {
let [x, y, z] = size.into().components;
let sketch = Sketch::empty().add_region(
Region::polygon(
[
[-x / 2., -y / 2.],
[x / 2., -y / 2.],
[x / 2., y / 2.],
[-x / 2., y / 2.],
],
services,
)
.insert(services),
);
let bottom_surface = services.objects.surfaces.xy_plane();
let sweep_path = Vector::from([Scalar::ZERO, Scalar::ZERO, z]);
let surface = services.objects.surfaces.xy_plane();
let path = Vector::from([Scalar::ZERO, Scalar::ZERO, z]);
sketch
.sweep_sketch(surface, path, services)
Sketch::empty()
.add_region(
Region::polygon(
[
[-x / 2., -y / 2.],
[x / 2., -y / 2.],
[x / 2., y / 2.],
[-x / 2., y / 2.],
],
services,
)
.insert(services),
)
.sweep_sketch(bottom_surface, sweep_path, services)
.insert(services)
}

2
models/holes/src/lib.rs
View File

@ -22,7 +22,7 @@ pub fn model(
let cuboid = cuboid::model([size * 2., size, size], services);
cuboid
.update_shell(cuboid.shells().first(), |shell| {
.update_shell(cuboid.shells().only(), |shell| {
let bottom_face = shell.faces().first();
let offset = size / 2.;
let depth = size / 2.;

24
models/spacer/src/lib.rs
View File

@ -20,17 +20,21 @@ pub fn model(
height: f64,
services: &mut Services,
) -> Handle<Solid> {
let sketch = Sketch::empty().add_region(
Region::circle(Point::origin(), outer, services)
.add_interiors([Cycle::circle(Point::origin(), inner, services)
let bottom_surface = services.objects.surfaces.xy_plane();
let sweep_path = Vector::from([0., 0., height]);
Sketch::empty()
.add_region(
Region::circle(Point::origin(), outer, services)
.add_interiors([Cycle::circle(
Point::origin(),
inner,
services,
)
.reverse(services)
.insert(services)])
.insert(services),
);
let surface = services.objects.surfaces.xy_plane();
let path = Vector::from([0., 0., height]);
sketch
.sweep_sketch(surface, path, services)
.insert(services),
)
.sweep_sketch(bottom_surface, sweep_path, services)
.insert(services)
}

4
models/split/Cargo.toml
View File

@ -3,5 +3,9 @@ name = "split"
version = "0.1.0"
edition = "2021"
[dependencies.fj]
path = "../../crates/fj"
[dependencies.cuboid]
path = "../cuboid"

41
models/split/src/lib.rs
View File

@ -1,17 +1,11 @@
use fj::{
core::{
objects::{Region, Sketch, Solid},
operations::{
build::{BuildRegion, BuildSketch},
insert::Insert,
split::SplitFace,
sweep::{SweepFaceOfShell, SweepSketch},
update::{UpdateSketch, UpdateSolid},
},
services::Services,
storage::Handle,
use fj::core::{
objects::Solid,
operations::{
insert::Insert, split::SplitFace, sweep::SweepFaceOfShell,
update::UpdateSolid,
},
math::Vector,
services::Services,
storage::Handle,
};
pub fn model(
@ -19,25 +13,10 @@ pub fn model(
split_pos: f64,
services: &mut Services,
) -> Handle<Solid> {
let sketch = Sketch::empty().add_region(
Region::polygon(
[
[-size / 2., -size / 2.],
[size / 2., -size / 2.],
[size / 2., size / 2.],
[-size / 2., size / 2.],
],
services,
)
.insert(services),
);
let cuboid = cuboid::model([size, size, size], services);
let surface = services.objects.surfaces.xy_plane();
let path = Vector::from([0., 0., size]);
let solid = sketch.sweep_sketch(surface, path, services);
solid
.update_shell(solid.shells().only(), |shell| {
cuboid
.update_shell(cuboid.shells().only(), |shell| {
let face = shell.faces().first();
let cycle = face.region().exterior();

22
models/star/src/lib.rs
View File

@ -43,17 +43,17 @@ pub fn model(
inner_points.push([x / 2., y / 2.]);
}
let sketch = Sketch::empty().add_region(
Region::polygon(outer_points, services)
.add_interiors([Cycle::polygon(inner_points, services)
.reverse(services)
.insert(services)])
.insert(services),
);
let bottom_surface = services.objects.surfaces.xy_plane();
let sweep_path = Vector::from([0., 0., h]);
let surface = services.objects.surfaces.xy_plane();
let path = Vector::from([0., 0., h]);
sketch
.sweep_sketch(surface, path, services)
Sketch::empty()
.add_region(
Region::polygon(outer_points, services)
.add_interiors([Cycle::polygon(inner_points, services)
.reverse(services)
.insert(services)])
.insert(services),
)
.sweep_sketch(bottom_surface, sweep_path, services)
.insert(services)
}