Hopefully fixed everything now

bevyengine · May 26, 2024 · 4f480ed · 4f480ed
1 parent da43104
commit 4f480ed
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 59 deletions.
diff --git a/crates/bevy_math/src/cubic_splines.rs b/crates/bevy_math/src/cubic_splines.rs
@@ -6,7 +6,7 @@ use crate::{Vec2, VectorSpace};
 
 use thiserror::Error;
 
-#[cfg(feature = "reflect")]
+#[cfg(feature = "bevy_reflect")]
 use bevy_reflect::prelude::*;
 
 /// A spline composed of a single cubic Bezier curve.
@@ -44,7 +44,11 @@ use bevy_reflect::prelude::*;
 /// let positions: Vec<_> = bezier.iter_positions(100).collect();
 /// ```
 #[derive(Clone, Debug)]
-#[cfg_attr(feature = "reflect", derive(bevy_reflect::Reflect), reflect(Debug))]
+#[cfg_attr(
+    feature = "bevy_reflect",
+    derive(bevy_reflect::Reflect),
+    reflect(Debug)
+)]
 pub struct CubicBezier<P: VectorSpace> {
     /// The control points of the Bezier curve
     pub control_points: Vec<[P; 4]>,
@@ -118,7 +122,11 @@ impl<P: VectorSpace> CubicGenerator<P> for CubicBezier<P> {
 /// let positions: Vec<_> = hermite.iter_positions(100).collect();
 /// ```
 #[derive(Clone, Debug)]
-#[cfg_attr(feature = "reflect", derive(bevy_reflect::Reflect), reflect(Debug))]
+#[cfg_attr(
+    feature = "bevy_reflect",
+    derive(bevy_reflect::Reflect),
+    reflect(Debug)
+)]
 pub struct CubicHermite<P: VectorSpace> {
     /// The control points of the Hermite curve
     pub control_points: Vec<(P, P)>,
@@ -187,7 +195,11 @@ impl<P: VectorSpace> CubicGenerator<P> for CubicHermite<P> {
 /// let positions: Vec<_> = cardinal.iter_positions(100).collect();
 /// ```
 #[derive(Clone, Debug)]
-#[cfg_attr(feature = "reflect", derive(bevy_reflect::Reflect), reflect(Debug))]
+#[cfg_attr(
+    feature = "bevy_reflect",
+    derive(bevy_reflect::Reflect),
+    reflect(Debug)
+)]
 pub struct CubicCardinalSpline<P: VectorSpace> {
     /// Tension
     pub tension: f32,
@@ -278,7 +290,11 @@ impl<P: VectorSpace> CubicGenerator<P> for CubicCardinalSpline<P> {
 /// let positions: Vec<_> = b_spline.iter_positions(100).collect();
 /// ```
 #[derive(Clone, Debug)]
-#[cfg_attr(feature = "reflect", derive(bevy_reflect::Reflect), reflect(Debug))]
+#[cfg_attr(
+    feature = "bevy_reflect",
+    derive(bevy_reflect::Reflect),
+    reflect(Debug)
+)]
 pub struct CubicBSpline<P: VectorSpace> {
     /// The control points of the spline
     pub control_points: Vec<P>,
@@ -398,7 +414,11 @@ pub enum CubicNurbsError {
 /// let positions: Vec<_> = nurbs.iter_positions(100).collect();
 /// ```
 #[derive(Clone, Debug)]
-#[cfg_attr(feature = "reflect", derive(bevy_reflect::Reflect), reflect(Debug))]
+#[cfg_attr(
+    feature = "bevy_reflect",
+    derive(bevy_reflect::Reflect),
+    reflect(Debug)
+)]
 pub struct CubicNurbs<P: VectorSpace> {
     /// The control points of the NURBS
     pub control_points: Vec<P>,
@@ -649,7 +669,7 @@ pub trait CubicGenerator<P: VectorSpace> {
 /// Segments can be chained together to form a longer compound curve.
 #[derive(Copy, Clone, Debug, Default, PartialEq)]
 #[cfg_attr(
-    feature = "reflect",
+    feature = "bevy_reflect",
     derive(bevy_reflect::Reflect),
     reflect(Debug, Default)
 )]
