Amatsugu/phos-neo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update to bevy 0.16.0

Browse Source 
Need to wait for asset_loader upate full release
Need to refactor Prefab system to use the new relationships
This commit is contained in:
Amatsugu
2025-04-29 14:35:19 -04:00
parent cb95db862c
commit 94b85c9cf7
11 changed files with 1854 additions and 655 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2474
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

2
engine/asset_loader/Cargo.toml
View File

@@ -9,5 +9,5 @@ edition = "2021"
[dependencies] [dependencies]
serde = "1.0.204" serde = "1.0.204"
serde_json = "1.0.120" serde_json = "1.0.120"
bevy = "0.15.1" bevy = "0.16.0"
ron = "0.8.1" ron = "0.8.1"

1
engine/asset_loader/src/macros.rs
View File

@@ -10,7 +10,6 @@ macro_rules! create_asset_loader {
) => { ) => {
use bevy::prelude::*; use bevy::prelude::*;
use bevy::asset::{AssetLoader, AssetEvent, AssetEvents, LoadContext, LoadState, AsyncReadExt, io::Reader}; use bevy::asset::{AssetLoader, AssetEvent, AssetEvents, LoadContext, LoadState, AsyncReadExt, io::Reader};
use bevy::utils::BoxedFuture;
pub struct $plugin_name; pub struct $plugin_name;
impl Plugin for $plugin_name { impl Plugin for $plugin_name {
fn build(&self, app: &mut App) { fn build(&self, app: &mut App) {

2
engine/asset_loader_proc/Cargo.toml
View File

@@ -9,5 +9,5 @@ proc-macro = true
[dependencies] [dependencies]
serde = "1.0.204" serde = "1.0.204"
serde_json = "1.0.120" serde_json = "1.0.120"
bevy = "0.15.1" bevy = "0.16.0"
ron = "0.8.1" ron = "0.8.1"

4
engine/world_generation/Cargo.toml
View File

@@ -6,14 +6,14 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
bevy = "0.15.1" bevy = "0.16.0"
noise = "0.9.0" noise = "0.9.0"
serde = { version = "1.0.203", features = ["derive"] } serde = { version = "1.0.203", features = ["derive"] }
serde_json = "1.0.115" serde_json = "1.0.115"
asset_loader = { path = "../asset_loader" } asset_loader = { path = "../asset_loader" }
rayon = "1.10.0" rayon = "1.10.0"
bevy-inspector-egui = "0.28.1" bevy-inspector-egui = "0.28.1"
bevy_asset_loader = { version = "0.22.0", features = [ bevy_asset_loader = { version = "0.23.0-rc.3", features = [
"standard_dynamic_assets", "standard_dynamic_assets",
"3d", "3d",
] } ] }

2
engine/world_generation/src/tile_manager.rs
View File

@@ -1,5 +1,5 @@
use asset_loader::create_asset_loader; use asset_loader::create_asset_loader;
use bevy::{asset::Asset, ecs::system::Resource, reflect::TypePath}; use bevy::{asset::Asset, reflect::TypePath};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
#[derive(Resource, Debug)] #[derive(Resource, Debug)]
pub struct TileManager { pub struct TileManager {

6
game/buildings/Cargo.toml
View File

@@ -6,15 +6,15 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
bevy = "0.15.1" bevy = "0.16.0"
world_generation = { path = "../../engine/world_generation" } world_generation = { path = "../../engine/world_generation" }
shared = { path = "../shared" } shared = { path = "../shared" }
bevy_rapier3d = "0.28.0" bevy_rapier3d = "0.29.0"
serde = { version = "1.0.204", features = ["derive"] } serde = { version = "1.0.204", features = ["derive"] }
asset_loader = { path = "../../engine/asset_loader" } asset_loader = { path = "../../engine/asset_loader" }
serde_json = "1.0.120" serde_json = "1.0.120"
ron = "0.8.1" ron = "0.8.1"
bevy_asset_loader = { version = "0.22.0", features = [ bevy_asset_loader = { version = "0.23.0-rc.3", features = [
"standard_dynamic_assets", "standard_dynamic_assets",
"3d", "3d",
] } ] }

6
game/main/Cargo.toml
View File

@@ -7,12 +7,12 @@ build = "build.rs"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
bevy = { version = "0.15.1", features = ["file_watcher"] } bevy = { version = "0.16.0", features = ["file_watcher"] }
bevy-inspector-egui = "0.28.1" bevy-inspector-egui = "0.28.1"
# iyes_perf_ui = "0.3.0" # iyes_perf_ui = "0.3.0"
noise = "0.8.2" noise = "0.8.2"
world_generation = { path = "../../engine/world_generation" } world_generation = { path = "../../engine/world_generation" }
bevy_rapier3d = { version = "0.28.0", features = [ bevy_rapier3d = { version = "0.29.0", features = [
"simd-stable", "simd-stable",
"parallel", "parallel",
"debug-render-3d", "debug-render-3d",
@@ -21,7 +21,7 @@ rayon = "1.10.0"
buildings = { path = "../buildings" } buildings = { path = "../buildings" }
units = { path = "../units" } units = { path = "../units" }
shared = { path = "../shared" } shared = { path = "../shared" }
bevy_asset_loader = { version = "0.22.0", features = [ bevy_asset_loader = { version = "0.23.0-rc.3", features = [
"standard_dynamic_assets", "standard_dynamic_assets",
"3d", "3d",
] } ] }

4
game/resources/Cargo.toml
View File

@@ -4,14 +4,14 @@ version = "0.1.0"
edition = "2021" edition = "2021"
[dependencies] [dependencies]
bevy = "0.15.1" bevy = "0.16.0"
world_generation = { path = "../../engine/world_generation" } world_generation = { path = "../../engine/world_generation" }
shared = { path = "../shared" } shared = { path = "../shared" }
serde = { version = "1.0.204", features = ["derive"] } serde = { version = "1.0.204", features = ["derive"] }
asset_loader = { path = "../../engine/asset_loader" } asset_loader = { path = "../../engine/asset_loader" }
serde_json = "1.0.120" serde_json = "1.0.120"
ron = "0.8.1" ron = "0.8.1"
bevy_asset_loader = { version = "0.22.0", features = [ bevy_asset_loader = { version = "0.23.0-rc.3", features = [
"standard_dynamic_assets", "standard_dynamic_assets",
"3d", "3d",
] } ] }

2
game/shared/Cargo.toml
View File

@@ -6,7 +6,7 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
bevy = "0.15.1" bevy = "0.16.0"
serde = { version = "1.0.204", features = ["derive"] } serde = { version = "1.0.204", features = ["derive"] }
world_generation = { path = "../../engine/world_generation" } world_generation = { path = "../../engine/world_generation" }

6
game/units/Cargo.toml
View File

@@ -4,15 +4,15 @@ version = "0.1.0"
edition = "2021" edition = "2021"
[dependencies] [dependencies]
bevy = "0.15.1" bevy = "0.16.0"
world_generation = { path = "../../engine/world_generation" } world_generation = { path = "../../engine/world_generation" }
shared = { path = "../shared" } shared = { path = "../shared" }
bevy_rapier3d = "0.28.0" bevy_rapier3d = "0.29.0"
serde = { version = "1.0.204", features = ["derive"] } serde = { version = "1.0.204", features = ["derive"] }
asset_loader = { path = "../../engine/asset_loader" } asset_loader = { path = "../../engine/asset_loader" }
serde_json = "1.0.120" serde_json = "1.0.120"
ron = "0.8.1" ron = "0.8.1"
bevy_asset_loader = { version = "0.22.0", features = [ bevy_asset_loader = { version = "0.23.0-rc.3", features = [
"standard_dynamic_assets", "standard_dynamic_assets",
"3d", "3d",
] } ] }