2022-01-05 22:30:15 +00:00
|
|
|
//! Audio support for the game engine Bevy
|
|
|
|
//!
|
2022-07-04 13:04:18 +00:00
|
|
|
//! ```no_run
|
2022-01-05 22:30:15 +00:00
|
|
|
//! # use bevy_ecs::{system::Res, event::EventWriter};
|
|
|
|
//! # use bevy_audio::{Audio, AudioPlugin};
|
|
|
|
//! # use bevy_asset::{AssetPlugin, AssetServer};
|
2022-07-04 13:04:18 +00:00
|
|
|
//! # use bevy_app::{App, AppExit, NoopPluginGroup as MinimalPlugins};
|
2022-01-05 22:30:15 +00:00
|
|
|
//! fn main() {
|
|
|
|
//! App::new()
|
|
|
|
//! .add_plugins(MinimalPlugins)
|
Plugins own their settings. Rework PluginGroup trait. (#6336)
# Objective
Fixes #5884 #2879
Alternative to #2988 #5885 #2886
"Immutable" Plugin settings are currently represented as normal ECS resources, which are read as part of plugin init. This presents a number of problems:
1. If a user inserts the plugin settings resource after the plugin is initialized, it will be silently ignored (and use the defaults instead)
2. Users can modify the plugin settings resource after the plugin has been initialized. This creates a false sense of control over settings that can no longer be changed.
(1) and (2) are especially problematic and confusing for the `WindowDescriptor` resource, but this is a general problem.
## Solution
Immutable Plugin settings now live on each Plugin struct (ex: `WindowPlugin`). PluginGroups have been reworked to support overriding plugin values. This also removes the need for the `add_plugins_with` api, as the `add_plugins` api can use the builder pattern directly. Settings that can be used at runtime continue to be represented as ECS resources.
Plugins are now configured like this:
```rust
app.add_plugin(AssetPlugin {
watch_for_changes: true,
..default()
})
```
PluginGroups are now configured like this:
```rust
app.add_plugins(DefaultPlugins
.set(AssetPlugin {
watch_for_changes: true,
..default()
})
)
```
This is an alternative to #2988, which is similar. But I personally prefer this solution for a couple of reasons:
* ~~#2988 doesn't solve (1)~~ #2988 does solve (1) and will panic in that case. I was wrong!
* This PR directly ties plugin settings to Plugin types in a 1:1 relationship, rather than a loose "setup resource" <-> plugin coupling (where the setup resource is consumed by the first plugin that uses it).
* I'm not a huge fan of overloading the ECS resource concept and implementation for something that has very different use cases and constraints.
## Changelog
- PluginGroups can now be configured directly using the builder pattern. Individual plugin values can be overridden by using `plugin_group.set(SomePlugin {})`, which enables overriding default plugin values.
- `WindowDescriptor` plugin settings have been moved to `WindowPlugin` and `AssetServerSettings` have been moved to `AssetPlugin`
- `app.add_plugins_with` has been replaced by using `add_plugins` with the builder pattern.
## Migration Guide
The `WindowDescriptor` settings have been moved from a resource to `WindowPlugin::window`:
```rust
// Old (Bevy 0.8)
app
.insert_resource(WindowDescriptor {
width: 400.0,
..default()
})
.add_plugins(DefaultPlugins)
// New (Bevy 0.9)
app.add_plugins(DefaultPlugins.set(WindowPlugin {
window: WindowDescriptor {
width: 400.0,
..default()
},
..default()
}))
```
The `AssetServerSettings` resource has been removed in favor of direct `AssetPlugin` configuration:
```rust
// Old (Bevy 0.8)
app
.insert_resource(AssetServerSettings {
watch_for_changes: true,
..default()
})
.add_plugins(DefaultPlugins)
// New (Bevy 0.9)
app.add_plugins(DefaultPlugins.set(AssetPlugin {
watch_for_changes: true,
..default()
}))
```
`add_plugins_with` has been replaced by `add_plugins` in combination with the builder pattern:
```rust
// Old (Bevy 0.8)
app.add_plugins_with(DefaultPlugins, |group| group.disable::<AssetPlugin>());
// New (Bevy 0.9)
app.add_plugins(DefaultPlugins.build().disable::<AssetPlugin>());
```
2022-10-24 21:20:33 +00:00
|
|
|
//! .add_plugin(AssetPlugin::default())
|
2022-01-05 22:30:15 +00:00
|
|
|
//! .add_plugin(AudioPlugin)
|
|
|
|
//! .add_startup_system(play_background_audio)
|
|
|
|
//! .run();
|
|
|
|
//! }
|
|
|
|
//!
|
|
|
|
//! fn play_background_audio(asset_server: Res<AssetServer>, audio: Res<Audio>) {
|
|
|
|
//! audio.play(asset_server.load("background_audio.ogg"));
|
|
|
|
//! }
|
|
|
|
//! ```
|
|
|
|
|
|
|
|
#![forbid(unsafe_code)]
|
|
|
|
#![warn(missing_docs)]
|
|
|
|
|
2020-10-20 18:44:50 +00:00
|
|
|
mod audio;
|
2020-07-16 20:46:51 +00:00
|
|
|
mod audio_output;
|
|
|
|
mod audio_source;
|
|
|
|
|
2022-01-05 22:30:15 +00:00
|
|
|
#[allow(missing_docs)]
|
2020-07-17 02:20:51 +00:00
|
|
|
pub mod prelude {
|
2022-11-02 20:40:45 +00:00
|
|
|
#[doc(hidden)]
|
2022-04-08 23:12:30 +00:00
|
|
|
pub use crate::{Audio, AudioOutput, AudioSource, Decodable, PlaybackSettings};
|
2020-07-17 02:20:51 +00:00
|
|
|
}
|
|
|
|
|
2021-02-18 21:20:37 +00:00
|
|
|
pub use audio::*;
|
|
|
|
pub use audio_output::*;
|
|
|
|
pub use audio_source::*;
|
2023-01-17 22:42:00 +00:00
|
|
|
|
2022-10-27 12:34:38 +00:00
|
|
|
pub use rodio::cpal::Sample as CpalSample;
|
|
|
|
pub use rodio::source::Source;
|
|
|
|
pub use rodio::Sample;
|
2021-02-18 21:20:37 +00:00
|
|
|
|
2020-07-17 01:47:51 +00:00
|
|
|
use bevy_app::prelude::*;
|
2023-01-17 22:42:00 +00:00
|
|
|
use bevy_asset::{AddAsset, Asset};
|
2020-07-16 20:46:51 +00:00
|
|
|
|
2022-01-05 22:30:15 +00:00
|
|
|
/// Adds support for audio playback to a Bevy Application
|
|
|
|
///
|
|
|
|
/// Use the [`Audio`] resource to play audio.
|
2020-07-16 20:46:51 +00:00
|
|
|
#[derive(Default)]
|
|
|
|
pub struct AudioPlugin;
|
|
|
|
|
2020-08-08 03:22:17 +00:00
|
|
|
impl Plugin for AudioPlugin {
|
2021-07-27 20:21:06 +00:00
|
|
|
fn build(&self, app: &mut App) {
|
2022-12-11 18:10:00 +00:00
|
|
|
app.init_resource::<AudioOutput<AudioSource>>()
|
2020-07-16 20:46:51 +00:00
|
|
|
.add_asset::<AudioSource>()
|
2022-03-01 01:12:11 +00:00
|
|
|
.add_asset::<AudioSink>()
|
2020-10-20 18:44:50 +00:00
|
|
|
.init_resource::<Audio<AudioSource>>()
|
2020-12-16 05:57:16 +00:00
|
|
|
.add_system_to_stage(
|
2021-02-18 21:20:37 +00:00
|
|
|
CoreStage::PostUpdate,
|
2022-04-25 14:32:56 +00:00
|
|
|
play_queued_audio_system::<AudioSource>,
|
2020-12-16 05:57:16 +00:00
|
|
|
);
|
2021-06-03 19:58:08 +00:00
|
|
|
|
|
|
|
#[cfg(any(feature = "mp3", feature = "flac", feature = "wav", feature = "vorbis"))]
|
2022-01-05 22:30:15 +00:00
|
|
|
app.init_asset_loader::<AudioLoader>();
|
2020-07-16 20:46:51 +00:00
|
|
|
}
|
|
|
|
}
|
2023-01-17 22:42:00 +00:00
|
|
|
|
|
|
|
impl AddAudioSource for App {
|
|
|
|
fn add_audio_source<T>(&mut self) -> &mut Self
|
|
|
|
where
|
|
|
|
T: Decodable + Asset,
|
|
|
|
{
|
|
|
|
self.add_asset::<T>()
|
|
|
|
.init_resource::<Audio<T>>()
|
|
|
|
.init_non_send_resource::<AudioOutput<T>>()
|
|
|
|
.add_system_to_stage(CoreStage::PostUpdate, play_queued_audio_system::<T>)
|
|
|
|
}
|
|
|
|
}
|