Skip to content

Update to Glam 0.30.1 and adopt nostd-libm feature #18474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ tracing = { version = "0.1", default-features = false, optional = true }
bevy_dylib = { path = "crates/bevy_dylib", version = "0.16.0-dev", default-features = false, optional = true }

[dev-dependencies]
rand = "0.8.0"
rand = "0.9.0"
rand_chacha = "0.3.1"
ron = "0.8.0"
flate2 = "1.0"
Expand Down
4 changes: 2 additions & 2 deletions benches/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ bevy_platform_support = { path = "../crates/bevy_platform_support", default-feat
] }

# Other crates
glam = "0.29"
rand = "0.8"
glam = "0.30.1"
rand = "0.9"
rand_chacha = "0.3"

# Make `bevy_render` compile on Linux with x11 windowing. x11 vs. Wayland does not matter here
Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_ecs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ concurrent-queue = { version = "2.5.0", default-features = false, features = [
] }

[dev-dependencies]
rand = "0.8"
rand = "0.9"
static_assertions = "1.1.0"
serde_test = "1.0"

Expand Down
7 changes: 4 additions & 3 deletions crates/bevy_internal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -368,10 +368,11 @@ bevy_ecs = { path = "../bevy_ecs", version = "0.16.0-dev", default-features = fa
] }
bevy_input = { path = "../bevy_input", version = "0.16.0-dev", default-features = false, features = [
"bevy_reflect",
], optional = true }
] }
bevy_math = { path = "../bevy_math", version = "0.16.0-dev", default-features = false, features = [
"bevy_reflect",
], optional = true }
"nostd-libm",
] }
bevy_platform_support = { path = "../bevy_platform_support", version = "0.16.0-dev", default-features = false, features = [
"alloc",
] }
Expand All @@ -385,7 +386,7 @@ bevy_time = { path = "../bevy_time", version = "0.16.0-dev", default-features =
bevy_transform = { path = "../bevy_transform", version = "0.16.0-dev", default-features = false, features = [
"bevy-support",
"bevy_reflect",
], optional = true }
] }
bevy_utils = { path = "../bevy_utils", version = "0.16.0-dev", default-features = false, features = [
"alloc",
] }
Expand Down
2 changes: 0 additions & 2 deletions crates/bevy_internal/src/default_plugins.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@ plugin_group! {
bevy_app:::TaskPoolPlugin,
bevy_diagnostic:::FrameCountPlugin,
bevy_time:::TimePlugin,
#[custom(cfg(any(feature = "libm", feature = "std")))]
bevy_transform:::TransformPlugin,
bevy_diagnostic:::DiagnosticsPlugin,
#[custom(cfg(any(feature = "libm", feature = "std")))]
bevy_input:::InputPlugin,
#[custom(cfg(not(feature = "bevy_window")))]
bevy_app:::ScheduleRunnerPlugin,
Expand Down
3 changes: 0 additions & 3 deletions crates/bevy_internal/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,11 @@ pub use bevy_gizmos as gizmos;
pub use bevy_gltf as gltf;
#[cfg(feature = "bevy_image")]
pub use bevy_image as image;
#[cfg(any(feature = "libm", feature = "std"))]
pub use bevy_input as input;
#[cfg(feature = "bevy_input_focus")]
pub use bevy_input_focus as input_focus;
#[cfg(feature = "bevy_log")]
pub use bevy_log as log;
#[cfg(any(feature = "libm", feature = "std"))]
pub use bevy_math as math;
#[cfg(feature = "bevy_pbr")]
pub use bevy_pbr as pbr;
Expand All @@ -70,7 +68,6 @@ pub use bevy_tasks as tasks;
#[cfg(feature = "bevy_text")]
pub use bevy_text as text;
pub use bevy_time as time;
#[cfg(any(feature = "libm", feature = "std"))]
pub use bevy_transform as transform;
#[cfg(feature = "bevy_ui")]
pub use bevy_ui as ui;
Expand Down
9 changes: 3 additions & 6 deletions crates/bevy_internal/src/prelude.rs
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
#[doc(hidden)]
pub use crate::{
app::prelude::*, ecs::prelude::*, platform_support::prelude::*, reflect::prelude::*,
time::prelude::*, utils::prelude::*, DefaultPlugins, MinimalPlugins,
app::prelude::*, ecs::prelude::*, input::prelude::*, math::prelude::*,
platform_support::prelude::*, reflect::prelude::*, time::prelude::*, transform::prelude::*,
utils::prelude::*, DefaultPlugins, MinimalPlugins,
};

#[doc(hidden)]
#[cfg(any(feature = "libm", feature = "std"))]
pub use crate::{input::prelude::*, math::prelude::*, transform::prelude::*};

#[doc(hidden)]
#[cfg(feature = "bevy_log")]
pub use crate::log::prelude::*;
Expand Down
10 changes: 6 additions & 4 deletions crates/bevy_math/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ keywords = ["bevy"]
rust-version = "1.85.0"

[dependencies]
glam = { version = "0.29", default-features = false, features = ["bytemuck"] }
glam = { version = "0.30.1", default-features = false, features = ["bytemuck"] }
thiserror = { version = "2", default-features = false }
derive_more = { version = "1", default-features = false, features = [
"from",
Expand All @@ -22,7 +22,7 @@ serde = { version = "1", default-features = false, features = [
], optional = true }
libm = { version = "0.2", optional = true }
approx = { version = "0.5", default-features = false, optional = true }
rand = { version = "0.8", default-features = false, optional = true }
rand = { version = "0.9", default-features = false, optional = true }
rand_distr = { version = "0.4.3", optional = true }
smallvec = { version = "1.11" }
bevy_reflect = { path = "../bevy_reflect", version = "0.16.0-dev", default-features = false, features = [
Expand All @@ -33,11 +33,11 @@ variadics_please = "1.1"
[dev-dependencies]
approx = "0.5"
# Supply rngs for examples and tests
rand = "0.8"
rand = "0.9"
rand_chacha = "0.3"
# Enable the approx feature when testing.
bevy_math = { path = ".", default-features = false, features = ["approx"] }
glam = { version = "0.29", default-features = false, features = ["approx"] }
glam = { version = "0.30.1", default-features = false, features = ["approx"] }

[features]
default = ["std", "rand", "curve"]
Expand Down Expand Up @@ -77,6 +77,8 @@ rand = ["dep:rand", "dep:rand_distr", "glam/rand"]
curve = []
# Enable bevy_reflect (requires alloc)
bevy_reflect = ["dep:bevy_reflect", "alloc"]
# Enable libm mathematical functions for glam types if `std` is not enabled
nostd-libm = ["dep:libm", "glam/nostd-libm"]

[lints]
workspace = true
Expand Down
20 changes: 12 additions & 8 deletions crates/bevy_math/src/ops.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// - `f32::gamma`
// - `f32::ln_gamma`

#[cfg(not(feature = "libm"))]
#[cfg(all(not(feature = "libm"), feature = "std"))]
#[expect(
clippy::disallowed_methods,
reason = "Many of the disallowed methods are disallowed to force code to use the feature-conditional re-exports from this module, but this module itself is exempt from that rule."
Expand Down Expand Up @@ -233,7 +233,7 @@ mod std_ops {
}
}

#[cfg(feature = "libm")]
#[cfg(any(feature = "libm", all(feature = "nostd-libm", not(feature = "std"))))]
mod libm_ops {

/// Raises a number to a floating point power.
Expand Down Expand Up @@ -448,7 +448,7 @@ mod libm_ops {
}
}

#[cfg(all(feature = "libm", not(feature = "std")))]
#[cfg(all(any(feature = "libm", feature = "nostd-libm"), not(feature = "std")))]
mod libm_ops_for_no_std {
//! Provides standardized names for [`f32`] operations which may not be
//! supported on `no_std` platforms.
Expand Down Expand Up @@ -590,20 +590,24 @@ mod std_ops_for_no_std {
}
}

#[cfg(feature = "libm")]
#[cfg(any(feature = "libm", all(feature = "nostd-libm", not(feature = "std"))))]
pub use libm_ops::*;

#[cfg(not(feature = "libm"))]
#[cfg(all(not(feature = "libm"), feature = "std"))]
pub use std_ops::*;

#[cfg(feature = "std")]
pub use std_ops_for_no_std::*;

#[cfg(all(feature = "libm", not(feature = "std")))]
#[cfg(all(any(feature = "libm", feature = "nostd-libm"), not(feature = "std")))]
pub use libm_ops_for_no_std::*;

#[cfg(all(not(feature = "libm"), not(feature = "std")))]
compile_error!("Either the `libm` feature or the `std` feature must be enabled.");
#[cfg(all(
not(feature = "nostd-libm"),
not(feature = "libm"),
not(feature = "std")
))]
compile_error!("Either the `libm`, `std`, or `nostd-libm` feature must be enabled.");

/// This extension trait covers shortfall in determinacy from the lack of a `libm` counterpart
/// to `f32::powi`. Use this for the common small exponents.
Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_mikktspace/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ std = ["glam/std"]
libm = ["glam/libm", "dep:libm"]

[dependencies]
glam = { version = "0.29.0", default-features = false }
glam = { version = "0.30.1", default-features = false }
libm = { version = "0.2", default-features = false, optional = true }

[[example]]
Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_reflect/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ derive_more = { version = "1", default-features = false, features = ["from"] }
serde = { version = "1", default-features = false, features = ["alloc"] }
assert_type_match = "0.1.1"
smallvec = { version = "1.11", default-features = false, optional = true }
glam = { version = "0.29", default-features = false, features = [
glam = { version = "0.30.1", default-features = false, features = [
"serde",
], optional = true }
petgraph = { version = "0.7", features = ["serde-1"], optional = true }
Expand Down
Loading