Skip to content

Commit 25def41

Browse files
StarArawnStarArawn
authored
Merge pull request #508 from rparrett/bevy13
Upgrade to Bevy 0.13
2 parents 1e345d1 + a7b308a commit 25def41

19 files changed

+208
-189
lines changed

‎Cargo.toml

Lines changed: 92 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ render = []
1616
serde = ["dep:serde"]
1717

1818
[dependencies]
19-
bevy = { version = "0.12", default-features = false, features = [
19+
bevy = { version = "0.13", default-features = false, features = [
2020
"bevy_core_pipeline",
2121
"bevy_render",
2222
"bevy_asset",
@@ -35,7 +35,7 @@ tiled = { version = "0.11.0", default-features = false }
3535
thiserror = { version = "1.0" }
3636

3737
[dev-dependencies.bevy]
38-
version = "0.12"
38+
version = "0.13"
3939
default-features = false
4040
features = [
4141
"bevy_core_pipeline",
@@ -47,11 +47,11 @@ features = [
4747
"bevy_text",
4848
"bevy_sprite",
4949
#"file_watcher",
50-
"multi-threaded"
50+
"multi-threaded",
5151
]
5252

5353
[target.'cfg(unix)'.dev-dependencies.bevy]
54-
version = "0.12"
54+
version = "0.13"
5555
default-features = false
5656
features = [
5757
"bevy_core_pipeline",
@@ -63,123 +63,123 @@ features = [
6363
"x11",
6464
"bevy_text",
6565
"bevy_sprite",
66-
"multi-threaded"
66+
"multi-threaded",
6767
]
6868

6969

7070
[[example]]
71-
name="3d_iso"
72-
path="examples/3d_iso.rs"
73-
required-features=["render"]
71+
name = "3d_iso"
72+
path = "examples/3d_iso.rs"
73+
required-features = ["render"]
7474
[[example]]
75-
name="accessing_tiles"
76-
path="examples/accessing_tiles.rs"
77-
required-features=["render"]
75+
name = "accessing_tiles"
76+
path = "examples/accessing_tiles.rs"
77+
required-features = ["render"]
7878
[[example]]
79-
name="animation"
80-
path="examples/animation.rs"
81-
required-features=["render"]
79+
name = "animation"
80+
path = "examples/animation.rs"
81+
required-features = ["render"]
8282
[[example]]
83-
name="basic"
84-
path="examples/basic.rs"
85-
required-features=["render"]
83+
name = "basic"
84+
path = "examples/basic.rs"
85+
required-features = ["render"]
8686
[[example]]
87-
name="bench"
88-
path="examples/bench.rs"
89-
required-features=["render"]
87+
name = "bench"
88+
path = "examples/bench.rs"
89+
required-features = ["render"]
9090
[[example]]
91-
name="chunking"
92-
path="examples/chunking.rs"
93-
required-features=["render"]
91+
name = "chunking"
92+
path = "examples/chunking.rs"
93+
required-features = ["render"]
9494
[[example]]
95-
name="colors"
96-
path="examples/colors.rs"
97-
required-features=["render"]
95+
name = "colors"
96+
path = "examples/colors.rs"
97+
required-features = ["render"]
9898
[[example]]
99-
name="custom_shader"
100-
path="examples/custom_shader.rs"
101-
required-features=["render"]
99+
name = "custom_shader"
100+
path = "examples/custom_shader.rs"
101+
required-features = ["render"]
102102
[[example]]
103-
name="frustum_cull_test"
104-
path="examples/frustum_cull_test.rs"
105-
required-features=["render"]
103+
name = "frustum_cull_test"
104+
path = "examples/frustum_cull_test.rs"
105+
required-features = ["render"]
106106
[[example]]
107-
name="game_of_life"
108-
path="examples/game_of_life.rs"
109-
required-features=["render"]
107+
name = "game_of_life"
108+
path = "examples/game_of_life.rs"
109+
required-features = ["render"]
110110
[[example]]
111-
name="hex_neighbors_radius_chunks"
112-
path="examples/hex_neighbors_radius_chunks.rs"
113-
required-features=["render"]
111+
name = "hex_neighbors_radius_chunks"
112+
path = "examples/hex_neighbors_radius_chunks.rs"
113+
required-features = ["render"]
114114
[[example]]
115-
name="hex_neighbors"
116-
path="examples/hex_neighbors.rs"
117-
required-features=["render"]
115+
name = "hex_neighbors"
116+
path = "examples/hex_neighbors.rs"
117+
required-features = ["render"]
118118
[[example]]
119-
name="hexagon_column"
120-
path="examples/hexagon_column.rs"
121-
required-features=["render"]
119+
name = "hexagon_column"
120+
path = "examples/hexagon_column.rs"
121+
required-features = ["render"]
122122
[[example]]
123-
name="hexagon_generation"
124-
path="examples/hexagon_generation.rs"
125-
required-features=["render"]
123+
name = "hexagon_generation"
124+
path = "examples/hexagon_generation.rs"
125+
required-features = ["render"]
126126
[[example]]
127-
name="hexagon_row"
128-
path="examples/hexagon_row.rs"
129-
required-features=["render"]
127+
name = "hexagon_row"
128+
path = "examples/hexagon_row.rs"
129+
required-features = ["render"]
130130
[[example]]
131-
name="iso_diamond"
132-
path="examples/iso_diamond.rs"
133-
required-features=["render"]
131+
name = "iso_diamond"
132+
path = "examples/iso_diamond.rs"
133+
required-features = ["render"]
134134
[[example]]
135-
name="iso_staggered"
136-
path="examples/iso_staggered.rs"
137-
required-features=["render"]
135+
name = "iso_staggered"
136+
path = "examples/iso_staggered.rs"
137+
required-features = ["render"]
138138
[[example]]
139-
name="layers"
140-
path="examples/layers.rs"
141-
required-features=["render"]
139+
name = "layers"
140+
path = "examples/layers.rs"
141+
required-features = ["render"]
142142
[[example]]
143-
name="ldtk"
144-
path="examples/ldtk.rs"
145-
required-features=["render"]
143+
name = "ldtk"
144+
path = "examples/ldtk.rs"
145+
required-features = ["render"]
146146
[[example]]
147-
name="mouse_to_tile"
148-
path="examples/mouse_to_tile.rs"
149-
required-features=["render"]
147+
name = "mouse_to_tile"
148+
path = "examples/mouse_to_tile.rs"
149+
required-features = ["render"]
150150
[[example]]
151-
name="move_tile"
152-
path="examples/move_tile.rs"
153-
required-features=["render"]
151+
name = "move_tile"
152+
path = "examples/move_tile.rs"
153+
required-features = ["render"]
154154
[[example]]
155-
name="random_map"
156-
path="examples/random_map.rs"
157-
required-features=["render"]
155+
name = "random_map"
156+
path = "examples/random_map.rs"
157+
required-features = ["render"]
158158
[[example]]
159-
name="remove_tiles"
160-
path="examples/remove_tiles.rs"
161-
required-features=["render"]
159+
name = "remove_tiles"
160+
path = "examples/remove_tiles.rs"
161+
required-features = ["render"]
162162
[[example]]
163-
name="spacing"
164-
path="examples/spacing.rs"
165-
required-features=["render"]
163+
name = "spacing"
164+
path = "examples/spacing.rs"
165+
required-features = ["render"]
166166
[[example]]
167-
name="texture_container"
168-
path="examples/texture_container.rs"
169-
required-features=["render"]
167+
name = "texture_container"
168+
path = "examples/texture_container.rs"
169+
required-features = ["render"]
170170
[[example]]
171-
name="texture_vec"
172-
path="examples/texture_vec.rs"
173-
required-features=["render"]
171+
name = "texture_vec"
172+
path = "examples/texture_vec.rs"
173+
required-features = ["render"]
174174
[[example]]
175-
name="tiled_rotated"
176-
path="examples/tiled_rotated.rs"
177-
required-features=["render"]
175+
name = "tiled_rotated"
176+
path = "examples/tiled_rotated.rs"
177+
required-features = ["render"]
178178
[[example]]
179-
name="tiled"
180-
path="examples/tiled.rs"
181-
required-features=["render"]
179+
name = "tiled"
180+
path = "examples/tiled.rs"
181+
required-features = ["render"]
182182
[[example]]
183-
name="visibility"
184-
path="examples/visibility.rs"
185-
required-features=["render"]
183+
name = "visibility"
184+
path = "examples/visibility.rs"
185+
required-features = ["render"]

‎examples/animation.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ fn main() {
150150
.run();
151151
}
152152

153-
fn pause_animation(mut query: Query<&mut AnimatedTile>, keys: Res<Input<KeyCode>>) {
154-
if keys.just_pressed(KeyCode::P) {
153+
fn pause_animation(mut query: Query<&mut AnimatedTile>, keys: Res<ButtonInput<KeyCode>>) {
154+
if keys.just_pressed(KeyCode::KeyP) {
155155
for mut anim in &mut query {
156156
anim.speed = if anim.speed == 0.0 { 1.0 } else { 0.0 }
157157
}

‎examples/basic.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ fn startup(
7474

7575
fn swap_texture_or_hide(
7676
asset_server: Res<AssetServer>,
77-
keyboard_input: Res<Input<KeyCode>>,
77+
keyboard_input: Res<ButtonInput<KeyCode>>,
7878
mut query: Query<(&mut TilemapTexture, &mut Visibility)>,
7979
) {
8080
if keyboard_input.just_pressed(KeyCode::Space) {
@@ -88,7 +88,7 @@ fn swap_texture_or_hide(
8888
}
8989
}
9090
}
91-
if keyboard_input.just_pressed(KeyCode::H) {
91+
if keyboard_input.just_pressed(KeyCode::KeyH) {
9292
for (_, mut visibility) in &mut query {
9393
*visibility = match *visibility {
9494
Visibility::Inherited | Visibility::Visible => Visibility::Hidden,

‎examples/frustum_cull_test.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ fn spawn_map_type_label(
127127
font_size: 20.0,
128128
color: Color::BLACK,
129129
};
130-
let text_alignment = TextAlignment::Center;
130+
let text_justify = JustifyText::Center;
131131

132132
for window in windows.iter() {
133133
for map_type in map_type_q.iter() {
@@ -140,7 +140,7 @@ fn spawn_map_type_label(
140140
commands.spawn((
141141
Text2dBundle {
142142
text: Text::from_section(format!("{map_type:?}"), text_style.clone())
143-
.with_alignment(text_alignment),
143+
.with_justify(text_justify),
144144
transform,
145145
..default()
146146
},
@@ -159,7 +159,7 @@ fn swap_map_type(
159159
&mut TilemapTexture,
160160
&mut TilemapTileSize,
161161
)>,
162-
keyboard_input: Res<Input<KeyCode>>,
162+
keyboard_input: Res<ButtonInput<KeyCode>>,
163163
mut map_type_label_q: Query<&mut Text, With<MapTypeLabel>>,
164164
tile_handle_square: Res<TileHandleSquare>,
165165
tile_handle_hex_row: Res<TileHandleHexRow>,
@@ -240,6 +240,7 @@ fn main() {
240240
level: Level::ERROR,
241241
// except for bevy_ecs_tilemap
242242
filter: "bevy_ecs_tilemap=trace".into(),
243+
..default()
243244
}),
244245
)
245246
.add_plugins(TilemapPlugin)

‎examples/game_of_life.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,8 @@ fn update(
6767
.entities(tile_storage)
6868
.iter()
6969
.filter(|neighbor| {
70-
let tile_component =
71-
tile_query.get_component::<TileVisible>(**neighbor).unwrap();
72-
tile_component.0
70+
let (_, _, tile_visible) = tile_query.get(**neighbor).unwrap();
71+
tile_visible.0
7372
})
7473
.count();
7574

‎examples/helpers/camera.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
1-
use bevy::{input::Input, math::Vec3, prelude::*, render::camera::Camera};
1+
use bevy::{input::ButtonInput, math::Vec3, prelude::*, render::camera::Camera};
22

33
// A simple camera system for moving and zooming the camera.
44
#[allow(dead_code)]
55
pub fn movement(
66
time: Res<Time>,
7-
keyboard_input: Res<Input<KeyCode>>,
7+
keyboard_input: Res<ButtonInput<KeyCode>>,
88
mut query: Query<(&mut Transform, &mut OrthographicProjection), With<Camera>>,
99
) {
1010
for (mut transform, mut ortho) in query.iter_mut() {
1111
let mut direction = Vec3::ZERO;
1212

13-
if keyboard_input.pressed(KeyCode::A) {
13+
if keyboard_input.pressed(KeyCode::KeyA) {
1414
direction -= Vec3::new(1.0, 0.0, 0.0);
1515
}
1616

17-
if keyboard_input.pressed(KeyCode::D) {
17+
if keyboard_input.pressed(KeyCode::KeyD) {
1818
direction += Vec3::new(1.0, 0.0, 0.0);
1919
}
2020

21-
if keyboard_input.pressed(KeyCode::W) {
21+
if keyboard_input.pressed(KeyCode::KeyW) {
2222
direction += Vec3::new(0.0, 1.0, 0.0);
2323
}
2424

25-
if keyboard_input.pressed(KeyCode::S) {
25+
if keyboard_input.pressed(KeyCode::KeyS) {
2626
direction -= Vec3::new(0.0, 1.0, 0.0);
2727
}
2828

29-
if keyboard_input.pressed(KeyCode::Z) {
29+
if keyboard_input.pressed(KeyCode::KeyZ) {
3030
ortho.scale += 0.1;
3131
}
3232

33-
if keyboard_input.pressed(KeyCode::X) {
33+
if keyboard_input.pressed(KeyCode::KeyX) {
3434
ortho.scale -= 0.1;
3535
}
3636

0 commit comments

Comments
 (0)