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

Merge pull request #1201 from hannobraun/planes

Browse Source 
Remove redundant argument from `Shape::compute_brep`
This commit is contained in:
Hanno Braun 2022-10-11 13:43:59 +02:00 committed by GitHub
commit 3de803041d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 15 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crates/fj-operations/src/difference_2d.rs
View File

@ -9,8 +9,6 @@ use fj_kernel::{
};
use fj_math::Aabb;
use crate::planes::Planes;
use super::Shape;
impl Shape for fj::Difference2d {
@ -20,7 +18,6 @@ impl Shape for fj::Difference2d {
&self,
config: &ValidationConfig,
objects: &Objects,
planes: &Planes,
debug_info: &mut DebugInfo,
) -> Result<Validated<Self::Brep>, ValidationError> {
// This method assumes that `b` is fully contained within `a`:
@ -35,9 +32,8 @@ impl Shape for fj::Difference2d {
// - https://doc.rust-lang.org/std/primitive.array.html#method.each_ref
// - https://doc.rust-lang.org/std/primitive.array.html#method.try_map
let [a, b] = self.shapes();
let [a, b] = [a, b].map(|shape| {
shape.compute_brep(config, objects, planes, debug_info)
});
let [a, b] =
[a, b].map(|shape| shape.compute_brep(config, objects, debug_info));
let [a, b] = [a?, b?];
if let Some(face) = a.face_iter().next() {

7
crates/fj-operations/src/group.rs
View File

@ -7,8 +7,6 @@ use fj_kernel::{
};
use fj_math::Aabb;
use crate::planes::Planes;
use super::Shape;
impl Shape for fj::Group {
@ -18,13 +16,12 @@ impl Shape for fj::Group {
&self,
config: &ValidationConfig,
objects: &Objects,
planes: &Planes,
debug_info: &mut DebugInfo,
) -> Result<Validated<Self::Brep>, ValidationError> {
let mut faces = Faces::new();
let a = self.a.compute_brep(config, objects, planes, debug_info)?;
let b = self.b.compute_brep(config, objects, planes, debug_info)?;
let a = self.a.compute_brep(config, objects, debug_info)?;
let b = self.b.compute_brep(config, objects, debug_info)?;
faces.extend(a.into_inner());
faces.extend(b.into_inner());

18
crates/fj-operations/src/lib.rs
View File

@ -20,13 +20,10 @@ pub mod shape_processor;
mod difference_2d;
mod group;
mod planes;
mod sketch;
mod sweep;
mod transform;
pub use self::planes::Planes;
use fj_interop::debug::DebugInfo;
use fj_kernel::{
algorithms::validate::{
@ -46,7 +43,6 @@ pub trait Shape {
&self,
config: &ValidationConfig,
objects: &Objects,
planes: &Planes,
debug_info: &mut DebugInfo,
) -> Result<Validated<Self::Brep>, ValidationError>;
@ -64,20 +60,19 @@ impl Shape for fj::Shape {
&self,
config: &ValidationConfig,
objects: &Objects,
planes: &Planes,
debug_info: &mut DebugInfo,
) -> Result<Validated<Self::Brep>, ValidationError> {
match self {
Self::Shape2d(shape) => shape
.compute_brep(config, objects, planes, debug_info)?
.compute_brep(config, objects, debug_info)?
.into_inner()
.into_faces()
.validate_with_config(config),
Self::Group(shape) => {
shape.compute_brep(config, objects, planes, debug_info)
shape.compute_brep(config, objects, debug_info)
}
Self::Sweep(shape) => shape
.compute_brep(config, objects, planes, debug_info)?
.compute_brep(config, objects, debug_info)?
.into_inner()
.into_shells()
.map(|shell| shell.into_faces())
@ -88,7 +83,7 @@ impl Shape for fj::Shape {
.unwrap_or_default()
.validate_with_config(config),
Self::Transform(shape) => {
shape.compute_brep(config, objects, planes, debug_info)
shape.compute_brep(config, objects, debug_info)
}
}
}
@ -110,15 +105,14 @@ impl Shape for fj::Shape2d {
&self,
config: &ValidationConfig,
objects: &Objects,
planes: &Planes,
debug_info: &mut DebugInfo,
) -> Result<Validated<Self::Brep>, ValidationError> {
match self {
Self::Difference(shape) => {
shape.compute_brep(config, objects, planes, debug_info)
shape.compute_brep(config, objects, debug_info)
}
Self::Sketch(shape) => {
shape.compute_brep(config, objects, planes, debug_info)
shape.compute_brep(config, objects, debug_info)
}
}
}

50
crates/fj-operations/src/planes.rs
View File

@ -1,50 +0,0 @@
use fj_kernel::{
objects::{Objects, Surface},
storage::Handle,
};
/// The static planes
///
/// Keeps [`Handle`]s to the xy-, xz- and yz-planes. The purpose of this struct
/// is to provide these handles to implementations of [`Shape`], so they don't
/// have to create a duplicate `Surface` whenever they need one of those.
///
/// [`Shape`]: crate::Shape
pub struct Planes {
xy: Handle<Surface>,
xz: Handle<Surface>,
yz: Handle<Surface>,
}
impl Planes {
/// Create a new instance of `Planes`
///
/// Please note that the whole point of this struct is to not duplicate the
/// standard planes, and creating multiple instances of it defeats that
/// point.
///
/// Create one instance of this struct, then share it everywhere it's
/// needed.
pub fn new(objects: &Objects) -> Self {
let xy = objects.surfaces.xy_plane();
let xz = objects.surfaces.xz_plane();
let yz = objects.surfaces.yz_plane();
Self { xy, xz, yz }
}
/// Access the xy-plane
pub fn xy(&self) -> Handle<Surface> {
self.xy.clone()
}
/// Access the xz-plane
pub fn xz(&self) -> Handle<Surface> {
self.xz.clone()
}
/// Access the yz-plane
pub fn yz(&self) -> Handle<Surface> {
self.yz.clone()
}
}

6
crates/fj-operations/src/shape_processor.rs
View File

@ -11,7 +11,7 @@ use fj_kernel::{
};
use fj_math::Scalar;
use crate::{planes::Planes, Shape as _};
use crate::Shape as _;
/// Processes an [`fj::Shape`] into a [`ProcessedShape`]
pub struct ShapeProcessor {
@ -44,10 +44,8 @@ impl ShapeProcessor {
let config = ValidationConfig::default();
let objects = Objects::new();
let planes = Planes::new(&objects);
let mut debug_info = DebugInfo::new();
let shape =
shape.compute_brep(&config, &objects, &planes, &mut debug_info)?;
let shape = shape.compute_brep(&config, &objects, &mut debug_info)?;
let mesh = (&shape.into_inner(), tolerance).triangulate();
Ok(ProcessedShape {

5
crates/fj-operations/src/sketch.rs
View File

@ -8,8 +8,6 @@ use fj_kernel::{
};
use fj_math::{Aabb, Point};
use crate::planes::Planes;
use super::Shape;
impl Shape for fj::Sketch {
@ -19,10 +17,9 @@ impl Shape for fj::Sketch {
&self,
config: &ValidationConfig,
objects: &Objects,
planes: &Planes,
_: &mut DebugInfo,
) -> Result<Validated<Self::Brep>, ValidationError> {
let surface = planes.xy();
let surface = objects.surfaces.xy_plane();
let face = match self.chain() {
fj::Chain::Circle(circle) => {

7
crates/fj-operations/src/sweep.rs
View File

@ -8,8 +8,6 @@ use fj_kernel::{
};
use fj_math::{Aabb, Vector};
use crate::planes::Planes;
use super::Shape;
impl Shape for fj::Sweep {
@ -19,12 +17,9 @@ impl Shape for fj::Sweep {
&self,
config: &ValidationConfig,
objects: &Objects,
planes: &Planes,
debug_info: &mut DebugInfo,
) -> Result<Validated<Self::Brep>, ValidationError> {
let sketch = self
.shape()
.compute_brep(config, objects, planes, debug_info)?;
let sketch = self.shape().compute_brep(config, objects, debug_info)?;
let path = Vector::from(self.path());
let solid = sketch.into_inner().sweep(path, objects);

5
crates/fj-operations/src/transform.rs
View File

@ -8,8 +8,6 @@ use fj_kernel::{
};
use fj_math::{Aabb, Transform, Vector};
use crate::planes::Planes;
use super::Shape;
impl Shape for fj::Transform {
@ -19,12 +17,11 @@ impl Shape for fj::Transform {
&self,
config: &ValidationConfig,
objects: &Objects,
planes: &Planes,
debug_info: &mut DebugInfo,
) -> Result<Validated<Self::Brep>, ValidationError> {
let faces = self
.shape
.compute_brep(config, objects, planes, debug_info)?
.compute_brep(config, objects, debug_info)?
.into_inner()
.transform(&make_transform(self), objects);