@@ -812,7 +832,11 @@ impl CubicSegment<Vec2> {
 /// Use any struct that implements the [`CubicGenerator`] trait to create a new curve, such as
 /// [`CubicBezier`].
 #[derive(Clone, Debug, PartialEq)]
-#[cfg_attr(feature = "reflect", derive(bevy_reflect::Reflect), reflect(Debug))]
+#[cfg_attr(
+    feature = "bevy_reflect",
+    derive(bevy_reflect::Reflect),
+    reflect(Debug)
+)]
 pub struct CubicCurve<P: VectorSpace> {
     /// Segments of the curve
     pub segments: Vec<CubicSegment<P>>,
@@ -947,7 +971,7 @@ pub trait RationalGenerator<P: VectorSpace> {
 /// Segments can be chained together to form a longer compound curve.
 #[derive(Copy, Clone, Debug, Default, PartialEq)]
 #[cfg_attr(
-    feature = "reflect",
+    feature = "bevy_reflect",
     derive(bevy_reflect::Reflect),
     reflect(Debug, Default)
 )]
@@ -1078,7 +1102,11 @@ impl<P: VectorSpace> RationalSegment<P> {
 /// Use any struct that implements the [`RationalGenerator`] trait to create a new curve, such as
 /// [`CubicNurbs`], or convert [`CubicCurve`] using `into/from`.
 #[derive(Clone, Debug, PartialEq)]
-#[cfg_attr(feature = "reflect", derive(bevy_reflect::Reflect), reflect(Debug))]
+#[cfg_attr(
+    feature = "bevy_reflect",
+    derive(bevy_reflect::Reflect),
+    reflect(Debug)
+)]
 pub struct RationalCurve<P: VectorSpace> {
     /// The segments in the curve
     pub segments: Vec<RationalSegment<P>>,

diff --git a/crates/bevy_math/src/direction.rs b/crates/bevy_math/src/direction.rs
@@ -282,12 +282,12 @@ impl approx::UlpsEq for Dir2 {
 #[derive(Clone, Copy, Debug, PartialEq)]
 #[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(
-    feature = "reflect",
+    feature = "bevy_reflect",
     derive(bevy_reflect::Reflect),
     reflect(Debug, PartialEq)
 )]
 #[cfg_attr(
-    all(feature = "serialize", feature = "reflect"),
+    all(feature = "serialize", feature = "bevy_reflect"),
     reflect(Serialize, Deserialize)
 )]
 #[doc(alias = "Direction3d")]
@@ -492,12 +492,12 @@ impl approx::UlpsEq for Dir3 {
 #[derive(Clone, Copy, Debug, PartialEq)]
 #[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(
-    feature = "reflect",
+    feature = "bevy_reflect",
     derive(bevy_reflect::Reflect),
     reflect(Debug, PartialEq)
 )]
 #[cfg_attr(
-    all(feature = "serialize", feature = "reflect"),
+    all(feature = "serialize", feature = "bevy_reflect"),
     reflect(Serialize, Deserialize)
 )]
 #[doc(alias = "Direction3dA")]

diff --git a/crates/bevy_math/src/primitives/dim2.rs b/crates/bevy_math/src/primitives/dim2.rs
@@ -716,12 +716,12 @@ mod arc_tests {
 #[derive(Clone, Copy, Debug, PartialEq)]
 #[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(
-    feature = "reflect",
+    feature = "bevy_reflect",
     derive(bevy_reflect::Reflect),
     reflect(Debug, PartialEq)
 )]
 #[cfg_attr(
-    all(feature = "serialize", feature = "reflect"),
+    all(feature = "serialize", feature = "bevy_reflect"),
     reflect(Serialize, Deserialize)
 )]
 pub struct Ellipse {
@@ -866,12 +866,12 @@ impl Measured2d for Ellipse {
 #[derive(Clone, Copy, Debug, PartialEq)]
 #[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(
-    feature = "reflect",
+    feature = "bevy_reflect",
     derive(bevy_reflect::Reflect),
     reflect(Debug, PartialEq)
 )]
 #[cfg_attr(
-    all(feature = "serialize", feature = "reflect"),
+    all(feature = "serialize", feature = "bevy_reflect"),
     reflect(Serialize, Deserialize)
 )]
 #[doc(alias = "Ring")]
@@ -1090,12 +1090,12 @@ impl Measured2d for Rhombus {
 #[derive(Clone, Copy, Debug, PartialEq)]
 #[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(
-    feature = "reflect",
+    feature = "bevy_reflect",
     derive(bevy_reflect::Reflect),
     reflect(Debug, PartialEq)
 )]
 #[cfg_attr(
