Update to Bevy 0.11.

This commit is contained in:
Nolan Darilek 2023-09-08 16:12:35 -05:00
parent 45ab161f22
commit 96b7dcb091
13 changed files with 66 additions and 82 deletions

View File

@ -13,7 +13,7 @@ speech_dispatcher_0_10 = ["bevy_tts/speech_dispatcher_0_10"]
speech_dispatcher_0_11 = ["bevy_tts/speech_dispatcher_0_11"] speech_dispatcher_0_11 = ["bevy_tts/speech_dispatcher_0_11"]
[dependencies.bevy] [dependencies.bevy]
version = "0.10" version = "0.11"
default-features = false default-features = false
features = [ features = [
"bevy_gilrs", "bevy_gilrs",
@ -24,14 +24,13 @@ features = [
] ]
[dependencies] [dependencies]
bevy_rapier2d = "0.21" bevy_rapier2d = "0.22"
bevy_synthizer = "0.3" bevy_synthizer = "0.4"
bevy_tts = { version = "0.5", default-features = false, features = ["tolk"] } bevy_tts = { version = "0.6", default-features = false, features = ["tolk"] }
coord_2d = "0.3" coord_2d = "0.3"
futures-lite = "1" futures-lite = "1"
gilrs = "0.10"
here_be_dragons = { version = "0.3", features = ["serde"] } here_be_dragons = { version = "0.3", features = ["serde"] }
leafwing-input-manager = { git = "https://github.com/ndarilek/leafwing-input-manager", branch = "consume" } leafwing-input-manager = "0.10"
maze_generator = "2" maze_generator = "2"
once_cell = "1" once_cell = "1"
pathfinding = "4" pathfinding = "4"

View File

@ -678,11 +678,11 @@ impl Plugin for CorePlugin {
}; };
app.insert_resource(config) app.insert_resource(config)
.register_type::<CardinalDirection>() .register_type::<CardinalDirection>()
.add_plugin(RapierPhysicsPlugin::<NoUserData>::pixels_per_meter( .add_plugins(RapierPhysicsPlugin::<NoUserData>::pixels_per_meter(
config.pixels_per_unit as f32, config.pixels_per_unit as f32,
)) ))
.add_startup_system(setup) .add_systems(Startup, setup)
.add_system(sync_config); .add_systems(Update, sync_config);
} }
} }

View File

