Skip to content

Commit 22a05de

Browse files
sparten11740sparten11740
authored
feat: support bevy 0.15.0 (#38)
1 parent f0bfe9a commit 22a05de

14 files changed

+221
-265
lines changed

‎Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ authors = ["Jan Wendland"]
1313
include = ["/src", "CHANGELOG.md", "/assets", "LICENSE-APACHE", "LICENSE-MIT"]
1414

1515
[dependencies]
16-
bevy = { version = "0.14.0", default-features = false, features = ["bevy_pbr", "bevy_render"] }
16+
bevy = { version = "0.15.0", default-features = false, features = ["bevy_pbr", "bevy_render"] }
1717
ordered-float = "3.9.2"
1818

1919
[dev-dependencies]
20-
bevy = "0.14.0"
21-
bevy-inspector-egui = "0.25.0"
22-
bevy_tweening = { git = "https://github.com/BraymatterOrg/bevy_tweening_0_14", rev = "1e46e67938ef21cfd3b80a9bd7f9e3de1edd425c" }
20+
bevy = "0.15.0"
21+
bevy-inspector-egui = "0.28.0"
22+
bevy_tweening = "0.12.0"

‎README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ or layered cameras out of the box.
1313
## Bevy Compatibility
1414

1515
| Bevy Version | Crate Version |
16-
|--------------|--------------:|
17-
| `0.14` | >= `3.3.0` |
16+
| ------------ | ------------: |
17+
| `0.15` | >= `3.4.0` |
18+
| `0.14` | `3.3.0` |
1819
| `0.13` | `3.2.0` |
1920
| `0.12` | `2.0.0` |
2021
| `0.11` | `1.2.0` |

‎examples/border.rs

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ fn main() {
2525
))
2626
.add_systems(Startup, setup)
2727
.add_systems(Update, rotate_camera)
28-
.insert_resource(Msaa::Sample4)
2928
.run();
3029
}
3130

