clean up From<Primitives> for Mesh

Author: robtfm

crates/bevy_math/src/primitives/dim2.rs

@@ -1956,7 +1956,7 @@ impl From<ConvexPolygon> for Polygon {
 )]
 pub struct ConvexPolygon {
     /// The vertices of the [`ConvexPolygon`].
-    vertices: Vec<Vec2>,
+    pub vertices: Vec<Vec2>,
 }
 
 #[cfg(feature = "alloc")]

crates/bevy_mesh/src/primitives/dim2.rs

@@ -81,20 +81,14 @@ impl Extrudable for CircleMeshBuilder {
 impl Meshable for Circle {
     type Output = CircleMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
+    fn mesh(self) -> Self::Output {
         CircleMeshBuilder {
-            circle: *self,
+            circle: self,
             ..Default::default()
         }
     }
 }
 
-impl From<Circle> for Mesh {
-    fn from(circle: Circle) -> Self {
-        circle.mesh().build()
-    }
-}
-
 /// Specifies how to generate UV-mappings for the [`CircularSector`] and [`CircularSegment`] shapes.
 ///
 /// Currently the only variant is `Mask`, which is good for showing a portion of a texture that includes
@@ -243,23 +237,14 @@ impl Extrudable for CircularSectorMeshBuilder {
 impl Meshable for CircularSector {
     type Output = CircularSectorMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
+    fn mesh(self) -> Self::Output {
         CircularSectorMeshBuilder {
-            sector: *self,
+            sector: self,
             ..Default::default()
         }
     }
 }
 
-impl From<CircularSector> for Mesh {
-    /// Converts this sector into a [`Mesh`] using a default [`CircularSectorMeshBuilder`].
-    ///
-    /// See the documentation of [`CircularSectorMeshBuilder`] for more details.
-    fn from(sector: CircularSector) -> Self {
-        sector.mesh().build()
-    }
-}
-
 /// A builder used for creating a [`Mesh`] with a [`CircularSegment`] shape.
 ///
 /// The resulting mesh will have a UV-map such that the center of the circle is
@@ -390,23 +375,14 @@ impl Extrudable for CircularSegmentMeshBuilder {
 impl Meshable for CircularSegment {
     type Output = CircularSegmentMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
+    fn mesh(self) -> Self::Output {
         CircularSegmentMeshBuilder {
-            segment: *self,
+            segment: self,
             ..Default::default()
         }
     }
 }
 
-impl From<CircularSegment> for Mesh {
-    /// Converts this sector into a [`Mesh`] using a default [`CircularSegmentMeshBuilder`].
-    ///
-    /// See the documentation of [`CircularSegmentMeshBuilder`] for more details.
-    fn from(segment: CircularSegment) -> Self {
-        segment.mesh().build()
-    }
-}
-
 /// A builder used for creating a [`Mesh`] with a [`ConvexPolygon`] shape.
 ///
 /// You must verify that the `vertices` are not concave when constructing this type. You can
@@ -420,9 +396,9 @@ pub struct ConvexPolygonMeshBuilder {
 impl Meshable for ConvexPolygon {
     type Output = ConvexPolygonMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
+    fn mesh(self) -> Self::Output {
         Self::Output {
-            vertices: self.vertices().to_vec(),
+            vertices: self.vertices,
         }
     }
 }
@@ -456,12 +432,6 @@ impl Extrudable for ConvexPolygonMeshBuilder {
     }
 }
 
-impl From<ConvexPolygon> for Mesh {
-    fn from(polygon: ConvexPolygon) -> Self {
-        polygon.mesh().build()
-    }
-}
-
 /// A builder used for creating a [`Mesh`] with a [`RegularPolygon`] shape.
 #[derive(Clone, Copy, Debug, Reflect)]
 #[reflect(Default, Debug, Clone)]
@@ -504,7 +474,7 @@ impl RegularPolygonMeshBuilder {
 impl Meshable for RegularPolygon {
     type Output = RegularPolygonMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
+    fn mesh(self) -> Self::Output {
         Self::Output {
             circumradius: self.circumcircle.radius,
             sides: self.sides,
@@ -530,12 +500,6 @@ impl Extrudable for RegularPolygonMeshBuilder {
     }
 }
 
-impl From<RegularPolygon> for Mesh {
-    fn from(polygon: RegularPolygon) -> Self {
-        polygon.mesh().build()
-    }
-}
-
 /// A builder used for creating a [`Mesh`] with an [`Ellipse`] shape.
 #[derive(Clone, Copy, Debug, Reflect)]
 #[reflect(Default, Debug, Clone)]
@@ -627,20 +591,14 @@ impl Extrudable for EllipseMeshBuilder {
 impl Meshable for Ellipse {
     type Output = EllipseMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
+    fn mesh(self) -> Self::Output {
         EllipseMeshBuilder {
-            ellipse: *self,
+            ellipse: self,
             ..Default::default()
         }
     }
 }
 
-impl From<Ellipse> for Mesh {
-    fn from(ellipse: Ellipse) -> Self {
-        ellipse.mesh().build()
-    }
-}
-
 /// A builder used for creating a [`Mesh`] with a [`Segment2d`].
 pub struct Segment2dMeshBuilder {
     /// The [`Segment2d`] shape.
@@ -669,15 +627,8 @@ impl MeshBuilder for Segment2dMeshBuilder {
 impl Meshable for Segment2d {
     type Output = Segment2dMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
-        Segment2dMeshBuilder::new(*self)
-    }
-}
-
-impl From<Segment2d> for Mesh {
-    /// Converts this segment into a [`Mesh`] using a default [`Segment2dMeshBuilder`].
-    fn from(segment: Segment2d) -> Self {
-        segment.mesh().build()
+    fn mesh(self) -> Self::Output {
+        Segment2dMeshBuilder::new(self)
     }
 }
 
@@ -712,16 +663,8 @@ impl MeshBuilder for Polyline2dMeshBuilder {
 impl Meshable for Polyline2d {
     type Output = Polyline2dMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
-        Polyline2dMeshBuilder {
-            polyline: self.clone(),
-        }
-    }
-}
-
-impl From<Polyline2d> for Mesh {
-    fn from(polyline: Polyline2d) -> Self {
-        polyline.mesh().build()
+    fn mesh(self) -> Self::Output {
+        Polyline2dMeshBuilder { polyline: self }
     }
 }
 
@@ -844,20 +787,14 @@ impl Extrudable for AnnulusMeshBuilder {
 impl Meshable for Annulus {
     type Output = AnnulusMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
+    fn mesh(self) -> Self::Output {
         AnnulusMeshBuilder {
-            annulus: *self,
+            annulus: self,
             ..Default::default()
         }
     }
 }
 
-impl From<Annulus> for Mesh {
-    fn from(annulus: Annulus) -> Self {
-        annulus.mesh().build()
-    }
-}
-
 /// A builder for creating a [`Mesh`] with an [`Rhombus`] shape.
 #[derive(Clone, Copy, Debug, Reflect)]
 #[reflect(Default, Debug, Clone)]
@@ -931,19 +868,13 @@ impl Extrudable for RhombusMeshBuilder {
 impl Meshable for Rhombus {
     type Output = RhombusMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
+    fn mesh(self) -> Self::Output {
         Self::Output {
             half_diagonals: self.half_diagonals,
         }
     }
 }
 
-impl From<Rhombus> for Mesh {
-    fn from(rhombus: Rhombus) -> Self {
-        rhombus.mesh().build()
-    }
-}
-
 /// A builder used for creating a [`Mesh`] with a [`Triangle2d`] shape.
 #[derive(Clone, Copy, Debug, Default, Reflect)]
 #[reflect(Default, Debug, Clone)]
@@ -963,8 +894,8 @@ impl Triangle2dMeshBuilder {
 impl Meshable for Triangle2d {
     type Output = Triangle2dMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
-        Self::Output { triangle: *self }
+    fn mesh(self) -> Self::Output {
+        Self::Output { triangle: self }
     }
 }
 
@@ -1015,12 +946,6 @@ impl Extrudable for Triangle2dMeshBuilder {
     }
 }
 
-impl From<Triangle2d> for Mesh {
-    fn from(triangle: Triangle2d) -> Self {
-        triangle.mesh().build()
-    }
-}
-
 /// A builder used for creating a [`Mesh`] with a [`Rectangle`] shape.
 #[derive(Clone, Copy, Debug, Reflect)]
 #[reflect(Default, Debug, Clone)]
@@ -1088,19 +1013,13 @@ impl Extrudable for RectangleMeshBuilder {
 impl Meshable for Rectangle {
     type Output = RectangleMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
+    fn mesh(self) -> Self::Output {
         RectangleMeshBuilder {
             half_size: self.half_size,
         }
     }
 }
 
-impl From<Rectangle> for Mesh {
-    fn from(rectangle: Rectangle) -> Self {
-        rectangle.mesh().build()
-    }
-}
-
 /// A builder used for creating a [`Mesh`] with a [`Capsule2d`] shape.
 #[derive(Clone, Copy, Debug, Reflect)]
 #[reflect(Default, Debug, Clone)]
@@ -1248,20 +1167,14 @@ impl Extrudable for Capsule2dMeshBuilder {
 impl Meshable for Capsule2d {
     type Output = Capsule2dMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
+    fn mesh(self) -> Self::Output {
         Capsule2dMeshBuilder {
-            capsule: *self,
+            capsule: self,
             ..Default::default()
         }
     }
 }
 
-impl From<Capsule2d> for Mesh {
-    fn from(capsule: Capsule2d) -> Self {
-        capsule.mesh().build()
-    }
-}
-
 /// A builder used for creating a [`Mesh`] with a [`Ring`] shape.
 pub struct RingMeshBuilder<P>
 where
@@ -1276,7 +1189,7 @@ where
     P: Primitive2d + Meshable,
 {
     /// Create a new `RingMeshBuilder<P>` from a given `Ring<P>` shape.
-    pub fn new(ring: &Ring<P>) -> Self {
+    pub fn new(ring: Ring<P>) -> Self {
         Self {
             outer_shape_builder: ring.outer_shape.mesh(),
             inner_shape_builder: ring.inner_shape.mesh(),
@@ -1511,20 +1424,11 @@ where
 {
     type Output = RingMeshBuilder<P>;
 
-    fn mesh(&self) -> Self::Output {
+    fn mesh(self) -> Self::Output {
         RingMeshBuilder::new(self)
     }
 }
 
-impl<P> From<Ring<P>> for Mesh
-where
-    P: Primitive2d + Meshable,
-{
-    fn from(ring: Ring<P>) -> Self {
-        ring.mesh().build()
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use bevy_math::{prelude::Annulus, primitives::RegularPolygon, FloatOrd};

crates/bevy_mesh/src/primitives/dim3/capsule.rs

@@ -421,16 +421,10 @@ impl MeshBuilder for Capsule3dMeshBuilder {
 impl Meshable for Capsule3d {
     type Output = Capsule3dMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
+    fn mesh(self) -> Self::Output {
         Capsule3dMeshBuilder {
-            capsule: *self,
+            capsule: self,
             ..Default::default()
         }
     }
 }
-
-impl From<Capsule3d> for Mesh {
-    fn from(capsule: Capsule3d) -> Self {
-        capsule.mesh().build()
-    }
-}

crates/bevy_mesh/src/primitives/dim3/cone.rs

@@ -174,20 +174,14 @@ impl MeshBuilder for ConeMeshBuilder {
 impl Meshable for Cone {
     type Output = ConeMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
+    fn mesh(self) -> Self::Output {
         ConeMeshBuilder {
-            cone: *self,
+            cone: self,
             ..Default::default()
         }
     }
 }
 
-impl From<Cone> for Mesh {
-    fn from(cone: Cone) -> Self {
-        cone.mesh().build()
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use crate::{Mesh, MeshBuilder, Meshable, VertexAttributeValues};

crates/bevy_mesh/src/primitives/dim3/conical_frustum.rs

@@ -169,16 +169,10 @@ impl MeshBuilder for ConicalFrustumMeshBuilder {
 impl Meshable for ConicalFrustum {
     type Output = ConicalFrustumMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
+    fn mesh(self) -> Self::Output {
         ConicalFrustumMeshBuilder {
-            frustum: *self,
+            frustum: self,
             ..Default::default()
         }
     }
 }
-
-impl From<ConicalFrustum> for Mesh {
-    fn from(frustum: ConicalFrustum) -> Self {
-        frustum.mesh().build()
-    }
-}