@ -13,7 +13,7 @@ use crate::{
visibility::{RevealedTiles, Viewshed, Visible, VisibleEntities}, visibility::{RevealedTiles, Viewshed, Visible, VisibleEntities},
}; };
#[derive(Actionlike, PartialEq, Eq, Clone, Copy, Hash, Debug)] #[derive(Actionlike, PartialEq, Eq, Clone, Copy, Hash, Debug, Reflect)]
pub enum ExplorationAction { pub enum ExplorationAction {
Forward, Forward,
Backward, Backward,
@ -49,7 +49,7 @@ where
#[reflect(Component)] #[reflect(Component)]
pub struct Mappable; pub struct Mappable;
fn exploration_type_change<ExplorationType, State>( fn exploration_type_change<ExplorationType>(
mut tts: ResMut<Tts>, mut tts: ResMut<Tts>,
mut explorers: Query<( mut explorers: Query<(
&ActionState<ExplorationAction>, &ActionState<ExplorationAction>,
@ -60,7 +60,6 @@ fn exploration_type_change<ExplorationType, State>(
) -> Result<(), Box<dyn Error>> ) -> Result<(), Box<dyn Error>>
where where
ExplorationType: Component + Default + Copy + Ord, ExplorationType: Component + Default + Copy + Ord,
State: 'static + Clone + Debug + Eq + Hash + Send + Sync,
{ {
for (actions, visible, mut focused) in &mut explorers { for (actions, visible, mut focused) in &mut explorers {
let mut types: Vec<ExplorationType> = vec![]; let mut types: Vec<ExplorationType> = vec![];
@ -112,7 +111,7 @@ where
Ok(()) Ok(())
} }
fn exploration_type_focus<ExplorationType, State>( fn exploration_type_focus<ExplorationType>(
mut commands: Commands, mut commands: Commands,
mut tts: ResMut<Tts>, mut tts: ResMut<Tts>,
explorers: Query<( explorers: Query<(
@ -126,7 +125,6 @@ fn exploration_type_focus<ExplorationType, State>(
) -> Result<(), Box<dyn Error>> ) -> Result<(), Box<dyn Error>>
where where
ExplorationType: Component + Default + PartialEq, ExplorationType: Component + Default + PartialEq,
State: 'static + Clone + Debug + Eq + Hash + Send + Sync,
{ {
for (entity, actions, visible_entities, focused_type, exploring) in &explorers { for (entity, actions, visible_entities, focused_type, exploring) in &explorers {
let mut features = features let mut features = features
@ -202,7 +200,7 @@ where
Ok(()) Ok(())
} }
fn exploration_focus<State, MapData>( fn exploration_focus<MapData>(
mut commands: Commands, mut commands: Commands,
map: Query<&Map<MapData>>, map: Query<&Map<MapData>>,
explorers: Query< explorers: Query<
@ -215,7 +213,6 @@ fn exploration_focus<State, MapData>(
With<Player>, With<Player>,
>, >,
) where ) where
State: 'static + Clone + Debug + Eq + Hash + Send + Sync,
MapData: 'static + Clone + Default + Send + Sync, MapData: 'static + Clone + Default + Send + Sync,
{ {
for (entity, actions, transform, exploring) in &explorers { for (entity, actions, transform, exploring) in &explorers {
@ -252,12 +249,11 @@ fn exploration_focus<State, MapData>(
} }
} }
fn navigate_to_explored<State, MapData>( fn navigate_to_explored<MapData>(
mut commands: Commands, mut commands: Commands,
map: Query<(&Map<MapData>, &RevealedTiles)>, map: Query<(&Map<MapData>, &RevealedTiles)>,
explorers: Query<(Entity, &ActionState<ExplorationAction>, &Exploring)>, explorers: Query<(Entity, &ActionState<ExplorationAction>, &Exploring)>,
) where ) where
State: 'static + Clone + Debug + Eq + Hash + Send + Sync,
MapData: 'static + Clone + Default + Send + Sync, MapData: 'static + Clone + Default + Send + Sync,
{ {
for (entity, actions, exploring) in &explorers { for (entity, actions, exploring) in &explorers {
@ -400,31 +396,32 @@ where
.register_type::<ExplorationFocused>() .register_type::<ExplorationFocused>()
.register_type::<Mappable>() .register_type::<Mappable>()
.register_type::<Explorable>() .register_type::<Explorable>()
.add_plugin(InputManagerPlugin::<ExplorationAction>::default()) .add_plugins(InputManagerPlugin::<ExplorationAction>::default())
.add_systems( .add_systems(
Update,
( (
exploration_type_change::<ExplorationType, State>.pipe(error_handler), exploration_type_change::<ExplorationType>.pipe(error_handler),
exploration_type_changed_announcement::<ExplorationType>.pipe(error_handler), exploration_type_changed_announcement::<ExplorationType>.pipe(error_handler),
) )
.chain() .chain()
.in_set(Exploration), .in_set(Exploration),
) )
.add_systems( .add_systems(
Update,
( (
exploration_focus::<State, MapData>, exploration_focus::<MapData>,
exploration_type_focus::<ExplorationType, State>.pipe(error_handler), exploration_type_focus::<ExplorationType>.pipe(error_handler),
exploration_changed_announcement::<ExplorationType, MapData> exploration_changed_announcement::<ExplorationType, MapData>
.pipe(error_handler), .pipe(error_handler),
) )
.chain() .chain()
.in_set(Exploration), .in_set(Exploration),
) )
.add_system(navigate_to_explored::<State, MapData>.in_set(Exploration)); .add_systems(Update, navigate_to_explored::<MapData>.in_set(Exploration));
if !config.states.is_empty() { if !config.states.is_empty() {
let states = config.states; let states = config.states;
for state in states { for state in states {
app.configure_set(Exploration.in_set(OnUpdate(state.clone()))) app.add_systems(OnExit(state), cleanup);
.add_system(cleanup.in_schedule(OnExit(state)));
} }
} }
} }

View File

@ -12,7 +12,6 @@ pub mod core;
pub mod error; pub mod error;
pub mod exploration; pub mod exploration;
pub use futures_lite; pub use futures_lite;
pub use gilrs;
pub use here_be_dragons as mapgen; pub use here_be_dragons as mapgen;
pub use leafwing_input_manager; pub use leafwing_input_manager;
pub mod log; pub mod log;

View File

@ -60,11 +60,7 @@ pub struct LogPlugin;
impl Plugin for LogPlugin { impl Plugin for LogPlugin {
fn build(&self, app: &mut App) { fn build(&self, app: &mut App) {
app.register_type::<LogEntry>() app.register_type::<LogEntry>()
.add_startup_system(setup) .add_systems(Startup, setup)
.add_system( .add_systems(PostUpdate, read_log.pipe(error_handler));
read_log
.pipe(error_handler)
.in_base_set(CoreSet::PostUpdate),
);
} }
} }

View File

@ -329,12 +329,12 @@ impl<MapData: 'static + Clone + Default + Send + Sync> Plugin for MapPlugin<MapD
app.insert_resource(self.clone()) app.insert_resource(self.clone())
.register_type::<Portal>() .register_type::<Portal>()
.add_systems( .add_systems(
PreUpdate,
( (
spawn_colliders::<MapData>, spawn_colliders::<MapData>,
spawn_portals::<MapData>, spawn_portals::<MapData>,
spawn_portal_colliders::<MapData>, spawn_portal_colliders::<MapData>,
) ),
.in_base_set(CoreSet::PreUpdate),
); );
} }
} }

View File

@ -13,7 +13,7 @@ use crate::{
utils::target_and_other, utils::target_and_other,
}; };
#[derive(Actionlike, PartialEq, Eq, Clone, Copy, Hash, Debug)] #[derive(Actionlike, PartialEq, Eq, Clone, Copy, Hash, Debug, Reflect)]
pub enum NavigationAction { pub enum NavigationAction {
Move, Move,
Translate, Translate,
@ -415,21 +415,21 @@ where
.register_type::<StrafeMovementFactor>() .register_type::<StrafeMovementFactor>()
.register_type::<RotationSpeed>() .register_type::<RotationSpeed>()
.register_type::<Speed>() .register_type::<Speed>()
.add_plugin(InputManagerPlugin::<NavigationAction>::default()) .add_plugins(InputManagerPlugin::<NavigationAction>::default())
.add_systems((update_direction, add_speed).in_base_set(CoreSet::PreUpdate)) .add_systems(PreUpdate, (update_direction, add_speed))
.add_systems( .add_systems(
Update,
(snap.pipe(error_handler), controls) (snap.pipe(error_handler), controls)
.chain() .chain()
.in_set(Movement), .in_set(Movement),
) )
.add_systems((tick_snap_timers, speak_direction.pipe(error_handler)))
.add_systems( .add_systems(
(remove_direction, log_area_descriptions::<State>).in_base_set(CoreSet::PostUpdate), Update,
(tick_snap_timers, speak_direction.pipe(error_handler)),
)
.add_systems(
PostUpdate,
(remove_direction, log_area_descriptions::<State>),
); );
if !self.states.is_empty() {
for state in &self.states {
app.configure_set(Movement.in_set(OnUpdate(state.clone())));
}
}
} }
} }

View File

@ -19,7 +19,7 @@ use crate::{
navigation::{NavigationAction, RotationSpeed}, navigation::{NavigationAction, RotationSpeed},
}; };
#[derive(PartialEq, Eq, Clone, Copy, Hash, Debug)] #[derive(PartialEq, Eq, Clone, Copy, Hash, Debug, Reflect)]
pub struct NegotiatePathAction; pub struct NegotiatePathAction;
impl Actionlike for NegotiatePathAction { impl Actionlike for NegotiatePathAction {
@ -404,18 +404,18 @@ pub struct PathfindingPlugin;
impl Plugin for PathfindingPlugin { impl Plugin for PathfindingPlugin {
fn build(&self, app: &mut App) { fn build(&self, app: &mut App) {
app.add_plugin(InputManagerPlugin::<NegotiatePathAction>::default()) app.add_plugins(InputManagerPlugin::<NegotiatePathAction>::default())
.register_type::<Destination>() .register_type::<Destination>()
.register_type::<NoPath>() .register_type::<NoPath>()
.register_type::<Path>() .register_type::<Path>()
.register_type::<CostMap>() .register_type::<CostMap>()
.add_systems((negotiate_path, poll_tasks).in_base_set(CoreSet::PreUpdate)) .add_systems(PreUpdate, (negotiate_path, poll_tasks))
.add_systems( .add_systems(
PreUpdate,
(actions, calculate_path) (actions, calculate_path)
.chain() .chain()
.in_base_set(CoreSet::PreUpdate)
.after(InputManagerSystem::Tick), .after(InputManagerSystem::Tick),
) )
.add_system(remove_destination.in_base_set(CoreSet::PostUpdate)); .add_systems(PostUpdate, remove_destination);
} }
} }

View File

@ -127,11 +127,9 @@ pub struct FootstepPlugin;
impl Plugin for FootstepPlugin { impl Plugin for FootstepPlugin {
fn build(&self, app: &mut App) { fn build(&self, app: &mut App) {
app.add_system(added.in_base_set(CoreSet::PreUpdate)) app.add_systems(PreUpdate, added).add_systems(
.add_system( PostUpdate,
update update.after(TransformSystem::TransformPropagate),
.after(TransformSystem::TransformPropagate)
.in_base_set(CoreSet::PostUpdate),
); );
} }
} }

View File

@ -43,7 +43,7 @@ fn added(mut commands: Commands, icons: Query<(Entity, &SoundIcon), Added<SoundI
let pitch = icon.pitch; let pitch = icon.pitch;
let looping = icon.interval.is_none(); let looping = icon.interval.is_none();
commands.entity(entity).insert(Sound { commands.entity(entity).insert(Sound {
audio: buffer.into(), audio: buffer,
gain, gain,
pitch, pitch,
looping, looping,
@ -68,7 +68,7 @@ fn update<S>(
) where ) where
S: States, S: States,
{ {
if !config.states.is_empty() && !config.states.contains(&state.0) { if !config.states.is_empty() && !config.states.contains(state.get()) {
return; return;
} }
for visible in &viewers { for visible in &viewers {
@ -93,9 +93,8 @@ fn update<S>(
} }
} }
let buffer = icon.audio.clone(); let buffer = icon.audio.clone();
let audio: Audio = buffer.into(); if sound.audio != buffer {
if sound.audio != audio { sound.audio = buffer;
sound.audio = audio;
} }
sound.gain = icon.gain; sound.gain = icon.gain;
sound.pitch = icon.pitch; sound.pitch = icon.pitch;
@ -197,16 +196,11 @@ where
{ {
fn build(&self, app: &mut App) { fn build(&self, app: &mut App) {
app.insert_resource(self.clone()) app.insert_resource(self.clone())
.add_systems((added, reset_timer_on_visibility_gain).in_base_set(CoreSet::PreUpdate)) .add_systems(PreUpdate, (added, reset_timer_on_visibility_gain))
.add_systems(PreUpdate, (exploration_focus_changed, update::<S>).chain())
.add_systems( .add_systems(
(exploration_focus_changed, update::<S>) PostUpdate,
.chain() exploration_focus_removed.after(exploration_focus_changed),
.in_base_set(CoreSet::PreUpdate),
)
.add_system(
exploration_focus_removed
.in_base_set(CoreSet::PostUpdate)
.after(exploration_focus_changed),
); );
} }
} }

View File

@ -154,8 +154,11 @@ impl Plugin for PitchShiftPlugin {
.register_type::<Behind>() .register_type::<Behind>()
.init_resource::<LastIconPitch>() .init_resource::<LastIconPitch>()
.init_resource::<LastSoundPitch>() .init_resource::<LastSoundPitch>()
.add_system(tag_behind.in_base_set(CoreSet::PreUpdate)) .add_systems(PreUpdate, tag_behind)
.add_systems((behind_added, sound_icon_changed, sound_changed, sync_config)) .add_systems(
.add_system(behind_removed.in_base_set(CoreSet::PostUpdate)); Update,
(behind_added, sound_icon_changed, sound_changed, sync_config),
)
.add_systems(PostUpdate, behind_removed);
} }
} }

View File

@ -56,11 +56,10 @@ pub struct VolumetricPlugin;
impl Plugin for VolumetricPlugin { impl Plugin for VolumetricPlugin {
fn build(&self, app: &mut App) { fn build(&self, app: &mut App) {
app.register_type::<Volumetric>() app.register_type::<Volumetric>()
.add_system( .add_systems(
update PostUpdate,
.in_base_set(CoreSet::PostUpdate) update.before(TransformSystem::TransformPropagate),
.before(TransformSystem::TransformPropagate),
) )
.add_system(removed.in_base_set(CoreSet::PostUpdate)); .add_systems(PostUpdate, removed);
} }
} }

View File

@ -233,6 +233,7 @@ impl ViewshedBundle {
} }
} }
#[derive(Event)]
pub enum VisibilityChanged { pub enum VisibilityChanged {
Gained { viewer: Entity, viewed: Entity }, Gained { viewer: Entity, viewed: Entity },
Lost { viewer: Entity, viewed: Entity }, Lost { viewer: Entity, viewed: Entity },
@ -441,15 +442,13 @@ impl<MapData: 'static + Clone + Default + Send + Sync> Plugin for VisibilityPlug
fn build(&self, app: &mut App) { fn build(&self, app: &mut App) {
app.add_event::<VisibilityChanged>() app.add_event::<VisibilityChanged>()
.add_systems( .add_systems(
PreUpdate,
( (
add_visibility_indices::<MapData>, add_visibility_indices::<MapData>,
update_viewshed, update_viewshed,
update_revealed_tiles::<MapData>, update_revealed_tiles::<MapData>,
),
) )
.in_base_set(CoreSet::PreUpdate), .add_systems(PostUpdate, (log_visible, viewshed_removed, remove_visible));
)
.add_systems(
(log_visible, viewshed_removed, remove_visible).in_base_set(CoreSet::PostUpdate),
);
} }
} }