Skip to content

Commit 44eba6e

Browse files
committed
Update to Bevy 0.18
1 parent 18e25a8 commit 44eba6e

File tree

9 files changed

+1389
-733
lines changed

9 files changed

+1389
-733
lines changed

Cargo.lock

Lines changed: 1364 additions & 673 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 16 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "bevy_game" # ToDo
33
version = "0.1.0"
44
publish = false
55
authors = ["Niklas Eicker <git@nikl.me>"] # ToDo: you are the author ;)
6-
edition = "2021"
6+
edition = "2024"
77
exclude = ["dist", "build", "assets", "credits"]
88

99
[workspace]
@@ -39,64 +39,33 @@ dev = [
3939
# All of Bevy's default features exept for the audio related ones (bevy_audio, vorbis), since they clash with bevy_kira_audio
4040
# and android_shared_stdcxx/android-game-activity, since those are covered in `mobile`
4141
[dependencies]
42-
bevy = { version = "0.17.2", default-features = false, features = [
43-
"std",
44-
"async_executor",
45-
"animation",
46-
"bevy_asset",
47-
"bevy_color",
48-
"bevy_core_pipeline",
49-
"bevy_post_process",
50-
"bevy_anti_alias",
42+
bevy = { version = "0.18.0", default-features = false, features = [
43+
"default_app",
44+
"2d_api",
45+
"2d_bevy_render",
46+
"3d_api",
47+
"3d_bevy_render",
48+
"ui_api",
49+
"ui_bevy_render",
50+
"scene",
51+
"picking",
5152
"bevy_gilrs",
52-
"bevy_gizmos",
53-
"bevy_gltf",
54-
"bevy_input_focus",
55-
"bevy_log",
56-
"bevy_mesh_picking_backend",
57-
"bevy_pbr",
58-
"bevy_picking",
59-
"bevy_render",
60-
"bevy_scene",
61-
"bevy_image",
62-
"bevy_mesh",
63-
"bevy_camera",
64-
"bevy_light",
65-
"bevy_shader",
66-
"bevy_sprite",
67-
"bevy_sprite_picking_backend",
68-
"bevy_sprite_render",
69-
"bevy_state",
70-
"bevy_text",
71-
"bevy_ui",
72-
"bevy_ui_picking_backend",
73-
"bevy_ui_render",
74-
"bevy_window",
7553
"bevy_winit",
76-
"custom_cursor",
7754
"default_font",
78-
"hdr",
79-
"ktx2",
8055
"multi_threaded",
81-
"png",
82-
"reflect_auto_register",
83-
"smaa_luts",
84-
"sysinfo_plugin",
85-
"tonemapping_luts",
8656
"webgl2",
8757
"x11",
8858
"wayland",
89-
"debug",
90-
"zstd_rust",
59+
"sysinfo_plugin",
9160
] }
92-
bevy_kira_audio = { version = "0.24", features = ["android_shared_stdcxx"] }
93-
bevy_asset_loader = { version = "0.24.0-rc.1" }
94-
rand = { version = "0.8.3" }
61+
bevy_kira_audio = { version = "0.25", features = ["android_shared_stdcxx"] }
62+
bevy_asset_loader = { version = "0.25.0" }
63+
rand = { version = "0.9" }
9564
webbrowser = { version = "1", features = ["hardened"] }
9665

9766
# keep the following in sync with Bevy's dependencies
9867
winit = { version = "0.30", default-features = false }
99-
image = { version = "0.25.2", default-features = false }
68+
image = { version = "0.25", default-features = false }
10069
## This greatly improves WGPU's performance due to its heavy use of trace! calls
10170
log = { version = "0.4", features = ["max_level_debug", "release_max_level_warn"] }
10271

mobile/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ unsafe extern "C" fn main_rs() {
88
main();
99
}
1010

11-
// this macro is a no-op on ios and only needed for anroid since bevy 0.16
11+
// this macro is a no-op on ios and only needed for android since bevy 0.16
1212
// see https://github.com/bevyengine/bevy/pull/14780
1313
#[bevy_main]
1414
fn main() {

src/actions/game_control.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,5 @@ impl GameControl {
2727
}
2828

2929
pub fn get_movement(control: GameControl, input: &Res<ButtonInput<KeyCode>>) -> f32 {
30-
if control.pressed(input) {
31-
1.0
32-
} else {
33-
0.0
34-
}
30+
if control.pressed(input) { 1.0 } else { 0.0 }
3531
}

src/actions/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use bevy::math::Vec3Swizzles;
22
use bevy::prelude::*;
33

4-
use crate::actions::game_control::{get_movement, GameControl};
5-
use crate::player::Player;
64
use crate::GameState;
5+
use crate::actions::game_control::{GameControl, get_movement};
6+
use crate::player::Player;
77

88
mod game_control;
99

src/audio.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
use crate::actions::{set_movement_actions, Actions};
2-
use crate::loading::AudioAssets;
31
use crate::GameState;
2+
use crate::actions::{Actions, set_movement_actions};
3+
use crate::loading::AudioAssets;
44
use bevy::prelude::*;
55
use bevy_kira_audio::prelude::*;
66

src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// disable console on windows for release builds
22
#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
33

4+
use bevy::DefaultPlugins;
45
use bevy::asset::AssetMetaCheck;
56
use bevy::ecs::system::NonSendMarker;
67
use bevy::prelude::*;
78
use bevy::window::PrimaryWindow;
89
use bevy::winit::WINIT_WINDOWS;
9-
use bevy::DefaultPlugins;
1010
use bevy_game::GamePlugin; // ToDo: Replace bevy_game with your new crate name.
1111
use std::io::Cursor;
1212
use winit::window::Icon;

src/menu.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use crate::loading::TextureAssets;
21
use crate::GameState;
2+
use crate::loading::TextureAssets;
33
use bevy::prelude::*;
44

55
pub struct MenuPlugin;

src/player.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
use crate::GameState;
12
use crate::actions::Actions;
23
use crate::loading::TextureAssets;
3-
use crate::GameState;
44
use bevy::prelude::*;
55

66
pub struct PlayerPlugin;

0 commit comments

Comments
 (0)