Put math primitives in bevy_shapes crate

benches/benches/bevy_camera/primitives.rs

@@ -1,6 +1,6 @@
 use bevy_camera::primitives::{Aabb, Frustum, Sphere};
 use bevy_math::{
-    primitives::{HalfSpace, ViewFrustum},
+    camera::{HalfSpace, ViewFrustum},
     Affine3A, Quat, Vec3, Vec3A, Vec4,
 };
 use core::hint::black_box;

crates/bevy_camera/src/primitives.rs

@@ -4,7 +4,7 @@ use bevy_derive::{Deref, DerefMut};
 use bevy_ecs::{component::Component, entity::EntityHashMap, reflect::ReflectComponent};
 use bevy_math::{
     bounding::{Aabb3d, BoundingVolume},
-    primitives::{HalfSpace, ViewFrustum},
+    camera::{HalfSpace, ViewFrustum},
     Affine3A, Mat3A, Vec3, Vec3A,
 };
 use bevy_mesh::{Mesh, VertexAttributeValues};

crates/bevy_camera/src/projection.rs

@@ -4,9 +4,7 @@ use core::ops::{Deref, DerefMut};
 use crate::{primitives::Frustum, visibility::VisibilitySystems};
 use bevy_app::{App, Plugin, PostUpdate};
 use bevy_ecs::prelude::*;
-use bevy_math::{
-    ops, primitives::ViewFrustum, proj, vec4, AspectRatio, Mat4, Rect, Vec2, Vec3A, Vec4,
-};
+use bevy_math::{camera::ViewFrustum, ops, proj, vec4, AspectRatio, Mat4, Rect, Vec2, Vec3A, Vec4};
 use bevy_reflect::{std_traits::ReflectDefault, Reflect, ReflectDeserialize, ReflectSerialize};
 use bevy_transform::{components::GlobalTransform, TransformSystems};
 use derive_more::derive::From;

crates/bevy_gizmos/src/gizmos.rs

@@ -288,7 +288,9 @@ where
     Config: GizmoConfigGroup,
     Clear: 'static + Send + Sync,
 {
-    pub(crate) enabled: bool,
+    // needs to be public for [`bevy_shapes`]
+    /// whether or not this buffer will be rendered
+    pub enabled: bool,
     /// The positions of line segment endpoints.
     pub list_positions: Vec<Vec3>,
     /// The colors of line segment endpoints.

crates/bevy_gizmos/src/lib.rs

@@ -33,7 +33,6 @@ pub mod frustum;
 pub mod gizmos;
 mod global;
 pub mod grid;
-pub mod primitives;
 pub mod retained;
 pub mod rounded_box;
 mod simplex_stroke_font;
@@ -65,7 +64,6 @@ pub mod prelude {
         },
         gizmos::Gizmos,
         global::gizmo,
-        primitives::{dim2::GizmoPrimitive2d, dim3::GizmoPrimitive3d},
         retained::Gizmo,
         AppGizmoBuilder, GizmoAsset,
     };

crates/bevy_gizmos_render/Cargo.toml

@@ -30,6 +30,7 @@ bevy_utils = { path = "../bevy_utils", version = "0.20.0-dev" }
 bevy_core_pipeline = { path = "../bevy_core_pipeline", version = "0.20.0-dev" }
 bevy_transform = { path = "../bevy_transform", version = "0.20.0-dev" }
 bevy_reflect = { path = "../bevy_reflect", version = "0.20.0-dev" }
+bevy_shapes = { path = "../bevy_shapes", version = "0.20.0-dev", features = [ "meshing" ] }
 bevy_color = { path = "../bevy_color", version = "0.20.0-dev" }
 bevy_material = { path = "../bevy_material", version = "0.20.0-dev" }
 bevy_log = { path = "../bevy_log", version = "0.20.0-dev" }

crates/bevy_gizmos_render/src/transform_gizmo_render.rs

@@ -18,12 +18,10 @@ use bevy_ecs::{
     schedule::IntoScheduleConfigs,
     system::{Commands, Query, Res, ResMut},
 };
-use bevy_math::{
-    primitives::{Cone, Cuboid, Cylinder, Torus},
-    Quat, Vec3,
-};
-use bevy_mesh::{Mesh, Mesh3d, MeshBuilder, Meshable};
+use bevy_math::{Quat, Vec3};
+use bevy_mesh::{Mesh, Mesh3d, Meshable};
 use bevy_pbr::{MeshMaterial3d, StandardMaterial};
