From ee962ffd5beebe5915f6d508c65afc5ada900c2e Mon Sep 17 00:00:00 2001 From: Jacques Schutte Date: Tue, 26 Mar 2024 13:57:22 +0200 Subject: [PATCH 1/2] Move float_ord to bevy_math --- crates/{bevy_utils => bevy_math}/src/float_ord.rs | 0 crates/bevy_math/src/lib.rs | 2 ++ crates/bevy_utils/src/lib.rs | 2 -- 3 files changed, 2 insertions(+), 2 deletions(-) rename crates/{bevy_utils => bevy_math}/src/float_ord.rs (100%) diff --git a/crates/bevy_utils/src/float_ord.rs b/crates/bevy_math/src/float_ord.rs similarity index 100% rename from crates/bevy_utils/src/float_ord.rs rename to crates/bevy_math/src/float_ord.rs diff --git a/crates/bevy_math/src/lib.rs b/crates/bevy_math/src/lib.rs index 1a37c53f4e987..8b4b8cef1406a 100644 --- a/crates/bevy_math/src/lib.rs +++ b/crates/bevy_math/src/lib.rs @@ -16,6 +16,7 @@ mod aspect_ratio; pub mod bounding; pub mod cubic_splines; mod direction; +mod float_ord; pub mod primitives; mod ray; mod rects; @@ -26,6 +27,7 @@ mod shape_sampling; pub use affine3::*; pub use aspect_ratio::AspectRatio; pub use direction::*; +pub use float_ord::*; pub use ray::{Ray2d, Ray3d}; pub use rects::*; pub use rotation2d::Rotation2d; diff --git a/crates/bevy_utils/src/lib.rs b/crates/bevy_utils/src/lib.rs index eec2f08367813..04325b64fe805 100644 --- a/crates/bevy_utils/src/lib.rs +++ b/crates/bevy_utils/src/lib.rs @@ -24,7 +24,6 @@ pub mod syncunsafecell; mod cow_arc; mod default; -mod float_ord; pub mod intern; mod once; mod parallel_queue; @@ -33,7 +32,6 @@ pub use ahash::{AHasher, RandomState}; pub use bevy_utils_proc_macros::*; pub use cow_arc::*; pub use default::default; -pub use float_ord::*; pub use hashbrown; pub use parallel_queue::*; pub use tracing; From 6356a85aa8c9902055a2b9fba5daf3da4ae1bd66 Mon Sep 17 00:00:00 2001 From: Jacques Schutte Date: Tue, 26 Mar 2024 13:58:17 +0200 Subject: [PATCH 2/2] Change bevy_utils::FloatOrd to bevy_math::FloatOrd --- crates/bevy_animation/src/animatable.rs | 1 - crates/bevy_core_pipeline/src/core_2d/mod.rs | 2 +- crates/bevy_core_pipeline/src/core_3d/mod.rs | 3 ++- crates/bevy_gizmos/src/pipeline_2d.rs | 2 +- crates/bevy_pbr/src/light_probe/mod.rs | 4 ++-- crates/bevy_sprite/src/mesh2d/material.rs | 3 ++- crates/bevy_sprite/src/render/mod.rs | 4 ++-- crates/bevy_text/src/font_atlas_set.rs | 3 +-- crates/bevy_ui/src/render/mod.rs | 4 ++-- crates/bevy_ui/src/render/render_pass.rs | 2 +- crates/bevy_ui/src/render/ui_material_pipeline.rs | 4 ++-- examples/2d/mesh2d_manual.rs | 2 +- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/crates/bevy_animation/src/animatable.rs b/crates/bevy_animation/src/animatable.rs index 39de5faa2b6b6..666485a305d30 100644 --- a/crates/bevy_animation/src/animatable.rs +++ b/crates/bevy_animation/src/animatable.rs @@ -4,7 +4,6 @@ use bevy_ecs::world::World; use bevy_math::*; use bevy_reflect::Reflect; use bevy_transform::prelude::Transform; -use bevy_utils::FloatOrd; /// An individual input for [`Animatable::blend`]. pub struct BlendInput { diff --git a/crates/bevy_core_pipeline/src/core_2d/mod.rs b/crates/bevy_core_pipeline/src/core_2d/mod.rs index 5dc0a5558662b..2541e6eae5040 100644 --- a/crates/bevy_core_pipeline/src/core_2d/mod.rs +++ b/crates/bevy_core_pipeline/src/core_2d/mod.rs @@ -31,6 +31,7 @@ pub use main_pass_2d_node::*; use bevy_app::{App, Plugin}; use bevy_ecs::prelude::*; +use bevy_math::FloatOrd; use bevy_render::{ camera::Camera, extract_component::ExtractComponentPlugin, @@ -42,7 +43,6 @@ use bevy_render::{ render_resource::CachedRenderPipelineId, Extract, ExtractSchedule, Render, RenderApp, RenderSet, }; -use bevy_utils::FloatOrd; use nonmax::NonMaxU32; use crate::{tonemapping::TonemappingNode, upscaling::UpscalingNode}; diff --git a/crates/bevy_core_pipeline/src/core_3d/mod.rs b/crates/bevy_core_pipeline/src/core_3d/mod.rs index 1e6dafa4ccb7e..fe8be345ec82d 100644 --- a/crates/bevy_core_pipeline/src/core_3d/mod.rs +++ b/crates/bevy_core_pipeline/src/core_3d/mod.rs @@ -48,6 +48,7 @@ pub use main_transparent_pass_3d_node::*; use bevy_app::{App, Plugin, PostUpdate}; use bevy_ecs::prelude::*; +use bevy_math::FloatOrd; use bevy_render::{ camera::{Camera, ExtractedCamera}, extract_component::ExtractComponentPlugin, @@ -67,7 +68,7 @@ use bevy_render::{ view::{ExtractedView, ViewDepthTexture, ViewTarget}, Extract, ExtractSchedule, Render, RenderApp, RenderSet, }; -use bevy_utils::{tracing::warn, FloatOrd, HashMap}; +use bevy_utils::{tracing::warn, HashMap}; use nonmax::NonMaxU32; use crate::{ diff --git a/crates/bevy_gizmos/src/pipeline_2d.rs b/crates/bevy_gizmos/src/pipeline_2d.rs index dac53a4fc4a3e..2191e436e998e 100644 --- a/crates/bevy_gizmos/src/pipeline_2d.rs +++ b/crates/bevy_gizmos/src/pipeline_2d.rs @@ -14,6 +14,7 @@ use bevy_ecs::{ system::{Query, Res, ResMut, Resource}, world::{FromWorld, World}, }; +use bevy_math::FloatOrd; use bevy_render::{ render_asset::{prepare_assets, RenderAssets}, render_phase::{AddRenderCommand, DrawFunctions, RenderPhase, SetItemPipeline}, @@ -24,7 +25,6 @@ use bevy_render::{ }; use bevy_sprite::{Mesh2dPipeline, Mesh2dPipelineKey, SetMesh2dViewBindGroup}; use bevy_utils::tracing::error; -use bevy_utils::FloatOrd; pub struct LineGizmo2dPlugin; diff --git a/crates/bevy_pbr/src/light_probe/mod.rs b/crates/bevy_pbr/src/light_probe/mod.rs index 4cb9325a410dd..4d681f19ca9d2 100644 --- a/crates/bevy_pbr/src/light_probe/mod.rs +++ b/crates/bevy_pbr/src/light_probe/mod.rs @@ -12,7 +12,7 @@ use bevy_ecs::{ schedule::IntoSystemConfigs, system::{Commands, Local, Query, Res, ResMut, Resource}, }; -use bevy_math::{Affine3A, Mat4, Vec3A, Vec4}; +use bevy_math::{Affine3A, FloatOrd, Mat4, Vec3A, Vec4}; use bevy_reflect::{std_traits::ReflectDefault, Reflect}; use bevy_render::{ extract_instances::ExtractInstancesPlugin, @@ -26,7 +26,7 @@ use bevy_render::{ Extract, ExtractSchedule, Render, RenderApp, RenderSet, }; use bevy_transform::prelude::GlobalTransform; -use bevy_utils::{tracing::error, FloatOrd, HashMap}; +use bevy_utils::{tracing::error, HashMap}; use std::hash::Hash; use std::ops::Deref; diff --git a/crates/bevy_sprite/src/mesh2d/material.rs b/crates/bevy_sprite/src/mesh2d/material.rs index 0b4a7be28c669..9938142095cc7 100644 --- a/crates/bevy_sprite/src/mesh2d/material.rs +++ b/crates/bevy_sprite/src/mesh2d/material.rs @@ -10,6 +10,7 @@ use bevy_ecs::{ prelude::*, system::{lifetimeless::SRes, SystemParamItem}, }; +use bevy_math::FloatOrd; use bevy_render::{ mesh::{Mesh, MeshVertexBufferLayoutRef}, prelude::Image, @@ -30,7 +31,7 @@ use bevy_render::{ }; use bevy_transform::components::{GlobalTransform, Transform}; use bevy_utils::tracing::error; -use bevy_utils::{FloatOrd, HashMap, HashSet}; +use bevy_utils::{HashMap, HashSet}; use std::hash::Hash; use std::marker::PhantomData; diff --git a/crates/bevy_sprite/src/render/mod.rs b/crates/bevy_sprite/src/render/mod.rs index 2110c0ec0a591..d22c7865d3da7 100644 --- a/crates/bevy_sprite/src/render/mod.rs +++ b/crates/bevy_sprite/src/render/mod.rs @@ -15,7 +15,7 @@ use bevy_ecs::{ prelude::*, system::{lifetimeless::*, SystemParamItem, SystemState}, }; -use bevy_math::{Affine3A, Quat, Rect, Vec2, Vec4}; +use bevy_math::{Affine3A, FloatOrd, Quat, Rect, Vec2, Vec4}; use bevy_render::{ render_asset::RenderAssets, render_phase::{ @@ -37,7 +37,7 @@ use bevy_render::{ Extract, }; use bevy_transform::components::GlobalTransform; -use bevy_utils::{FloatOrd, HashMap}; +use bevy_utils::HashMap; use bytemuck::{Pod, Zeroable}; use fixedbitset::FixedBitSet; diff --git a/crates/bevy_text/src/font_atlas_set.rs b/crates/bevy_text/src/font_atlas_set.rs index 156192e690e33..25980bdf340e3 100644 --- a/crates/bevy_text/src/font_atlas_set.rs +++ b/crates/bevy_text/src/font_atlas_set.rs @@ -3,11 +3,10 @@ use ab_glyph::{GlyphId, OutlinedGlyph, Point}; use bevy_asset::{AssetEvent, AssetId}; use bevy_asset::{Assets, Handle}; use bevy_ecs::prelude::*; -use bevy_math::UVec2; +use bevy_math::{FloatOrd, UVec2}; use bevy_reflect::Reflect; use bevy_render::texture::Image; use bevy_sprite::TextureAtlasLayout; -use bevy_utils::FloatOrd; use bevy_utils::HashMap; type FontSizeKey = FloatOrd; diff --git a/crates/bevy_ui/src/render/mod.rs b/crates/bevy_ui/src/render/mod.rs index 49b3fb1ad979a..cd2d3d17ec69c 100644 --- a/crates/bevy_ui/src/render/mod.rs +++ b/crates/bevy_ui/src/render/mod.rs @@ -24,7 +24,7 @@ use bevy_app::prelude::*; use bevy_asset::{load_internal_asset, AssetEvent, AssetId, Assets, Handle}; use bevy_ecs::entity::EntityHashMap; use bevy_ecs::prelude::*; -use bevy_math::{Mat4, Rect, URect, UVec4, Vec2, Vec3, Vec3Swizzles, Vec4, Vec4Swizzles}; +use bevy_math::{FloatOrd, Mat4, Rect, URect, UVec4, Vec2, Vec3, Vec3Swizzles, Vec4, Vec4Swizzles}; use bevy_render::{ camera::Camera, render_asset::RenderAssets, @@ -40,7 +40,7 @@ use bevy_sprite::TextureAtlasLayout; #[cfg(feature = "bevy_text")] use bevy_text::{PositionedGlyph, Text, TextLayoutInfo}; use bevy_transform::components::GlobalTransform; -use bevy_utils::{FloatOrd, HashMap}; +use bevy_utils::HashMap; use bytemuck::{Pod, Zeroable}; use std::ops::Range; diff --git a/crates/bevy_ui/src/render/render_pass.rs b/crates/bevy_ui/src/render/render_pass.rs index 892186478e678..1cc0b766e6b3e 100644 --- a/crates/bevy_ui/src/render/render_pass.rs +++ b/crates/bevy_ui/src/render/render_pass.rs @@ -6,6 +6,7 @@ use bevy_ecs::{ prelude::*, system::{lifetimeless::*, SystemParamItem}, }; +use bevy_math::FloatOrd; use bevy_render::{ camera::ExtractedCamera, render_graph::*, @@ -14,7 +15,6 @@ use bevy_render::{ renderer::*, view::*, }; -use bevy_utils::FloatOrd; use nonmax::NonMaxU32; pub struct UiPassNode { diff --git a/crates/bevy_ui/src/render/ui_material_pipeline.rs b/crates/bevy_ui/src/render/ui_material_pipeline.rs index 1245cf3012f7a..7316905dd03bb 100644 --- a/crates/bevy_ui/src/render/ui_material_pipeline.rs +++ b/crates/bevy_ui/src/render/ui_material_pipeline.rs @@ -9,7 +9,7 @@ use bevy_ecs::{ system::lifetimeless::{Read, SRes}, system::*, }; -use bevy_math::{Mat4, Rect, Vec2, Vec4Swizzles}; +use bevy_math::{FloatOrd, Mat4, Rect, Vec2, Vec4Swizzles}; use bevy_render::{ extract_component::ExtractComponentPlugin, globals::{GlobalsBuffer, GlobalsUniform}, @@ -22,7 +22,7 @@ use bevy_render::{ Extract, ExtractSchedule, Render, RenderSet, }; use bevy_transform::prelude::GlobalTransform; -use bevy_utils::{FloatOrd, HashMap, HashSet}; +use bevy_utils::{HashMap, HashSet}; use bevy_window::{PrimaryWindow, Window}; use bytemuck::{Pod, Zeroable}; diff --git a/examples/2d/mesh2d_manual.rs b/examples/2d/mesh2d_manual.rs index 01f09c8f40e66..1f68d67ddf0ec 100644 --- a/examples/2d/mesh2d_manual.rs +++ b/examples/2d/mesh2d_manual.rs @@ -8,6 +8,7 @@ use bevy::{ color::palettes::basic::YELLOW, core_pipeline::core_2d::Transparent2d, + math::FloatOrd, prelude::*, render::{ mesh::{Indices, MeshVertexAttribute}, @@ -28,7 +29,6 @@ use bevy::{ Mesh2dPipelineKey, Mesh2dTransforms, MeshFlags, RenderMesh2dInstance, RenderMesh2dInstances, SetMesh2dBindGroup, SetMesh2dViewBindGroup, }, - utils::FloatOrd, }; use std::f32::consts::PI;