Add constructors for RegularPolygon and Circle

bevyengine · Mar 2, 2022 · 4b68753 · 4b68753
1 parent f9d62b7
commit 4b68753
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 14 deletions.
diff --git a/crates/bevy_render/src/mesh/shape/regular_polygon.rs b/crates/bevy_render/src/mesh/shape/regular_polygon.rs
@@ -9,6 +9,7 @@ pub struct RegularPolygon {
     /// Number of sides.
     pub sides: usize,
 }
+
 impl Default for RegularPolygon {
     fn default() -> Self {
         Self {
@@ -18,6 +19,13 @@ impl Default for RegularPolygon {
     }
 }
 
+impl RegularPolygon {
+    // Creates a regular polygon in the xy plane
+    pub fn new(radius: f32, sides: usize) -> Self {
+        Self { radius, sides }
+    }
+}
+
 impl From<RegularPolygon> for Mesh {
     fn from(polygon: RegularPolygon) -> Self {
         let RegularPolygon { radius, sides } = polygon;
@@ -66,6 +74,16 @@ impl Default for Circle {
     }
 }
 
+impl Circle {
+    /// Creates a circle in the xy plane
+    pub fn new(radius: f32) -> Self {
+        return Self {
+            radius,
+            ..Default::default()
+        };
+    }
+}
+
 impl From<Circle> for RegularPolygon {
     fn from(circle: Circle) -> Self {
         Self {

diff --git a/examples/2d/shapes.rs b/examples/2d/shapes.rs
@@ -26,27 +26,18 @@ fn setup(
 
     // Circle
     commands.spawn_bundle(MaterialMesh2dBundle {
-        mesh: meshes.add(shape::Circle::default().into()).into(),
+        mesh: meshes.add(shape::Circle::new(50.).into()).into(),
         material: materials.add(ColorMaterial::from(Color::PURPLE)),
-        transform: Transform::from_translation(Vec3::new(-100., 0., 0.))
-            .with_scale(Vec2::splat(100.0).extend(1.)),
+        transform: Transform::from_translation(Vec3::new(-100., 0., 0.)),
+
         ..default()
     });
 
     // Hexagon
     commands.spawn_bundle(MaterialMesh2dBundle {
-        mesh: meshes
-            .add(
-                shape::RegularPolygon {
-                    sides: 6,
-                    ..default()
-                }
-                .into(),
-            )
-            .into(),
+        mesh: meshes.add(shape::RegularPolygon::new(50., 6).into()).into(),
         material: materials.add(ColorMaterial::from(Color::TURQUOISE)),
-        transform: Transform::from_translation(Vec3::new(100., 0., 0.))
-            .with_scale(Vec2::splat(100.0).extend(1.)),
+        transform: Transform::from_translation(Vec3::new(100., 0., 0.)),
         ..default()
     });
 }