Mesh creation from primitive shapes

crates/bevy_math/src/primitives/dim2.rs

@@ -66,6 +66,12 @@ pub struct Circle {
 }
 impl Primitive2d for Circle {}
 
+impl Default for Circle {
+    fn default() -> Self {
+        Self { radius: 0.5 }
+    }
+}
+
 /// An ellipse primitive
 #[derive(Clone, Copy, Debug)]
 pub struct Ellipse {
@@ -76,6 +82,15 @@ pub struct Ellipse {
 }
 impl Primitive2d for Ellipse {}
 
+impl Default for Ellipse {
+    fn default() -> Self {
+        Self {
+            half_width: 1.0,
+            half_height: 0.5,
+        }
+    }
+}
+
 impl Ellipse {
     /// Create a new `Ellipse` from a "width" and a "height"
     pub fn new(width: f32, height: f32) -> Self {
@@ -95,6 +110,14 @@ pub struct Plane2d {
 }
 impl Primitive2d for Plane2d {}
 
+impl Default for Plane2d {
+    fn default() -> Self {
+        Self {
+            normal: Direction2d::from_normalized(Vec2::Y),
+        }
+    }
+}
+
 impl Plane2d {
     /// Create a new `Plane2d` from a normal
     ///
@@ -220,16 +243,24 @@ impl BoxedPolyline2d {
 }
 
 /// A triangle in 2D space
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, PartialEq)]
 pub struct Triangle2d {
     /// The vertices of the triangle
     pub vertices: [Vec2; 3],
 }
 impl Primitive2d for Triangle2d {}
 
+impl Default for Triangle2d {
+    fn default() -> Self {
+        Self {
+            vertices: [Vec2::Y * 0.5, Vec2::new(-0.5, -0.5), Vec2::new(0.5, -0.5)],
+        }
+    }
+}
+
 impl Triangle2d {
     /// Create a new `Triangle2d` from points `a`, `b`, and `c`
-    pub fn new(a: Vec2, b: Vec2, c: Vec2) -> Self {
+    pub const fn new(a: Vec2, b: Vec2, c: Vec2) -> Self {
         Self {
             vertices: [a, b, c],
         }
@@ -267,6 +298,15 @@ pub struct Rectangle {
 }
 impl Primitive2d for Rectangle {}
 
+impl Default for Rectangle {
+    fn default() -> Self {
+        Self {
+            half_width: 0.5,
+            half_height: 0.5,
+        }
+    }
+}
+
 impl Rectangle {
     /// Create a rectangle from a full width and height
     pub fn new(width: f32, height: f32) -> Self {
@@ -347,18 +387,27 @@ pub struct RegularPolygon {
 }
 impl Primitive2d for RegularPolygon {}
 
+impl Default for RegularPolygon {
+    fn default() -> Self {
+        Self {
+            circumcircle: Circle { radius: 0.5 },
+            sides: 6,
+        }
+    }
+}
+
 impl RegularPolygon {
     /// Create a new `RegularPolygon`
-    /// from the radius of the circumcircle and number of sides
+    /// from the radius of the circumcircle and a number of sides
     ///
     /// # Panics
     ///
-    /// Panics if `circumcircle_radius` is non-positive
-    pub fn new(circumcircle_radius: f32, sides: usize) -> Self {
-        assert!(circumcircle_radius > 0.0);
+    /// Panics if `circumradius` is non-positive
+    pub fn new(circumradius: f32, sides: usize) -> Self {
+        assert!(circumradius > 0.0);
         Self {
             circumcircle: Circle {
-                radius: circumcircle_radius,
+                radius: circumradius,
             },
             sides,
         }

crates/bevy_math/src/primitives/dim3.rs

@@ -66,6 +66,12 @@ pub struct Sphere {
 }
 impl Primitive3d for Sphere {}
 
+impl Default for Sphere {
+    fn default() -> Self {
+        Self { radius: 0.5 }
+    }
+}
+
 /// An unbounded plane in 3D space. It forms a separating surface through the origin,
 /// stretching infinitely far
 #[derive(Clone, Copy, Debug)]
@@ -75,6 +81,14 @@ pub struct Plane3d {
 }
 impl Primitive3d for Plane3d {}
 
+impl Default for Plane3d {
+    fn default() -> Self {
+        Self {
+            normal: Direction3d::from_normalized(Vec3::Y),
+        }
+    }
+}
+
 impl Plane3d {
     /// Create a new `Plane3d` from a normal
     ///
@@ -206,6 +220,14 @@ pub struct Cuboid {
 }
 impl Primitive3d for Cuboid {}
 
+impl Default for Cuboid {
+    fn default() -> Self {
+        Self {
+            half_extents: Vec3::splat(0.5),
+        }
+    }
+}
+
 impl Cuboid {
     /// Create a cuboid from a full x, y, and z length
     pub fn new(x_length: f32, y_length: f32, z_length: f32) -> Self {
@@ -230,6 +252,15 @@ pub struct Cylinder {
 }
 impl Primitive3d for Cylinder {}
 
+impl Default for Cylinder {
+    fn default() -> Self {
+        Self {
+            radius: 0.5,
+            half_height: 0.5,
+        }
+    }
+}
+
 impl Cylinder {
     /// Create a cylinder from a radius and full height
     pub fn new(radius: f32, height: f32) -> Self {
@@ -252,6 +283,15 @@ pub struct Capsule {
 impl super::Primitive2d for Capsule {}
 impl Primitive3d for Capsule {}
 
+impl Default for Capsule {
+    fn default() -> Self {
+        Self {
+            radius: 0.5,
+            half_length: 0.5,
+        }
+    }
+}
+
 impl Capsule {
     /// Create a new `Capsule` from a radius and length
     pub fn new(radius: f32, length: f32) -> Self {
@@ -272,6 +312,15 @@ pub struct Cone {
 }
 impl Primitive3d for Cone {}
 
+impl Default for Cone {
+    fn default() -> Self {
+        Self {
+            radius: 0.5,
+            height: 1.0,
+        }
+    }
+}
+
 /// A conical frustum primitive.
 /// A conical frustum can be created
 /// by slicing off a section of a cone.
@@ -286,6 +335,18 @@ pub struct ConicalFrustum {
 }
 impl Primitive3d for ConicalFrustum {}
 
+impl Default for ConicalFrustum {
+    fn default() -> Self {
+        Self {
+            // This produces the same shape as the default Cone,
+            // but trancated to half the height.
+            radius_top: 0.25,
+            radius_bottom: 0.5,
+            height: 0.5,
+        }
+    }
+}
+
 /// The type of torus determined by the minor and major radii
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum TorusKind {
@@ -320,6 +381,15 @@ pub struct Torus {
 }
 impl Primitive3d for Torus {}
 
+impl Default for Torus {
+    fn default() -> Self {
+        Self {
+            minor_radius: 0.25,
+            major_radius: 0.75,
+        }
+    }
+}
+
 impl Torus {
     /// Create a new `Torus` from an inner and outer radius.
     ///

crates/bevy_render/src/lib.rs

@@ -29,7 +29,7 @@ pub mod prelude {
     pub use crate::{
         camera::{Camera, OrthographicProjection, PerspectiveProjection, Projection},
         color::Color,
-        mesh::{morph::MorphWeights, shape, Mesh},
+        mesh::{morph::MorphWeights, shape, shape::*, Mesh},
         render_resource::Shader,
         spatial_bundle::SpatialBundle,
         texture::{Image, ImagePlugin},

crates/bevy_render/src/mesh/mod.rs

@@ -1,7 +1,6 @@
 #[allow(clippy::module_inception)]
 mod mesh;
 pub mod morph;
-/// Generation for some primitive shape meshes.
 pub mod shape;
 
 pub use mesh::*;