Skip to content

Commit f041bf6

Browse files
authored
Update to Bevy 0.16.0-rc.2 (#680)
# Objective Bevy 0.16.0-rc.2 was released, and it has some breaking changes. We need to update! ## Solution Update to Bevy 0.16.0-rc.2.
1 parent 325030e commit f041bf6

File tree

10 files changed

+22
-22
lines changed

10 files changed

+22
-22
lines changed

crates/avian2d/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ bench = false
6868

6969
[dependencies]
7070
avian_derive = { path = "../avian_derive", version = "0.2" }
71-
bevy = { version = "0.16.0-rc.1", default-features = false, features = [
71+
bevy = { version = "0.16.0-rc.2", default-features = false, features = [
7272
"std",
7373
"bevy_log",
7474
] }
75-
bevy_math = { version = "0.16.0-rc.1" }
75+
bevy_math = { version = "0.16.0-rc.2" }
7676
bevy_heavy = { git = "https://github.com/Jondolf/bevy_heavy" }
7777
bevy_transform_interpolation = { git = "https://github.com/Jondolf/bevy_transform_interpolation" }
7878
libm = { version = "0.2", optional = true }
@@ -90,7 +90,7 @@ bitflags = "2.5.0"
9090
[dev-dependencies]
9191
examples_common_2d = { path = "../examples_common_2d" }
9292
benches_common_2d = { path = "../benches_common_2d" }
93-
bevy_math = { version = "0.16.0-rc.1", features = ["approx"] }
93+
bevy_math = { version = "0.16.0-rc.2", features = ["approx"] }
9494
bevy_heavy = { git = "https://github.com/Jondolf/bevy_heavy", features = [
9595
"approx",
9696
] }

crates/avian2d/examples/one_way_platform_2d.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ struct JumpImpulse(Scalar);
4747
// Enable contact modification for one-way platforms with the `ActiveCollisionHooks` component.
4848
// Here we use required components, but you could also add it manually.
4949
#[derive(Clone, Eq, PartialEq, Debug, Default, Component)]
50-
#[require(ActiveCollisionHooks(|| ActiveCollisionHooks::MODIFY_CONTACTS))]
50+
#[require(ActiveCollisionHooks::MODIFY_CONTACTS)]
5151
pub struct OneWayPlatform(EntityHashSet);
5252

5353
/// A component to control how an actor interacts with a one-way platform.

crates/avian3d/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ bench = false
7070

7171
[dependencies]
7272
avian_derive = { path = "../avian_derive", version = "0.2" }
73-
bevy = { version = "0.16.0-rc.1", default-features = false, features = [
73+
bevy = { version = "0.16.0-rc.2", default-features = false, features = [
7474
"std",
7575
"bevy_log",
7676
] }
77-
bevy_math = { version = "0.16.0-rc.1" }
77+
bevy_math = { version = "0.16.0-rc.2" }
7878
bevy_heavy = { git = "https://github.com/Jondolf/bevy_heavy" }
7979
bevy_transform_interpolation = { git = "https://github.com/Jondolf/bevy_transform_interpolation" }
8080
libm = { version = "0.2", optional = true }
@@ -92,11 +92,11 @@ bitflags = "2.5.0"
9292
[dev-dependencies]
9393
examples_common_3d = { path = "../examples_common_3d" }
9494
benches_common_3d = { path = "../benches_common_3d" }
95-
bevy = { version = "0.16.0-rc.1", default-features = false, features = [
95+
bevy = { version = "0.16.0-rc.2", default-features = false, features = [
9696
"bevy_gltf",
9797
"animation",
9898
] }
99-
bevy_math = { version = "0.16.0-rc.1", features = ["approx"] }
99+
bevy_math = { version = "0.16.0-rc.2", features = ["approx"] }
100100
bevy_heavy = { git = "https://github.com/Jondolf/bevy_heavy", features = [
101101
"approx",
102102
] }

crates/avian3d/examples/conveyor_belt.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ fn main() {
2323
// Enable contact modification for conveyor belts with the `ActiveCollisionHooks` component.
2424
// Here we use required components, but you could also add it manually.
2525
#[derive(Component)]
26-
#[require(ActiveCollisionHooks(|| ActiveCollisionHooks::MODIFY_CONTACTS))]
26+
#[require(ActiveCollisionHooks::MODIFY_CONTACTS)]
2727
struct ConveyorBelt {
2828
local_direction: Vec3,
2929
speed: f32,

crates/benches_common_2d/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ version = "0.1.0"
44
edition = "2021"
55

66
[dependencies]
7-
bevy = { version = "0.16.0-rc.1", default-features = false }
7+
bevy = { version = "0.16.0-rc.2", default-features = false }
88
avian2d = { path = "../avian2d", default-features = false }
99
criterion = "0.5"
1010

1111
[lints]
12-
workspace = true
12+
workspace = true

crates/benches_common_3d/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ version = "0.1.0"
44
edition = "2021"
55

66
[dependencies]
7-
bevy = { version = "0.16.0-rc.1", default-features = false }
7+
bevy = { version = "0.16.0-rc.2", default-features = false }
88
avian3d = { path = "../avian3d", default-features = false }
99
criterion = "0.5"
1010

1111
[lints]
12-
workspace = true
12+
workspace = true

crates/examples_common_2d/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ edition = "2021"
77
use-debug-plugin = []
88

99
[dependencies]
10-
bevy = { version = "0.16.0-rc.1", default-features = false, features = [
10+
bevy = { version = "0.16.0-rc.2", default-features = false, features = [
1111
"bevy_core_pipeline",
1212
"bevy_state",
1313
"bevy_text",
@@ -30,4 +30,4 @@ avian2d = { path = "../avian2d", default-features = false, features = [
3030
] }
3131

3232
[lints]
33-
workspace = true
33+
workspace = true

crates/examples_common_3d/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ edition = "2021"
77
use-debug-plugin = []
88

99
[dependencies]
10-
bevy = { version = "0.16.0-rc.1", default-features = false, features = [
10+
bevy = { version = "0.16.0-rc.2", default-features = false, features = [
1111
"bevy_core_pipeline",
1212
"bevy_state",
1313
"bevy_text",
@@ -33,4 +33,4 @@ avian3d = { path = "../avian3d", default-features = false, features = [
3333
] }
3434

3535
[lints]
36-
workspace = true
36+
workspace = true

src/diagnostics/ui.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,22 +83,22 @@ struct DiagnosticRow;
8383

8484
/// A marker component for the name text node of a diagnostic.
8585
#[derive(Component)]
86-
#[require(TextFont(diagnostic_font))]
86+
#[require(TextFont = diagnostic_font())]
8787
struct PhysicsDiagnosticName;
8888

8989
/// A component with the [`DiagnosticPath`] of a diagnostic.
9090
#[derive(Component)]
91-
#[require(TextFont(diagnostic_font))]
91+
#[require(TextFont = diagnostic_font())]
9292
struct PhysicsDiagnosticPath(&'static DiagnosticPath);
9393

9494
/// A marker component for a counter diagnostic.
9595
#[derive(Component)]
96-
#[require(TextFont(diagnostic_font))]
96+
#[require(TextFont = diagnostic_font())]
9797
struct PhysicsDiagnosticCounter;
9898

9999
/// A marker component for a timer diagnostic.
100100
#[derive(Component)]
101-
#[require(TextFont(diagnostic_font))]
101+
#[require(TextFont = diagnostic_font())]
102102
struct PhysicsDiagnosticTimer;
103103

104104
fn diagnostic_font() -> TextFont {

src/picking/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ pub fn update_hits(
158158
) {
159159
let start_time = crate::utils::Instant::now();
160160

161-
for (&ray_id, &ray) in ray_map.map().iter() {
161+
for (&ray_id, &ray) in ray_map.map.iter() {
162162
let Ok((camera, picking_filter, cam_pickable)) = picking_cameras.get(ray_id.camera) else {
163163
continue;
164164
};

0 commit comments

Comments
 (0)