Merge branch 'bevyengine:main' into main

bevyengine · Jul 16, 2023 · 6668f08 · 6668f08
2 parents 99c53c4 + a30da00
commit 6668f08
Show file tree

Hide file tree

Showing 139 changed files with 2,528 additions and 1,509 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy"
-version = "0.11.0-dev"
+version = "0.12.0-dev"
 edition = "2021"
 categories = ["game-engines", "graphics", "gui", "rendering"]
 description = "A refreshingly simple data-driven game engine and app framework"
@@ -44,6 +44,7 @@ default = [
  "bevy_sprite",
  "bevy_text",
  "bevy_ui",
+ "multi-threaded",
  "png",
  "hdr",
  "ktx2",
@@ -199,6 +200,9 @@ filesystem_watcher = ["bevy_internal/filesystem_watcher"]
 # Enable serialization support through serde
 serialize = ["bevy_internal/serialize"]
 
+# Enables multithreaded parallelism in the engine. Disabling it forces all engine tasks to run on a single thread.
+multi-threaded = ["bevy_internal/multi-threaded"]
+
 # Wayland display server support
 wayland = ["bevy_internal/wayland"]
 
@@ -245,8 +249,8 @@ shader_format_spirv = ["bevy_internal/shader_format_spirv"]
 webgl2 = ["bevy_internal/webgl"]
 
 [dependencies]
-bevy_dylib = { path = "crates/bevy_dylib", version = "0.11.0-dev", default-features = false, optional = true }
-bevy_internal = { path = "crates/bevy_internal", version = "0.11.0-dev", default-features = false }
+bevy_dylib = { path = "crates/bevy_dylib", version = "0.12.0-dev", default-features = false, optional = true }
+bevy_internal = { path = "crates/bevy_internal", version = "0.12.0-dev", default-features = false }
 
 [dev-dependencies]
 anyhow = "1.0.4"

diff --git a/README.md b/README.md
@@ -87,7 +87,7 @@ Bevy can be built just fine using default configuration on stable Rust. However
 
 Bevy is only possible because of the hard work put into these foundational technologies:
 
-* [wgpu](https://wgpu.rs/): modern / low-level / cross-platform graphics library inspired by Vulkan
+* [wgpu](https://wgpu.rs/): modern / low-level / cross-platform graphics library based on the [WebGPU](https://gpuweb.github.io/gpuweb/) API.
 * [glam-rs](https://github.com/bitshifter/glam-rs): a simple and fast 3D math library for games and graphics
 * [winit](https://github.com/rust-windowing/winit): cross-platform window creation and management in Rust
 

diff --git a/crates/bevy_a11y/Cargo.toml b/crates/bevy_a11y/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_a11y"
-version = "0.11.0-dev"
+version = "0.12.0-dev"
 edition = "2021"
 description = "Provides accessibility support for Bevy Engine"
 homepage = "https://bevyengine.org"
@@ -10,8 +10,8 @@ keywords = ["bevy", "accessibility", "a11y"]
 
 [dependencies]
 # bevy
-bevy_app = { path = "../bevy_app", version = "0.11.0-dev" }
-bevy_derive = { path = "../bevy_derive", version = "0.11.0-dev" }
-bevy_ecs = { path = "../bevy_ecs", version = "0.11.0-dev" }
+bevy_app = { path = "../bevy_app", version = "0.12.0-dev" }
+bevy_derive = { path = "../bevy_derive", version = "0.12.0-dev" }
+bevy_ecs = { path = "../bevy_ecs", version = "0.12.0-dev" }
 
-accesskit = "0.10"
+accesskit = "0.11"
diff --git a/crates/bevy_animation/Cargo.toml b/crates/bevy_animation/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_animation"
-version = "0.11.0-dev"
+version = "0.12.0-dev"
 edition = "2021"
 description = "Provides animation functionality for Bevy Engine"
 homepage = "https://bevyengine.org"
@@ -10,14 +10,14 @@ keywords = ["bevy"]
 
 [dependencies]
 # bevy
-bevy_app = { path = "../bevy_app", version = "0.11.0-dev" }
-bevy_asset = { path = "../bevy_asset", version = "0.11.0-dev" }
-bevy_core = { path = "../bevy_core", version = "0.11.0-dev" }
-bevy_math = { path = "../bevy_math", version = "0.11.0-dev" }
-bevy_reflect = { path = "../bevy_reflect", version = "0.11.0-dev", features = ["bevy"] }
-bevy_render = { path = "../bevy_render", version = "0.11.0-dev" }
-bevy_time = { path = "../bevy_time", version = "0.11.0-dev" }
-bevy_utils = { path = "../bevy_utils", version = "0.11.0-dev" }
-bevy_ecs = { path = "../bevy_ecs", version = "0.11.0-dev" }
-bevy_transform = { path = "../bevy_transform", version = "0.11.0-dev" }
-bevy_hierarchy = { path = "../bevy_hierarchy", version = "0.11.0-dev" }
+bevy_app = { path = "../bevy_app", version = "0.12.0-dev" }
+bevy_asset = { path = "../bevy_asset", version = "0.12.0-dev" }
+bevy_core = { path = "../bevy_core", version = "0.12.0-dev" }
+bevy_math = { path = "../bevy_math", version = "0.12.0-dev" }
+bevy_reflect = { path = "../bevy_reflect", version = "0.12.0-dev", features = ["bevy"] }
+bevy_render = { path = "../bevy_render", version = "0.12.0-dev" }
+bevy_time = { path = "../bevy_time", version = "0.12.0-dev" }
+bevy_utils = { path = "../bevy_utils", version = "0.12.0-dev" }
+bevy_ecs = { path = "../bevy_ecs", version = "0.12.0-dev" }
+bevy_transform = { path = "../bevy_transform", version = "0.12.0-dev" }
+bevy_hierarchy = { path = "../bevy_hierarchy", version = "0.12.0-dev" }
diff --git a/crates/bevy_app/Cargo.toml b/crates/bevy_app/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_app"
-version = "0.11.0-dev"
+version = "0.12.0-dev"
 edition = "2021"
 description = "Provides core App functionality for Bevy Engine"
 homepage = "https://bevyengine.org"
@@ -16,11 +16,11 @@ bevy_reflect = ["dep:bevy_reflect", "bevy_ecs/bevy_reflect"]
 
 [dependencies]
 # bevy
-bevy_derive = { path = "../bevy_derive", version = "0.11.0-dev" }
-bevy_ecs = { path = "../bevy_ecs", version = "0.11.0-dev", default-features = false }
-bevy_reflect = { path = "../bevy_reflect", version = "0.11.0-dev", optional = true }
-bevy_utils = { path = "../bevy_utils", version = "0.11.0-dev" }
-bevy_tasks = { path = "../bevy_tasks", version = "0.11.0-dev" }
+bevy_derive = { path = "../bevy_derive", version = "0.12.0-dev" }
+bevy_ecs = { path = "../bevy_ecs", version = "0.12.0-dev", default-features = false }
+bevy_reflect = { path = "../bevy_reflect", version = "0.12.0-dev", optional = true }
+bevy_utils = { path = "../bevy_utils", version = "0.12.0-dev" }
+bevy_tasks = { path = "../bevy_tasks", version = "0.12.0-dev" }
 
 # other
 serde = { version = "1.0", features = ["derive"], optional = true }

diff --git a/crates/bevy_app/src/app.rs b/crates/bevy_app/src/app.rs
@@ -1,4 +1,4 @@
-use crate::{First, Main, MainSchedulePlugin, Plugin, Plugins, Startup, StateTransition, Update};
+use crate::{First, Main, MainSchedulePlugin, Plugin, Plugins, StateTransition};
 pub use bevy_derive::AppLabel;
 use bevy_ecs::{
  prelude::*,
@@ -328,7 +328,7 @@ impl App {
 
  /// Adds [`State<S>`] and [`NextState<S>`] resources, [`OnEnter`] and [`OnExit`] schedules
  /// for each state variant (if they don't already exist), an instance of [`apply_state_transition::<S>`] in
- /// [`StateTransition`] so that transitions happen before [`Update`] and
+ /// [`StateTransition`] so that transitions happen before [`Update`](crate::Update) and
  /// a instance of [`run_enter_schedule::<S>`] in [`StateTransition`] with a
  /// [`run_once`](`run_once_condition`) condition to run the on enter schedule of the
  /// initial state.
@@ -357,30 +357,6 @@ impl App {
  self
  }
 
- /// Adds a system to the default system set and schedule of the app's [`Schedules`].
- ///
- /// Refer to the [system module documentation](bevy_ecs::system) to see how a system
- /// can be defined.
- ///
- /// # Examples
- ///
- /// ```
- /// # use bevy_app::prelude::*;
- /// # use bevy_ecs::prelude::*;
- /// #
- /// # fn my_system() {}
- /// # let mut app = App::new();
- /// #
- /// app.add_system(my_system);
- /// ```
- #[deprecated(
- since = "0.11.0",
- note = "Please use `add_systems` instead. If you didn't change the default base set, you should use `add_systems(Update, your_system).`"
- )]
- pub fn add_system<M>(&mut self, system: impl IntoSystemConfigs<M>) -> &mut Self {
- self.add_systems(Update, system)
- }
-
  /// Adds a system to the given schedule in this app's [`Schedules`].
  ///
  /// # Examples
@@ -416,59 +392,6 @@ impl App {
  self
  }
 
- /// Adds a system to [`Startup`].
- ///
- /// These systems will run exactly once, at the start of the [`App`]'s lifecycle.
- /// To add a system that runs every frame, see [`add_system`](Self::add_system).
- ///
- /// # Examples
- ///
- /// ```
- /// # use bevy_app::prelude::*;
- /// # use bevy_ecs::prelude::*;
- /// #
- /// fn my_startup_system(_commands: Commands) {
- /// println!("My startup system");
- /// }
- ///
- /// App::new()
- /// .add_systems(Startup, my_startup_system);
- /// ```
- #[deprecated(
- since = "0.11.0",
- note = "Please use `add_systems` instead. If you didn't change the default base set, you should use `add_systems(Startup, your_system).`"
- )]
- pub fn add_startup_system<M>(&mut self, system: impl IntoSystemConfigs<M>) -> &mut Self {
- self.add_systems(Startup, system)
- }
-
- /// Adds a collection of systems to [`Startup`].
- ///
- /// # Examples
- ///
- /// ```
- /// # use bevy_app::prelude::*;
- /// # use bevy_ecs::prelude::*;
- /// #
- /// # let mut app = App::new();
- /// # fn startup_system_a() {}
- /// # fn startup_system_b() {}
- /// # fn startup_system_c() {}
- /// #
- /// app.add_systems(Startup, (
- /// startup_system_a,
- /// startup_system_b,
- /// startup_system_c,
- /// ));
- /// ```
- #[deprecated(
- since = "0.11.0",
- note = "Please use `add_systems` instead. If you didn't change the default base set, you should use `add_systems(Startup, your_system).`"
- )]
- pub fn add_startup_systems<M>(&mut self, systems: impl IntoSystemConfigs<M>) -> &mut Self {
- self.add_systems(Startup, systems.into_configs())
- }
-
  /// Configures a system set in the default schedule, adding the set if it does not exist.
  pub fn configure_set(
  &mut self,
@@ -656,43 +579,7 @@ impl App {
  self
  }
 
- /// Adds a single [`Plugin`].
- ///
- /// One of Bevy's core principles is modularity. All Bevy engine features are implemented
- /// as [`Plugin`]s. This includes internal features like the renderer.
- ///
- /// Bevy also provides a few sets of default [`Plugin`]s. See [`add_plugins`](Self::add_plugins).
- ///
- /// # Examples
- ///
- /// ```
- /// # use bevy_app::prelude::*;
- /// #
- /// # // Dummies created to avoid using `bevy_log`,
- /// # // which pulls in too many dependencies and breaks rust-analyzer
- /// # pub mod bevy_log {
- /// # use bevy_app::prelude::*;
- /// # #[derive(Default)]
- /// # pub struct LogPlugin;
- /// # impl Plugin for LogPlugin{
- /// # fn build(&self, app: &mut App) {}
- /// # }
- /// # }
- /// App::new().add_plugin(bevy_log::LogPlugin::default());
- /// ```
- ///
- /// # Panics
- ///
- /// Panics if the plugin was already added to the application.
- #[deprecated(since = "0.11.0", note = "Please use `add_plugins` instead.")]
- pub fn add_plugin<T>(&mut self, plugin: T) -> &mut Self
- where
- T: Plugin,
- {
- self.add_plugins(plugin)
- }
-
- /// Boxed variant of [`add_plugin`](App::add_plugin) that can be used from a
+ /// Boxed variant of [`add_plugins`](App::add_plugins) that can be used from a
  /// [`PluginGroup`](super::PluginGroup)
  pub(crate) fn add_boxed_plugin(
  &mut self,

diff --git a/crates/bevy_app/src/main_schedule.rs b/crates/bevy_app/src/main_schedule.rs
@@ -48,7 +48,7 @@ pub struct First;
 
 /// The schedule that contains logic that must run before [`Update`]. For example, a system that reads raw keyboard
 /// input OS events into an `Events` resource. This enables systems in [`Update`] to consume the events from the `Events`
-/// resource without actually knowing about (or taking a direct scheduler dependency on) the "os-level keyboard event sytsem".
+/// resource without actually knowing about (or taking a direct scheduler dependency on) the "os-level keyboard event system".
 ///
 /// [`PreUpdate`] exists to do "engine/plugin preparation work" that ensures the APIs consumed in [`Update`] are "ready".
 /// [`PreUpdate`] abstracts out "pre work implementation details".

diff --git a/crates/bevy_app/src/schedule_runner.rs b/crates/bevy_app/src/schedule_runner.rs
@@ -71,6 +71,13 @@ impl Plugin for ScheduleRunnerPlugin {
  fn build(&self, app: &mut App) {
  let run_mode = self.run_mode;
  app.set_runner(move |mut app: App| {
+ while !app.ready() {
+ #[cfg(not(target_arch = "wasm32"))]
+ bevy_tasks::tick_global_task_pools_on_main_thread();
+ }
+ app.finish();
+ app.cleanup();
+
  let mut app_exit_event_reader = ManualEventReader::<AppExit>::default();
  match run_mode {
  RunMode::Once => {

diff --git a/crates/bevy_asset/Cargo.toml b/crates/bevy_asset/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_asset"
-version = "0.11.0-dev"
+version = "0.12.0-dev"
 edition = "2021"
 description = "Provides asset functionality for Bevy Engine"
 homepage = "https://bevyengine.org"
@@ -15,13 +15,13 @@ debug_asset_server = ["filesystem_watcher"]
 
 [dependencies]
 # bevy
-bevy_app = { path = "../bevy_app", version = "0.11.0-dev" }
-bevy_diagnostic = { path = "../bevy_diagnostic", version = "0.11.0-dev" }
-bevy_ecs = { path = "../bevy_ecs", version = "0.11.0-dev" }
-bevy_log = { path = "../bevy_log", version = "0.11.0-dev" }
-bevy_reflect = { path = "../bevy_reflect", version = "0.11.0-dev", features = ["bevy"] }
-bevy_tasks = { path = "../bevy_tasks", version = "0.11.0-dev" }
-bevy_utils = { path = "../bevy_utils", version = "0.11.0-dev" }
+bevy_app = { path = "../bevy_app", version = "0.12.0-dev" }
+bevy_diagnostic = { path = "../bevy_diagnostic", version = "0.12.0-dev" }
+bevy_ecs = { path = "../bevy_ecs", version = "0.12.0-dev" }
+bevy_log = { path = "../bevy_log", version = "0.12.0-dev" }
+bevy_reflect = { path = "../bevy_reflect", version = "0.12.0-dev", features = ["bevy"] }
+bevy_tasks = { path = "../bevy_tasks", version = "0.12.0-dev" }
+bevy_utils = { path = "../bevy_utils", version = "0.12.0-dev" }
 
 # other
 serde = { version = "1", features = ["derive"] }
@@ -34,7 +34,7 @@ notify = { version = "6.0.0", optional = true }
 parking_lot = "0.12.1"
 
 [target.'cfg(target_os = "android")'.dependencies]
-bevy_winit = { path = "../bevy_winit", version = "0.11.0-dev" }
+bevy_winit = { path = "../bevy_winit", version = "0.12.0-dev" }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 wasm-bindgen = { version = "0.2" }
@@ -45,4 +45,4 @@ js-sys = "0.3"
 [dev-dependencies]
 futures-lite = "1.4.0"
 tempfile = "3.2.0"
-bevy_core = { path = "../bevy_core", version = "0.11.0-dev" }
+bevy_core = { path = "../bevy_core", version = "0.12.0-dev" }
diff --git a/crates/bevy_asset/src/assets.rs b/crates/bevy_asset/src/assets.rs
@@ -559,7 +559,7 @@ mod tests {
  let mut app = App::new();
  app.add_plugins((
  bevy_core::TaskPoolPlugin::default(),
- bevy_core::TypeRegistrationPlugin::default(),
+ bevy_core::TypeRegistrationPlugin,
  crate::AssetPlugin::default(),
  ));
  app.add_asset::<MyAsset>();

diff --git a/crates/bevy_asset/src/handle.rs b/crates/bevy_asset/src/handle.rs
@@ -40,6 +40,12 @@ impl<'a> From<AssetPath<'a>> for HandleId {
  }
 }
 
+impl<'a, 'b> From<&'a AssetPath<'b>> for HandleId {
+ fn from(value: &'a AssetPath<'b>) -> Self {
+ HandleId::AssetPathId(AssetPathId::from(value))
+ }
+}
+
 impl HandleId {
  /// Creates a random id for an asset of type `T`.
  #[inline]
@@ -390,7 +396,7 @@ impl HandleUntyped {
  Handle {
  handle_type,
  id: self.id,
- marker: PhantomData::default(),
+ marker: PhantomData,
  }
  }
 }

diff --git a/crates/bevy_asset/src/loader.rs b/crates/bevy_asset/src/loader.rs
@@ -34,14 +34,16 @@ pub trait AssetLoader: Send + Sync + 'static {
 /// and scripts. In Bevy, an asset is any struct that has an unique type id, as shown below:
 ///
 /// ```rust
-/// use bevy_reflect::TypeUuid;
+/// use bevy_reflect::{TypePath, TypeUuid};
 /// use serde::Deserialize;
 ///
-/// #[derive(Debug, Deserialize, TypeUuid)]
+/// #[derive(Debug, Deserialize, TypeUuid, TypePath)]
 /// #[uuid = "39cadc56-aa9c-4543-8640-a018b74b5052"]
 /// pub struct CustomAsset {
 /// pub value: i32,
 /// }
+/// # fn is_asset<T: bevy_asset::Asset>() {}
+/// # is_asset::<CustomAsset>();
 /// ```
 ///
 /// See the `assets/custom_asset.rs` example in the repository for more details.