Merge main

bevyengine · Feb 20, 2024 · 9091800 · 9091800
2 parents bf5a6fe + dedf66f
commit 9091800
Show file tree

Hide file tree

Showing 286 changed files with 6,416 additions and 4,208 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.12.0"
+version = "0.13.0"
 edition = "2021"
 categories = ["game-engines", "graphics", "gui", "rendering"]
 description = "A refreshingly simple data-driven game engine and app framework"
@@ -11,7 +11,7 @@ license = "MIT OR Apache-2.0"
 readme = "README.md"
 repository = "https://github.com/bevyengine/bevy"
 documentation = "https://docs.rs/bevy"
-rust-version = "1.74.0"
+rust-version = "1.76.0"
 
 [workspace]
 exclude = [
@@ -38,7 +38,11 @@ undocumented_unsafe_blocks = "warn"
 redundant_else = "warn"
 match_same_arms = "warn"
 semicolon_if_nothing_returned = "warn"
-map_flatten = "warn"
+
+ptr_as_ptr = "warn"
+ptr_cast_constness = "warn"
+#TODO(rust 1.77): enable `ref_as_ptr`
+# ref_as_ptr = "warn"
 
 [workspace.lints.rust]
 unsafe_op_in_unsafe_fn = "warn"
@@ -301,8 +305,8 @@ embedded_watcher = ["bevy_internal/embedded_watcher"]
 bevy_debug_stepping = ["bevy_internal/bevy_debug_stepping"]
 
 [dependencies]
-bevy_dylib = { path = "crates/bevy_dylib", version = "0.12.0", default-features = false, optional = true }
-bevy_internal = { path = "crates/bevy_internal", version = "0.12.0", default-features = false }
+bevy_dylib = { path = "crates/bevy_dylib", version = "0.13.0", default-features = false, optional = true }
+bevy_internal = { path = "crates/bevy_internal", version = "0.13.0", default-features = false }
 
 [dev-dependencies]
 rand = "0.8.0"
@@ -2650,6 +2654,17 @@ description = "Demonstrates creating and using custom Ui materials"
 category = "UI (User Interface)"
 wasm = true
 
+[[example]]
+name = "render_primitives"
+path = "examples/math/render_primitives.rs"
+doc-scrape-examples = true
+
+[package.metadata.example.render_primitives]
+name = "Rendering Primitives"
+description = "Shows off rendering for all math primitives as both Meshes and Gizmos"
+category = "Math"
+wasm = true
+
 [profile.wasm-release]
 inherits = "release"
 opt-level = "z"

diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ Bevy is a refreshingly simple data-driven game engine built in Rust. It is free
 
 ## WARNING
 
-Bevy is still in the early stages of development. Important features are missing. Documentation is sparse. A new version of Bevy containing breaking changes to the API is released [approximately once every 3 months](https://bevyengine.org/news/bevy-0-6/#the-train-release-schedule). We provide [migration guides](https://bevyengine.org/learn/book/migration-guides/), but we can't guarantee migrations will always be easy. Use only if you are willing to work in this environment.
+Bevy is still in the early stages of development. Important features are missing. Documentation is sparse. A new version of Bevy containing breaking changes to the API is released [approximately once every 3 months](https://bevyengine.org/news/bevy-0-6/#the-train-release-schedule). We provide [migration guides](https://bevyengine.org/learn/migration-guides/), but we can't guarantee migrations will always be easy. Use only if you are willing to work in this environment.
 
 **MSRV:** Bevy relies heavily on improvements in the Rust language and compiler.
 As a result, the Minimum Supported Rust Version (MSRV) is generally close to "the latest stable release" of Rust.
@@ -34,7 +34,7 @@ As a result, the Minimum Supported Rust Version (MSRV) is generally close to "th
 
 ## Docs
 
-* **[The Bevy Book](https://bevyengine.org/learn/book/introduction):** Bevy's official documentation. The best place to start learning Bevy.
+* **[Quick Start Guide](https://bevyengine.org/learn/quick-start/introduction):** Bevy's official Quick Start Guide. The best place to start learning Bevy.
 * **[Bevy Rust API Docs](https://docs.rs/bevy):** Bevy's Rust API docs, which are automatically generated from the doc comments in this repo.
 * **[Official Examples](https://github.com/bevyengine/bevy/tree/latest/examples):** Bevy's dedicated, runnable examples, which are great for digging into specific concepts.
 * **[Community-Made Learning Resources](https://bevyengine.org/assets/#learning)**: More tutorials, documentation, and examples made by the Bevy community.
@@ -58,9 +58,9 @@ For more complex architecture decisions and experimental mad science, please ope
 
 ## Getting Started
 
-We recommend checking out [The Bevy Book](https://bevyengine.org/learn/book/introduction) for a full tutorial.
+We recommend checking out the [Quick Start Guide](https://bevyengine.org/learn/quick-start/introduction) for a brief introduction.
 
-Follow the [Setup guide](https://bevyengine.org/learn/book/getting-started/setup/) to ensure your development environment is set up correctly.
+Follow the [Setup guide](https://bevyengine.org/learn/quick-start/getting-started/setup) to ensure your development environment is set up correctly.
 Once set up, you can quickly try out the [examples](https://github.com/bevyengine/bevy/tree/latest/examples) by cloning this repo and running the following commands:
 
 ```sh
@@ -84,7 +84,7 @@ fn main(){
 
 ### Fast Compiles
 
-Bevy can be built just fine using default configuration on stable Rust. However for really fast iterative compiles, you should enable the "fast compiles" setup by [following the instructions here](http://bevyengine.org/learn/book/getting-started/setup/).
+Bevy can be built just fine using default configuration on stable Rust. However for really fast iterative compiles, you should enable the "fast compiles" setup by [following the instructions here](https://bevyengine.org/learn/quick-start/getting-started/setup).
 
 ## [Bevy Cargo Features][cargo_features]
 

diff --git a/benches/Cargo.toml b/benches/Cargo.toml
@@ -63,6 +63,6 @@ path = "benches/bevy_math/bezier.rs"
 harness = false
 
 [[bench]]
-name = "utils"
-path = "benches/bevy_utils/entity_hash.rs"
+name = "entity_hash"
+path = "benches/bevy_ecs/world/entity_hash.rs"
 harness = false
diff --git a/benches/benches/bevy_ecs/scheduling/mod.rs b/benches/benches/bevy_ecs/scheduling/mod.rs
@@ -19,4 +19,5 @@ criterion_group!(
     contrived,
     schedule,
     build_schedule,
+    empty_schedule_run,
 );
diff --git a/benches/benches/bevy_ecs/scheduling/schedule.rs b/benches/benches/bevy_ecs/scheduling/schedule.rs
@@ -118,3 +118,28 @@ pub fn build_schedule(criterion: &mut Criterion) {
 
     group.finish();
 }
+
+pub fn empty_schedule_run(criterion: &mut Criterion) {
+    let mut app = bevy_app::App::default();
+
+    let mut group = criterion.benchmark_group("run_empty_schedule");
+
+    let mut schedule = Schedule::default();
+    schedule.set_executor_kind(bevy_ecs::schedule::ExecutorKind::SingleThreaded);
+    group.bench_function("SingleThreaded", |bencher| {
+        bencher.iter(|| schedule.run(&mut app.world));
+    });
+
+    let mut schedule = Schedule::default();
+    schedule.set_executor_kind(bevy_ecs::schedule::ExecutorKind::MultiThreaded);
+    group.bench_function("MultiThreaded", |bencher| {
+        bencher.iter(|| schedule.run(&mut app.world));
+    });
+
+    let mut schedule = Schedule::default();
+    schedule.set_executor_kind(bevy_ecs::schedule::ExecutorKind::Simple);
+    group.bench_function("Simple", |bencher| {
+        bencher.iter(|| schedule.run(&mut app.world));
+    });
+    group.finish();
+}
diff --git a/benches/benches/bevy_utils/entity_hash.rs → ...hes/benches/bevy_ecs/world/entity_hash.rs b/benches/benches/bevy_utils/entity_hash.rs → ...hes/benches/bevy_ecs/world/entity_hash.rs
@@ -1,5 +1,4 @@
-use bevy_ecs::entity::Entity;
-use bevy_utils::EntityHashSet;
+use bevy_ecs::entity::{Entity, EntityHashSet};
 use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion, Throughput};
 use rand::{Rng, SeedableRng};
 use rand_chacha::ChaCha8Rng;
@@ -28,7 +27,7 @@ fn make_entity(rng: &mut impl Rng, size: usize) -> Entity {
     e
 }
 
-fn entity_set_build_and_lookup(c: &mut Criterion) {
+pub fn entity_set_build_and_lookup(c: &mut Criterion) {
     let mut group = c.benchmark_group("entity_hash");
     for size in SIZES {
         // Get some random-but-consistent entities to use for all the benches below.

diff --git a/benches/benches/bevy_ecs/world/mod.rs b/benches/benches/bevy_ecs/world/mod.rs
@@ -1,13 +1,17 @@
 use criterion::criterion_group;
 
 mod commands;
-mod spawn;
-mod world_get;
-
 use commands::*;
+
+mod spawn;
 use spawn::*;
+
+mod world_get;
 use world_get::*;
 
+mod entity_hash;
+use entity_hash::*;
+
 criterion_group!(
     world_benches,
     empty_commands,
@@ -24,10 +28,9 @@ criterion_group!(
     world_query_iter,
     world_query_for_each,
     world_spawn,
-    query_get_component_simple,
-    query_get_component,
     query_get,
     query_get_many::<2>,
     query_get_many::<5>,
     query_get_many::<10>,
+    entity_set_build_and_lookup
 );
diff --git a/benches/benches/bevy_ecs/world/world_get.rs b/benches/benches/bevy_ecs/world/world_get.rs
@@ -2,7 +2,6 @@ use bevy_ecs::{
     bundle::Bundle,
     component::Component,
     entity::Entity,
-    prelude::*,
     system::{Query, SystemState},
     world::World,
 };
@@ -257,104 +256,6 @@ pub fn world_query_for_each(criterion: &mut Criterion) {
     group.finish();
 }
 
-pub fn query_get_component_simple(criterion: &mut Criterion) {
-    #[derive(Component)]
-    struct A(f32);
-
-    let mut group = criterion.benchmark_group("query_get_component_simple");
-    group.warm_up_time(std::time::Duration::from_millis(500));
-    group.measurement_time(std::time::Duration::from_secs(4));
-
-    group.bench_function("unchecked", |bencher| {
-        let mut world = World::new();
-
-        let entity = world.spawn(A(0.0)).id();
-        let mut query = world.query::<&mut A>();
-
-        let world_cell = world.as_unsafe_world_cell();
-        bencher.iter(|| {
-            for _x in 0..100000 {
-                let mut a = unsafe { query.get_unchecked(world_cell, entity).unwrap() };
-                a.0 += 1.0;
-            }
-        });
-    });
-    group.bench_function("system", |bencher| {
-        let mut world = World::new();
-
-        let entity = world.spawn(A(0.0)).id();
-        fn query_system(In(entity): In<Entity>, mut query: Query<&mut A>) {
-            for _ in 0..100_000 {
-                let mut a = query.get_mut(entity).unwrap();
-                a.0 += 1.0;
-            }
-        }
-
-        let mut system = IntoSystem::into_system(query_system);
-        system.initialize(&mut world);
-        system.update_archetype_component_access(world.as_unsafe_world_cell());
-
-        bencher.iter(|| system.run(entity, &mut world));
-    });
-
-    group.finish();
-}
-
-pub fn query_get_component(criterion: &mut Criterion) {
-    let mut group = criterion.benchmark_group("query_get_component");
-    group.warm_up_time(std::time::Duration::from_millis(500));
-    group.measurement_time(std::time::Duration::from_secs(4));
-
-    for entity_count in RANGE.map(|i| i * 10_000) {
-        group.bench_function(format!("{}_entities_table", entity_count), |bencher| {
-            let mut world = World::default();
-            let mut entities: Vec<_> = world
-                .spawn_batch((0..entity_count).map(|_| Table::default()))
-                .collect();
-            entities.shuffle(&mut deterministic_rand());
-            let mut query = SystemState::<Query<&Table>>::new(&mut world);
-            let query = query.get(&world);
-
-            bencher.iter(|| {
-                let mut count = 0;
-                for comp in entities
-                    .iter()
-                    .flat_map(|&e| query.get_component::<Table>(e))
-                {
-                    black_box(comp);
-                    count += 1;
-                    black_box(count);
-                }
-                assert_eq!(black_box(count), entity_count);
-            });
-        });
-        group.bench_function(format!("{}_entities_sparse", entity_count), |bencher| {
-            let mut world = World::default();
-            let mut entities: Vec<_> = world
-                .spawn_batch((0..entity_count).map(|_| Sparse::default()))
-                .collect();
-            entities.shuffle(&mut deterministic_rand());
-            let mut query = SystemState::<Query<&Sparse>>::new(&mut world);
-            let query = query.get(&world);
-
-            bencher.iter(|| {
-                let mut count = 0;
-                for comp in entities
-                    .iter()
-                    .flat_map(|&e| query.get_component::<Sparse>(e))
-                {
-                    black_box(comp);
-                    count += 1;
-                    black_box(count);
-                }
-                assert_eq!(black_box(count), entity_count);
-            });
-        });
-    }
-
-    group.finish();
-}
-
 pub fn query_get(criterion: &mut Criterion) {
     let mut group = criterion.benchmark_group("query_get");
     group.warm_up_time(std::time::Duration::from_millis(500));

diff --git a/crates/bevy_a11y/Cargo.toml b/crates/bevy_a11y/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_a11y"
-version = "0.12.0"
+version = "0.13.0"
 edition = "2021"
 description = "Provides accessibility support for Bevy Engine"
 homepage = "https://bevyengine.org"
@@ -10,9 +10,9 @@ keywords = ["bevy", "accessibility", "a11y"]
 
 [dependencies]
 # bevy
-bevy_app = { path = "../bevy_app", version = "0.12.0" }
-bevy_derive = { path = "../bevy_derive", version = "0.12.0" }
-bevy_ecs = { path = "../bevy_ecs", version = "0.12.0" }
+bevy_app = { path = "../bevy_app", version = "0.13.0" }
+bevy_derive = { path = "../bevy_derive", version = "0.13.0" }
+bevy_ecs = { path = "../bevy_ecs", version = "0.13.0" }
 
 accesskit = "0.12"
 

diff --git a/crates/bevy_animation/Cargo.toml b/crates/bevy_animation/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_animation"
-version = "0.12.0"
+version = "0.13.0"
 edition = "2021"
 description = "Provides animation functionality for Bevy Engine"
 homepage = "https://bevyengine.org"
@@ -10,19 +10,24 @@ keywords = ["bevy"]
 
 [dependencies]
 # bevy
-bevy_app = { path = "../bevy_app", version = "0.12.0" }
-bevy_asset = { path = "../bevy_asset", version = "0.12.0" }
-bevy_core = { path = "../bevy_core", version = "0.12.0" }
-bevy_math = { path = "../bevy_math", version = "0.12.0" }
-bevy_reflect = { path = "../bevy_reflect", version = "0.12.0", features = [
+bevy_app = { path = "../bevy_app", version = "0.13.0" }
+bevy_asset = { path = "../bevy_asset", version = "0.13.0" }
+bevy_core = { path = "../bevy_core", version = "0.13.0" }
+bevy_log = { path = "../bevy_log", version = "0.13.0" }
+bevy_math = { path = "../bevy_math", version = "0.13.0" }
+bevy_reflect = { path = "../bevy_reflect", version = "0.13.0", features = [
   "bevy",
 ] }
-bevy_render = { path = "../bevy_render", version = "0.12.0" }
-bevy_time = { path = "../bevy_time", version = "0.12.0" }
-bevy_utils = { path = "../bevy_utils", version = "0.12.0" }
-bevy_ecs = { path = "../bevy_ecs", version = "0.12.0" }
-bevy_transform = { path = "../bevy_transform", version = "0.12.0" }
-bevy_hierarchy = { path = "../bevy_hierarchy", version = "0.12.0" }
+bevy_render = { path = "../bevy_render", version = "0.13.0" }
+bevy_time = { path = "../bevy_time", version = "0.13.0" }
+bevy_utils = { path = "../bevy_utils", version = "0.13.0" }
+bevy_ecs = { path = "../bevy_ecs", version = "0.13.0" }
+bevy_transform = { path = "../bevy_transform", version = "0.13.0" }
+bevy_hierarchy = { path = "../bevy_hierarchy", version = "0.13.0" }
+
+# other
+sha1_smol = { version = "1.0" }
+uuid = { version = "1.7", features = ["v5"] }
 
 [lints]
 workspace = true