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.

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

Implement Meshable for some 3D primitives #11688

Merged
merged 7 commits into from
Feb 6, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
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
56 changes: 56 additions & 0 deletions crates/bevy_math/src/primitives/dim3.rs
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,13 @@ pub struct Sphere {
}
impl Primitive3d for Sphere {}

impl Default for Sphere {
Jondolf marked this conversation as resolved.
Show resolved Hide resolved
/// Returns the default [`Sphere`] with a radius of `0.5`.
fn default() -> Self {
Self { radius: 0.5 }
}
}

impl Sphere {
/// Create a new [`Sphere`] from a `radius`
#[inline(always)]
Expand Down Expand Up @@ -210,6 +217,15 @@ pub struct Plane3d {
}
impl Primitive3d for Plane3d {}

impl Default for Plane3d {
/// Returns the default [`Plane3d`] with a normal pointing in the `+Y` direction.
fn default() -> Self {
Self {
normal: Direction3d::Y,
}
}
}

impl Plane3d {
/// Create a new `Plane3d` from a normal
///
Expand Down Expand Up @@ -374,6 +390,15 @@ pub struct Cuboid {
}
impl Primitive3d for Cuboid {}

impl Default for Cuboid {
/// Returns the default [`Cuboid`] with a width, height, and depth of `1.0`.
fn default() -> Self {
Self {
half_size: Vec3::splat(0.5),
}
}
}

impl Cuboid {
/// Create a new `Cuboid` from a full x, y, and z length
#[inline(always)]
Expand Down Expand Up @@ -439,6 +464,16 @@ pub struct Cylinder {
}
impl Primitive3d for Cylinder {}

impl Default for Cylinder {
/// Returns the default [`Cylinder`] with a radius of `0.5` and a height of `1.0`.
fn default() -> Self {
Self {
radius: 0.5,
half_height: 0.5,
}
}
}

impl Cylinder {
/// Create a new `Cylinder` from a radius and full height
#[inline(always)]
Expand Down Expand Up @@ -496,6 +531,17 @@ pub struct Capsule3d {
}
impl Primitive3d for Capsule3d {}

impl Default for Capsule3d {
/// Returns the default [`Capsule3d`] with a radius of `0.5` and a segment length of `1.0`.
/// The total height is `2.0`.
fn default() -> Self {
Self {
radius: 0.5,
half_length: 0.5,
}
}
}

impl Capsule3d {
/// Create a new `Capsule3d` from a radius and length
pub fn new(radius: f32, length: f32) -> Self {
Expand Down Expand Up @@ -636,6 +682,16 @@ pub struct Torus {
}
impl Primitive3d for Torus {}

impl Default for Torus {
/// Returns the default [`Torus`] with a minor radius of `0.25` and a major radius of `0.75`.
fn default() -> Self {
Self {
minor_radius: 0.25,
major_radius: 0.75,
}
}
}

impl Torus {
/// Create a new `Torus` from an inner and outer radius.
///
Expand Down
Loading