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

Move fj::Group within the file

Browse Source 
This way, the types in the file are alphabetically sorted again, which
makes things easier to find.
This commit is contained in:
Hanno Braun 2022-03-16 15:32:05 +01:00
parent dbae52a811
commit e632bd55ca
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
fj/src/shape_3d.rs
View File

@ -20,6 +20,36 @@ impl From<Shape3d> for Shape {
} }
} }
/// A group of two 3-dimensional shapes
///
/// A group is a collection of disjoint shapes. It is not a union, in that the
/// shapes in the group are not allowed to touch or overlap.
///
/// # Limitations
///
/// Whether the shapes in the group touch or overlap is not currently checked.
#[derive(Clone, Debug)]
#[repr(C)]
pub struct Group {
/// The first of the shapes
pub a: Shape3d,
/// The second of the shapes
pub b: Shape3d,
}
impl From<Group> for Shape {
fn from(shape: Group) -> Self {
Self::Shape3d(Shape3d::Union(Box::new(shape)))
}
}
impl From<Group> for Shape3d {
fn from(shape: Group) -> Self {
Self::Union(Box::new(shape))
}
}
/// A transformed 3-dimensional shape /// A transformed 3-dimensional shape
/// ///
/// # Limitations /// # Limitations
@ -97,33 +127,3 @@ impl From<Sweep> for Shape3d {
Self::Sweep(shape) Self::Sweep(shape)
} }
} }
/// A group of two 3-dimensional shapes
///
/// A group is a collection of disjoint shapes. It is not a union, in that the
/// shapes in the group are not allowed to touch or overlap.
///
/// # Limitations
///
/// Whether the shapes in the group touch or overlap is not currently checked.
#[derive(Clone, Debug)]
#[repr(C)]
pub struct Group {
/// The first of the shapes
pub a: Shape3d,
/// The second of the shapes
pub b: Shape3d,
}
impl From<Group> for Shape {
fn from(shape: Group) -> Self {
Self::Shape3d(Shape3d::Union(Box::new(shape)))
}
}
impl From<Group> for Shape3d {
fn from(shape: Group) -> Self {
Self::Union(Box::new(shape))
}
}