+use bevy_shapes::primitives::{Cone, Cuboid, Cylinder, Torus};
 use bevy_transform::{
     components::{GlobalTransform, Transform},
     systems::propagate_transforms_for,
@@ -167,36 +165,30 @@ fn spawn_gizmo_meshes(
     };
 
     // Pre-create meshes
-    let shaft_mesh = meshes.add(Cylinder::new(SHAFT_RADIUS, SHAFT_LENGTH).mesh().build());
-    let cone_mesh = meshes.add(Cone::new(CONE_RADIUS, CONE_HEIGHT).mesh().build());
-    let scale_cube_mesh = meshes.add(
-        Cuboid::new(SCALE_CUBE_SIZE, SCALE_CUBE_SIZE, SCALE_CUBE_SIZE)
-            .mesh()
-            .build(),
-    );
+    let shaft_mesh = meshes.add(Cylinder::new(SHAFT_RADIUS, SHAFT_LENGTH).mesh());
+    let cone_mesh = meshes.add(Cone::new(CONE_RADIUS, CONE_HEIGHT).mesh());
+    let scale_cube_mesh =
+        meshes.add(Cuboid::new(SCALE_CUBE_SIZE, SCALE_CUBE_SIZE, SCALE_CUBE_SIZE).mesh());
     let rotate_torus_mesh = meshes.add(
         Torus {
             minor_radius: 0.015,
             major_radius: ROTATE_RING_RADIUS,
         }
-        .mesh()
-        .build(),
+        .mesh(),
     );
     let view_circle_mesh = meshes.add(
         Torus {
             minor_radius: VIEW_CIRCLE_MINOR,
             major_radius: VIEW_CIRCLE_MAJOR,
         }
-        .mesh()
-        .build(),
+        .mesh(),
     );
     let view_ring_mesh = meshes.add(
         Torus {
             minor_radius: VIEW_RING_MINOR,
             major_radius: VIEW_RING_MAJOR,
         }
-        .mesh()
-        .build(),
+        .mesh(),
     );
 
     // Axis rotations: cylinder default is Y-up

crates/bevy_internal/Cargo.toml

@@ -127,14 +127,17 @@ shader_format_wesl = ["bevy_shader/shader_format_wesl"]
 serialize = [
   "bevy_a11y?/serialize",
   "bevy_color?/serialize",
+  "bevy_dev_tools?/serialize",
   "bevy_ecs/serialize",
   "bevy_image?/serialize",
   "bevy_input/serialize",
   "bevy_math/serialize",
+  "bevy_shapes/serialize",
   "bevy_world_serialization?/serialize",
   "bevy_time/serialize",
   "bevy_transform/serialize",
   "bevy_ui?/serialize",
+  "bevy_utils/serialize",
   "bevy_window?/serialize",
   "bevy_winit?/serialize",
   "bevy_platform/serialize",
@@ -416,6 +419,7 @@ std = [
   "bevy_input/std",
   "bevy_input_focus?/std",
   "bevy_math/std",
+  "bevy_shapes/std",
   "bevy_platform/std",
   "bevy_reflect/std",
   "bevy_state?/std",
@@ -505,6 +509,10 @@ bevy_math = { path = "../bevy_math", version = "0.20.0-dev", default-features =
   "bevy_reflect",
   "nostd-libm",
 ] }
+bevy_shapes = { path = "../bevy_shapes", version = "0.20.0-dev", default-features = false, features = [
+  "bevy_reflect",
+  "nostd-libm",
+] }
 bevy_platform = { path = "../bevy_platform", version = "0.20.0-dev", default-features = false, features = [
   "alloc",
 ] }

crates/bevy_internal/src/lib.rs

@@ -84,6 +84,7 @@ pub use bevy_scene as scene;
 pub use bevy_settings as settings;
 #[cfg(feature = "bevy_shader")]
 pub use bevy_shader as shader;
+pub use bevy_shapes as shapes;
 #[cfg(feature = "bevy_solari")]
 pub use bevy_solari as solari;
 #[cfg(feature = "bevy_sprite")]

crates/bevy_internal/src/prelude.rs

@@ -114,3 +114,6 @@ pub use crate::picking::prelude::*;
 #[doc(hidden)]
 #[cfg(feature = "bevy_clipboard")]
 pub use crate::clipboard::prelude::*;
+
+#[doc(hidden)]
+pub use crate::shapes::prelude::*;

crates/bevy_light/Cargo.toml

@@ -26,10 +26,12 @@ bevy_color = { path = "../bevy_color", version = "0.20.0-dev", features = [
 ] }
 bevy_gizmos = { path = "../bevy_gizmos", version = "0.20.0-dev", optional = true }
 bevy_log = { path = "../bevy_log", version = "0.20.0-dev" }
+bevy_shapes = { path = "../bevy_shapes", version = "0.20.0-dev", optional = true }
+bevy_gizmos = { path = "../bevy_gizmos", version = "0.20.0-dev", optional = true }
 
 # other
 tracing = { version = "0.1", default-features = false }
-wgpu-types = { version = "29.0.3", default-features = false }
+wgpu-types = { version = "30", default-features = false }
 half = "2.7.1"
 smallvec = { version = "1", default-features = false }
 
@@ -38,6 +40,7 @@ default = []
 experimental_pbr_pcss = []
 webgl = []
 webgpu = []
+bevy_gizmos = ["bevy_shapes?/gizmos", "dep:bevy_gizmos", "dep:bevy_shapes"]
 
 [lints]
 workspace = true

crates/bevy_light/src/cluster/assign.rs

@@ -11,8 +11,8 @@ use bevy_ecs::{
     system::{Local, Query, Res},
 };
 use bevy_math::{
+    camera::HalfSpace,
     ops::{self, sin_cos},
-    primitives::HalfSpace,
     Mat4, UVec3, Vec2, Vec3, Vec3A, Vec3Swizzles as _, Vec4, Vec4Swizzles as _,
 };
 use bevy_transform::components::GlobalTransform;

crates/bevy_light/src/directional_light.rs

@@ -7,7 +7,7 @@ use bevy_camera::{
 use bevy_color::Color;
 use bevy_ecs::prelude::*;
 use bevy_image::Image;
-use bevy_math::primitives::ViewFrustum;
+use bevy_math::camera::ViewFrustum;
 use bevy_reflect::prelude::*;
 use bevy_transform::components::Transform;
 use tracing::warn;

crates/bevy_light/src/gizmos.rs

@@ -2,7 +2,8 @@
 
 use core::f32::consts::PI;
 
-use bevy_gizmos::primitives::dim3::GizmoPrimitive3d;
+use bevy_shapes::gizmos::GizmoPrimitive3d;
+use bevy_shapes::primitives::{Cone, Sphere};
 
 use crate::{DirectionalLight, PointLight, RectLight, SpotLight};
 use bevy_app::{Plugin, PostUpdate};
@@ -18,11 +19,7 @@ use bevy_ecs::{
     schedule::IntoScheduleConfigs,
     system::{Query, Res},
 };
-use bevy_math::{
-    ops,
-    primitives::{Cone, Sphere},
-    Isometry3d, Quat, Vec3,
-};
+use bevy_math::{ops, Isometry3d, Quat, Vec3};
 use bevy_reflect::{std_traits::ReflectDefault, Reflect};
 use bevy_transform::{components::GlobalTransform, TransformSystems};
 

crates/bevy_light/src/point_light.rs

@@ -6,7 +6,7 @@ use bevy_camera::{
 use bevy_color::Color;
 use bevy_ecs::prelude::*;
 use bevy_image::Image;
-use bevy_math::{primitives::ViewFrustum, proj};
+use bevy_math::{camera::ViewFrustum, proj};
 use bevy_reflect::prelude::*;
 use bevy_transform::components::{GlobalTransform, Transform};
 

crates/bevy_light/src/spot_light.rs

@@ -6,7 +6,7 @@ use bevy_camera::{
 use bevy_color::Color;
 use bevy_ecs::prelude::*;
 use bevy_image::Image;
-use bevy_math::{primitives::ViewFrustum, proj, Affine3A, Dir3, Mat3, Mat4, Vec3};
+use bevy_math::{camera::ViewFrustum, proj, Affine3A, Dir3, Mat3, Mat4, Vec3};
 use bevy_reflect::prelude::*;
 use bevy_transform::components::{GlobalTransform, Transform};
 

crates/bevy_math/src/bounding/bounded2d/mod.rs

@@ -1,5 +1,3 @@
-mod primitive_impls;
-
 use super::{BoundingVolume, IntersectsVolume};
 use crate::{
     ops,
@@ -469,8 +467,6 @@ mod aabb2d_tests {
     }
 }
 
-use crate::primitives::Circle;
-
 /// A bounding circle
 #[derive(Clone, Copy, Debug, PartialEq)]
 #[cfg_attr(
@@ -486,19 +482,16 @@ use crate::primitives::Circle;
 pub struct BoundingCircle {
     /// The center of the bounding circle
     pub center: Vec2,
-    /// The circle
-    pub circle: Circle,
+    /// The radius of the circle
+    pub radius: f32,
 }
 
 impl BoundingCircle {
     /// Constructs a bounding circle from its center and radius.
     #[inline]
     pub const fn new(center: Vec2, radius: f32) -> Self {
         debug_assert!(radius >= 0.);
-        Self {
-            center,
-            circle: Circle { radius },
-        }
+        Self { center, radius }
     }
 
     /// Computes a [`BoundingCircle`] containing the given set of points,
@@ -526,7 +519,7 @@ impl BoundingCircle {
     /// Get the radius of the bounding circle
     #[inline]
     pub const fn radius(&self) -> f32 {
-        self.circle.radius
+        self.radius
     }
 
     /// Computes the smallest [`Aabb2d`] containing this [`BoundingCircle`].
@@ -544,7 +537,20 @@ impl BoundingCircle {
     /// Otherwise, it will be inside the circle and returned as is.
     #[inline]
     pub fn closest_point(&self, point: Vec2) -> Vec2 {
-        self.circle.closest_point(point - self.center) + self.center
+        let centered_point = point - self.center;
+        let distance_squared = centered_point.length_squared();
+
+        let closest_point = if distance_squared <= self.radius.squared() {
+            // The point is inside the circle.
+            point
+        } else {
+            // The point is outside the circle.
+            // Find the closest point on the perimeter of the circle.
+            let dir_to_point = point / ops::sqrt(distance_squared);
+            self.radius * dir_to_point
+        };
+
+        closest_point + self.center
     }
 }