-    all(feature = "serialize", feature = "reflect"),
+    all(feature = "serialize", feature = "bevy_reflect"),
     reflect(Serialize, Deserialize)
 )]
 pub struct Plane2d {
@@ -1131,12 +1131,12 @@ impl Plane2d {
 #[derive(Clone, Copy, Debug, PartialEq)]
 #[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(
-    feature = "reflect",
+    feature = "bevy_reflect",
     derive(bevy_reflect::Reflect),
     reflect(Debug, PartialEq)
 )]
 #[cfg_attr(
-    all(feature = "serialize", feature = "reflect"),
+    all(feature = "serialize", feature = "bevy_reflect"),
     reflect(Serialize, Deserialize)
 )]
 pub struct Line2d {
@@ -1150,12 +1150,12 @@ impl Primitive2d for Line2d {}
 #[derive(Clone, Copy, Debug, PartialEq)]
 #[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(
-    feature = "reflect",
+    feature = "bevy_reflect",
     derive(bevy_reflect::Reflect),
     reflect(Debug, PartialEq)
 )]
 #[cfg_attr(
-    all(feature = "serialize", feature = "reflect"),
+    all(feature = "serialize", feature = "bevy_reflect"),
     reflect(Serialize, Deserialize)
 )]
 #[doc(alias = "LineSegment2d")]
@@ -1214,7 +1214,7 @@ impl Segment2d {
 #[derive(Clone, Debug, PartialEq)]
 #[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(
-    feature = "reflect",
+    feature = "bevy_reflect",
     derive(bevy_reflect::Reflect),
     reflect(Debug, PartialEq)
 )]
@@ -1275,12 +1275,12 @@ impl BoxedPolyline2d {
 #[derive(Clone, Copy, Debug, PartialEq)]
 #[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(
-    feature = "reflect",
+    feature = "bevy_reflect",
     derive(bevy_reflect::Reflect),
     reflect(Debug, PartialEq)
 )]
 #[cfg_attr(
-    all(feature = "serialize", feature = "reflect"),
+    all(feature = "serialize", feature = "bevy_reflect"),
     reflect(Serialize, Deserialize)
 )]
 pub struct Triangle2d {
@@ -1446,12 +1446,12 @@ impl Measured2d for Triangle2d {
 #[derive(Clone, Copy, Debug, PartialEq)]
 #[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(
-    feature = "reflect",
+    feature = "bevy_reflect",
     derive(bevy_reflect::Reflect),
     reflect(Debug, PartialEq)
 )]
 #[cfg_attr(
-    all(feature = "serialize", feature = "reflect"),
+    all(feature = "serialize", feature = "bevy_reflect"),
     reflect(Serialize, Deserialize)
 )]
 #[doc(alias = "Quad")]
@@ -1539,7 +1539,7 @@ impl Measured2d for Rectangle {
 #[derive(Clone, Debug, PartialEq)]
 #[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(
-    feature = "reflect",
+    feature = "bevy_reflect",
     derive(bevy_reflect::Reflect),
     reflect(Debug, PartialEq)
 )]
@@ -1600,12 +1600,12 @@ impl BoxedPolygon {
 #[derive(Clone, Copy, Debug, PartialEq)]
 #[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(
-    feature = "reflect",
+    feature = "bevy_reflect",
     derive(bevy_reflect::Reflect),
     reflect(Debug, PartialEq)
 )]
 #[cfg_attr(
-    all(feature = "serialize", feature = "reflect"),
+    all(feature = "serialize", feature = "bevy_reflect"),
     reflect(Serialize, Deserialize)
 )]
 pub struct RegularPolygon {
@@ -1746,12 +1746,12 @@ impl Measured2d for RegularPolygon {
 #[derive(Clone, Copy, Debug, PartialEq)]
 #[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(
-    feature = "reflect",
+    feature = "bevy_reflect",
     derive(bevy_reflect::Reflect),
     reflect(Debug, PartialEq)
 )]
 #[cfg_attr(
-    all(feature = "serialize", feature = "reflect"),
+    all(feature = "serialize", feature = "bevy_reflect"),
     reflect(Serialize, Deserialize)
 )]
 #[doc(alias = "stadium", alias = "pill")]