feat: update to bevy 14.1, some day it will see release

This commit is contained in:
2024-08-12 22:52:42 +00:00
parent 366d11453b
commit 1defbfc1c9
7 changed files with 373 additions and 114 deletions
+7 -6
View File
@@ -11,12 +11,13 @@ inspector-egui = ["reflect", "dep:bevy-inspector-egui"]
[dependencies]
bevy-inspector-egui = { version = "0.22.1", optional = true }
bevy_app = "0.13.2"
bevy_derive = "0.13.2"
bevy_ecs = "0.13.2"
bevy_input = "0.13.2"
bevy_reflect = { version = "0.12.1", optional = true }
bevy_utils = "0.12.1"
bevy_app = "0.14.1"
bevy_derive = "0.14.1"
bevy_ecs = "0.14.1"
bevy_input = "0.14.1"
bevy_state = "0.14.1"
bevy_reflect = { version = "0.14.1", optional = true }
bevy_utils = "0.14.1"
log = "0.4.20"
serde = { version = "1.0.194", optional = true }
strum = "0.26.2"
+3 -2
View File
@@ -1,8 +1,9 @@
use std::hash::Hash;
use bevy_ecs::{schedule::States, system::Resource};
use bevy_ecs::system::Resource;
#[cfg(feature = "inspector-egui")]
use bevy_inspector_egui::inspector_options::InspectorOptionsType;
use bevy_state::state::{FreelyMutableState, States};
use strum::IntoEnumIterator;
// #[cfg(all(feature = "reflect", feature = "serialize"))]
// use bevy_reflect::{ReflectDeserialize, ReflectSerialize};
@@ -40,7 +41,7 @@ pub trait Action:
// SAFETY: inspector-egui includes reflect
#[supertraits]
pub trait GameState:
'static + std::marker::Sync + std::marker::Send + States + Default + std::fmt::Debug
'static + std::marker::Sync + std::marker::Send + States + Default + std::fmt::Debug + FreelyMutableState
{
}
+2 -1
View File
@@ -1,9 +1,9 @@
use bevy_app::{App, Plugin, PreUpdate};
use bevy_derive::{Deref, DerefMut};
use bevy_ecs::system::{In, IntoSystem};
use bevy_state::app::AppExtStates;
use bevy_ecs::{
event::EventReader,
schedule::State,
system::{Res, ResMut, Resource},
};
use bevy_input::{
@@ -11,6 +11,7 @@ use bevy_input::{
mouse::{MouseButton, MouseMotion, MouseScrollUnit, MouseWheel},
ButtonInput,
};
use bevy_state::state::State;
use bevy_utils::HashMap;
use crate::{