diff --git a/benches/benches/bevy_math/bezier.rs b/benches/benches/bevy_math/bezier.rs index 69590aa804..4728d2b058 100644 --- a/benches/benches/bevy_math/bezier.rs +++ b/benches/benches/bevy_math/bezier.rs @@ -1,6 +1,6 @@ use criterion::{black_box, criterion_group, criterion_main, Criterion}; -use bevy_math::{prelude::*, *}; +use bevy_math::prelude::*; fn easing(c: &mut Criterion) { let cubic_bezier = CubicSegment::new_bezier(vec2(0.25, 0.1), vec2(0.25, 1.0)); diff --git a/crates/bevy_math/src/bounding/bounded3d/primitive_impls.rs b/crates/bevy_math/src/bounding/bounded3d/primitive_impls.rs index 3871ac0749..3eea8df3b5 100644 --- a/crates/bevy_math/src/bounding/bounded3d/primitive_impls.rs +++ b/crates/bevy_math/src/bounding/bounded3d/primitive_impls.rs @@ -1,7 +1,5 @@ //! Contains [`Bounded3d`] implementations for [geometric primitives](crate::primitives). -use glam::Vec3A; - use crate::{ bounding::{Bounded2d, BoundingCircle}, ops, @@ -9,7 +7,7 @@ use crate::{ BoxedPolyline3d, Capsule3d, Cone, ConicalFrustum, Cuboid, Cylinder, InfinitePlane3d, Line3d, Polyline3d, Segment3d, Sphere, Torus, Triangle2d, Triangle3d, }, - Isometry2d, Isometry3d, Mat3, Vec2, Vec3, + Isometry2d, Isometry3d, Mat3, Vec2, Vec3, Vec3A, }; use super::{Aabb3d, Bounded3d, BoundingSphere}; diff --git a/crates/bevy_math/src/lib.rs b/crates/bevy_math/src/lib.rs index 0f6caa30cf..c1ef37e20a 100644 --- a/crates/bevy_math/src/lib.rs +++ b/crates/bevy_math/src/lib.rs @@ -58,17 +58,19 @@ pub use sampling::{FromRng, ShapeSample}; pub mod prelude { #[doc(hidden)] pub use crate::{ + bvec2, bvec3, bvec3a, bvec4, bvec4a, cubic_splines::{ CubicBSpline, CubicBezier, CubicCardinalSpline, CubicCurve, CubicGenerator, CubicHermite, CubicNurbs, CubicNurbsError, CubicSegment, CyclicCubicGenerator, RationalCurve, RationalGenerator, RationalSegment, }, direction::{Dir2, Dir3, Dir3A}, - ops, + ivec2, ivec3, ivec4, mat2, mat3, mat3a, mat4, ops, primitives::*, - BVec2, BVec3, BVec4, EulerRot, FloatExt, IRect, IVec2, IVec3, IVec4, Isometry2d, - Isometry3d, Mat2, Mat3, Mat4, Quat, Ray2d, Ray3d, Rect, Rot2, StableInterpolate, URect, - UVec2, UVec3, UVec4, Vec2, Vec2Swizzles, Vec3, Vec3Swizzles, Vec4, Vec4Swizzles, + quat, uvec2, uvec3, uvec4, vec2, vec3, vec3a, vec4, BVec2, BVec3, BVec3A, BVec4, BVec4A, + EulerRot, FloatExt, IRect, IVec2, IVec3, IVec4, Isometry2d, Isometry3d, Mat2, Mat3, Mat3A, + Mat4, Quat, Ray2d, Ray3d, Rect, Rot2, StableInterpolate, URect, UVec2, UVec3, UVec4, Vec2, + Vec2Swizzles, Vec3, Vec3A, Vec3Swizzles, Vec4, Vec4Swizzles, }; #[doc(hidden)] diff --git a/examples/shader/custom_phase_item.rs b/examples/shader/custom_phase_item.rs index 088265ef4e..935204c397 100644 --- a/examples/shader/custom_phase_item.rs +++ b/examples/shader/custom_phase_item.rs @@ -13,7 +13,6 @@ use bevy::{ query::ROQueryItem, system::{lifetimeless::SRes, SystemParamItem}, }, - math::{vec3, Vec3A}, prelude::*, render::{ extract_component::{ExtractComponent, ExtractComponentPlugin}, diff --git a/examples/tools/scene_viewer/main.rs b/examples/tools/scene_viewer/main.rs index ad54ee3ec1..af8272a13b 100644 --- a/examples/tools/scene_viewer/main.rs +++ b/examples/tools/scene_viewer/main.rs @@ -8,7 +8,6 @@ //! If you want to hot reload asset changes, enable the `file_watcher` cargo feature. use bevy::{ - math::Vec3A, prelude::*, render::primitives::{Aabb, Sphere}, };