@@ -35,11 +34,10 @@ fn setup(
3534
mut materials: ResMut<Assets<StandardMaterial>>,
3635
) {
3736
// Ground
38-
commands.spawn(PbrBundle {
39-
mesh: meshes.add(Plane3d::default().mesh().size(5.0, 5.0)),
40-
material: materials.add(Color::srgba(0.3, 0.5, 0.3, 1.)),
41-
..Default::default()
42-
});
37+
commands.spawn((
38+
Mesh3d(meshes.add(Plane3d::default().mesh().size(5.0, 5.0))),
39+
MeshMaterial3d(materials.add(Color::srgba(0.3, 0.5, 0.3, 1.))),
40+
));
4341

4442
let radius = 0.15;
4543
let values = [2.0f32, 5., 9.];
@@ -51,12 +49,9 @@ fn setup(
5149
// Spawn one mesh and bar for each value defined above
5250
values.into_iter().enumerate().for_each(|(i, value)| {
5351
commands.spawn((
54-
PbrBundle {
55-
mesh: meshes.add(Sphere { radius }),
56-
material: materials.add(Color::srgba(1., 0.2, 0.2, 1.)),
57-
transform: Transform::from_xyz(2. * radius, 0.4 + i as f32 / 2., 0.0),
58-
..Default::default()
59-
},
52+
Mesh3d(meshes.add(Sphere { radius })),
53+
MeshMaterial3d(materials.add(Color::srgba(1., 0.2, 0.2, 1.))),
54+
Transform::from_xyz(2. * radius, 0.4 + i as f32 / 2., 0.0),
6055
Health {
6156
max: 10.,
6257
current: value,
@@ -72,20 +67,22 @@ fn setup(
7267
));
7368
});
7469

75-
commands.spawn(PointLightBundle {
76-
transform: Transform::from_xyz(4.0, 8.0, 4.0),
77-
point_light: PointLight {
70+
// Light
71+
commands.spawn((
72+
PointLight {
7873
intensity: 1500.0,
7974
shadows_enabled: true,
8075
..Default::default()
8176
},
82-
..Default::default()
83-
});
77+
Transform::from_xyz(4.0, 8.0, 4.0),
78+
));
8479

85-
commands.spawn(Camera3dBundle {
86-
transform: Transform::from_xyz(0., 1.5, 4.0).looking_at(Vec3::Y, Vec3::Y),
87-
..Default::default()
88-
});
80+
// Camera
81+
commands.spawn((
82+
Camera3d::default(),
83+
Msaa::Sample4,
84+
Transform::from_xyz(0., 1.5, 4.0).looking_at(Vec3::Y, Vec3::Y),
85+
));
8986
}
9087

9188
fn rotate_camera(
@@ -94,7 +91,7 @@ fn rotate_camera(
9491
time: Res<Time>,
9592
) {
9693
let mut transform = camera_query.single_mut();
97-
let mut target_angle = *angle + 10. * time.delta_seconds();
94+
let mut target_angle = *angle + 10. * time.delta_secs();
9895

9996
if target_angle > 360. {
10097
target_angle = 0.;

‎examples/custom_background.rs

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ fn main() {
2626
))
2727
.insert_resource(ColorScheme::<Health>::new().background_color(RED.into()))
2828
.add_systems(Startup, setup)
29-
.insert_resource(Msaa::Sample4)
3029
.run();
3130
}
3231

@@ -35,21 +34,18 @@ fn setup(
3534
mut meshes: ResMut<Assets<Mesh>>,
3635
mut materials: ResMut<Assets<StandardMaterial>>,
3736
) {
38-
commands.spawn(PbrBundle {
39-
mesh: meshes.add(Plane3d::default().mesh().size(5.0, 5.0)),
40-
material: materials.add(Color::srgba(0.3, 0.5, 0.3, 1.)),
41-
..Default::default()
42-
});
37+
// Ground
38+
commands.spawn((
39+
Mesh3d(meshes.add(Plane3d::default().mesh().size(5.0, 5.0))),
40+
MeshMaterial3d(materials.add(Color::srgba(0.3, 0.5, 0.3, 1.))),
41+
));
4342

4443
let radius = 0.2;
4544

4645
commands.spawn((
47-
PbrBundle {
48-
mesh: meshes.add(Sphere { radius }),
49-
material: materials.add(Color::srgba(1., 0.2, 0.2, 1.)),
50-
transform: Transform::from_xyz(0.0, 1., 0.0),
51-
..Default::default()
52-
},
46+
Mesh3d(meshes.add(Sphere { radius })),
47+
MeshMaterial3d(materials.add(Color::srgba(1., 0.2, 0.2, 1.))),
48+
Transform::from_xyz(0.0, 1., 0.0),
5349
Health {
5450
max: 10.,
5551
current: 8.,
@@ -61,18 +57,20 @@ fn setup(
6157
},
6258
));
6359

64-
commands.spawn(PointLightBundle {
65-
transform: Transform::from_xyz(4.0, 8.0, 4.0),
66-
point_light: PointLight {
60+
// Light
61+
commands.spawn((
62+
PointLight {
6763
intensity: 1500.0,
6864
shadows_enabled: true,
6965
..Default::default()
7066
},
71-
..Default::default()
72-
});
67+
Transform::from_xyz(4.0, 8.0, 4.0),
68+
));
7369

74-
commands.spawn(Camera3dBundle {
75-
transform: Transform::from_xyz(0., 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
76-
..Default::default()
77-
});
70+
// Camera
71+
commands.spawn((
72+
Camera3d::default(),
73+
Msaa::Sample4,
74+
Transform::from_xyz(0., 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
75+
));
7876
}

‎examples/custom_foreground.rs

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ fn main() {
4949
},
5050
))
5151
.add_systems(Startup, setup)
52-
.insert_resource(Msaa::Sample4)
5352
.run();
5453
}
5554

@@ -63,12 +62,9 @@ fn setup(
6362

6463
values.into_iter().enumerate().for_each(|(i, value)| {
6564
commands.spawn((
66-
PbrBundle {
67-
mesh: meshes.add(Sphere { radius }),
68-
material: materials.add(Color::srgba(1., 0.2, 0.2, 1.)),
69-
transform: Transform::from_xyz(-2. * radius, 0.4 + i as f32 / 2., 0.0),
70-
..Default::default()
71-
},
65+
Mesh3d(meshes.add(Sphere { radius })),
66+
MeshMaterial3d(materials.add(Color::srgba(1., 0.2, 0.2, 1.))),
67+
Transform::from_xyz(-2. * radius, 0.4 + i as f32 / 2., 0.0),
7268
Mana {
7369
max: 10.,
7470
current: value,
@@ -81,12 +77,9 @@ fn setup(
8177
));
8278

8379
commands.spawn((
84-
PbrBundle {
85-
mesh: meshes.add(Sphere { radius }),
86-
material: materials.add(Color::srgba(1., 0.2, 0.2, 1.)),
87-
transform: Transform::from_xyz(2. * radius, 0.4 + i as f32 / 2., 0.0),
88-
..Default::default()
89-
},
80+
Mesh3d(meshes.add(Sphere { radius })),
81+
MeshMaterial3d(materials.add(Color::srgba(1., 0.2, 0.2, 1.))),
82+
Transform::from_xyz(2. * radius, 0.4 + i as f32 / 2., 0.0),
9083
Health {
9184
max: 10.,
9285
current: value,
@@ -99,18 +92,20 @@ fn setup(
9992
));
10093
});
10194

102-
commands.spawn(PointLightBundle {
103-
transform: Transform::from_xyz(4.0, 8.0, 4.0),
104-
point_light: PointLight {
95+
// Light
96+
commands.spawn((
97+
PointLight {
10598
intensity: 1500.0,
10699
shadows_enabled: false,
107100
..Default::default()
108101
},
109-
..Default::default()
110-
});
102+
Transform::from_xyz(4.0, 8.0, 4.0),
103+
));
111104

112-
commands.spawn(Camera3dBundle {
113-
transform: Transform::from_xyz(0., 1.5, 4.0).looking_at(Vec3::Y, Vec3::Y),
114-
..Default::default()
115-
});
105+
// Camera
106+
commands.spawn((
107+
Camera3d::default(),
108+
Msaa::Sample4,
109+
Transform::from_xyz(0., 1.5, 4.0).looking_at(Vec3::Y, Vec3::Y),
110+
));
116111
}

‎examples/default.rs

Lines changed: 23 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ fn main() {
2626
))
2727
.add_systems(Startup, setup)
2828
.add_systems(Update, rotate_camera)
29-
.insert_resource(Msaa::Sample4)
3029
.run();
3130
}
3231

@@ -35,21 +34,18 @@ fn setup(
3534
mut meshes: ResMut<Assets<Mesh>>,
3635
mut materials: ResMut<Assets<StandardMaterial>>,
3736
) {
38-
commands.spawn(PbrBundle {
39-
mesh: meshes.add(Plane3d::default().mesh().size(5.0, 5.0)),
40-
material: materials.add(Color::srgba(0.3, 0.5, 0.3, 1.)),
41-
..Default::default()
42-
});
37+
// Ground
38+
commands.spawn((
39+
Mesh3d(meshes.add(Plane3d::default().mesh().size(5.0, 5.0))),
40+
MeshMaterial3d(materials.add(Color::srgba(0.3, 0.5, 0.3, 1.))),
41+
));
4342

4443
let radius = 0.2;
4544

4645
commands.spawn((
47-
PbrBundle {
48-
mesh: meshes.add(Sphere { radius }),
49-
material: materials.add(Color::srgba(1., 0.2, 0.2, 1.)),
50-
transform: Transform::from_xyz(0.0, 1., 0.0),
51-
..Default::default()
52-
},
46+
Mesh3d(meshes.add(Sphere { radius })),
47+
MeshMaterial3d(materials.add(Color::srgba(1., 0.2, 0.2, 1.))),
48+
Transform::from_xyz(0.0, 1., 0.0),
5349
Health {
5450
max: 10.,
5551
current: 8.,
@@ -62,12 +58,9 @@ fn setup(
6258
));
6359

6460
commands.spawn((
65-
PbrBundle {
66-
mesh: meshes.add(Sphere { radius }),
67-
material: materials.add(Color::srgba(1., 0.2, 0.2, 1.)),
68-
transform: Transform::from_xyz(0.0 + 3. * radius, 0.5, 0.0),
69-
..Default::default()
70-
},
61+
Mesh3d(meshes.add(Sphere { radius })),
62+
MeshMaterial3d(materials.add(Color::srgba(1., 0.2, 0.2, 1.))),
63+
Transform::from_xyz(0.0 + 3. * radius, 0.5, 0.0),
7164
Health {
7265
max: 10.,
7366
current: 2.,
@@ -79,20 +72,22 @@ fn setup(
7972
},
8073
));
8174

82-
commands.spawn(PointLightBundle {
83-
transform: Transform::from_xyz(4.0, 8.0, 4.0),
84-
point_light: PointLight {
75+
// Light
76+
commands.spawn((
77+
PointLight {
8578
intensity: 1500.0,
8679
shadows_enabled: true,
8780
..Default::default()
8881
},
89-
..Default::default()
90-
});
82+
Transform::from_xyz(4.0, 8.0, 4.0),
83+
));
9184

92-
commands.spawn(Camera3dBundle {
93-
transform: Transform::from_xyz(0., 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
94-
..Default::default()
95-
});
85+
// Camera
86+
commands.spawn((
87+
Camera3d::default(),
88+
Msaa::Sample4,
89+
Transform::from_xyz(0., 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
90+
));
9691
}
9792

9893
fn rotate_camera(
@@ -101,7 +96,7 @@ fn rotate_camera(
10196
time: Res<Time>,
10297
) {
10398
let mut transform = camera_query.single_mut();
104-
let mut target_angle = *angle + 10. * time.delta_seconds();
99+
let mut target_angle = *angle + 10. * time.delta_secs();
105100

106101
if target_angle > 360. {
107102
target_angle = 0.;

0 commit comments

Comments
 (0)