Skip to content

Commit

Permalink
Merge branch 'main' into clean-up-examples
Browse files Browse the repository at this point in the history
  • Loading branch information
doup committed Dec 2, 2024
2 parents 0d7bad4 + 9ed6921 commit dc85f90
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 38 deletions.
8 changes: 4 additions & 4 deletions content/news/2024-02-17-bevy-0.13/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -1851,7 +1851,7 @@ For a complete list of changes, check out the PRs listed below.
* [derive asset for enums][10410]
* [Ensure consistency between Un/Typed `AssetId` and `Handle`][10628]
* [Fix Asset Loading Bug][10698]
* [remove double-hasing of typeid for handle][10699]
* [remove double-hashing of typeid for handle][10699]
* [AssetMetaMode][10623]
* [Fix GLTF scene dependencies and make full scene renders predictable][10745]
* [Print precise and correct watch warnings (and only when necessary)][10787]
Expand Down Expand Up @@ -2280,7 +2280,7 @@ For a complete list of changes, check out the PRs listed below.
* [Minimize small allocations by dropping the tick Vecs from Resources][11226]
* [Change Entity::generation from u32 to NonZeroU32 for niche optimization][9907]
* [fix B0003 example and update logs][11162]
* [Unified identifer for entities & relations][9797]
* [Unified identifier for entities & relations][9797]
* [Simplify conditions][11316]
* [Add example using `State` in docs][11319]
* [Skip rehashing TypeIds][11268]
Expand Down Expand Up @@ -2428,7 +2428,7 @@ For a complete list of changes, check out the PRs listed below.
### A-Core

* [Derive `Debug` for `Framecount`][11573]
* [Don't unconditionally enable bevy_render or bevy_assets if mutli-threaded feature is enabled][11726]
* [Don't unconditionally enable bevy_render or bevy_assets if multi-threaded feature is enabled][11726]

### A-Windowing

Expand Down Expand Up @@ -2539,7 +2539,7 @@ For a complete list of changes, check out the PRs listed below.
* [Remove unnecessary parentheses][10990]
* [Replace deprecated elements][10999]
* [Simplify equality assertions][10988]
* [Add Solus package requrements to linux_dependencies.md][10996]
* [Add Solus package requirements to linux_dependencies.md][10996]
* [Update base64 requirement from 0.13.0 to 0.21.5][10336]
* [Update sysinfo version to 0.30.0][11071]
* [Remove unnecessary parens][11075]
Expand Down
2 changes: 1 addition & 1 deletion content/news/2024-11-29-bevy-0.15/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ Peering deep into the mists of time (predictions are _extra_ hard when your team

{{ support_bevy() }}
{{ contributors(version="0.15") }}
{{ changelog(version="0.15")}}
{{ changelog(version="0.15")}}
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
If you have a system which read `SceneInstanceReady` events:
If you have a system which reads `SceneInstanceReady` events, it must be rewritten as an observer or entity observer.

>
`fn ready_system(ready_events: EventReader<'_, '_, SceneInstanceReady>) {`
```rust
// 0.14
fn ready_system(ready_events: EventReader<'_, '_, SceneInstanceReady>) {
// ...
}


It must be rewritten as an observer:

>
`commands.observe(|trigger: Trigger<SceneInstanceReady>| {`

Or, if you were expecting the event in relation to a specific entity or entities, as an entity observer:

>
`commands.entity(entity).observe(|trigger: Trigger<SceneInstanceReady>| {`
// 0.15
commands.observe(|trigger: Trigger<SceneInstanceReady>| {
// ...
});
commands.entity(entity).observe(|trigger: Trigger<SceneInstanceReady>| {
// ...
});
```

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
The `bevy/wgpu_trace` and `bevy_render/wgpu_trace` features have been removed, as WGPU tracing is now enabled during the creation of `bevy_render::RenderPlugin`.

{% callout(type="info") %}
At the time of writing, WGPU has not reimplemented tracing support, so WGPU tracing will not currently work. However, once WGPU has reimplemented tracing support, the steps below should be sufficient to continue generating WGPU traces.
Note: At the time of writing, WGPU has not reimplemented tracing support, so WGPU tracing will not currently work. However, once WGPU has reimplemented tracing support, the steps below should be sufficient to continue generating WGPU traces.

You can track the progress of WGPU tracing being reimplemented at [gfx-rs/wgpu#5974](https://github.com/gfx-rs/wgpu/issues/5974).
{% end %}

To continue generating WGPU traces:

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
`bevy_render::mesh::morph::inherit_weights` is now `bevy_render::mesh::inherit_weights`
`bevy_render::mesh::morph::inherit_weights` has been moved to `bevy_render::mesh::inherit_weights`.

if you were using `Mesh::compute_aabb`, you will need to `use bevy_render::mesh::MeshAabb;` now
`Mesh::compute_aabb` has been moved to the new `MeshAabb` trait. You may need to import it.

```rust
use bevy::render::mesh::MeshAabb;
```
12 changes: 0 additions & 12 deletions release-content/0.15/migration-guides/_guides.toml
Original file line number Diff line number Diff line change
Expand Up @@ -208,12 +208,6 @@ prs = [14211]
areas = ["Core", "Editor"]
file_name = "14211_Rename_bevy_corenameDebugName_to_bevy_corenameNameOrEntity.md"

[[guides]]
title = "Add `core` and `alloc` over `std` Lints"
prs = [15281]
areas = ["Cross-Cutting"]
file_name = "15281_Add_core_and_alloc_over_std_Lints.md"

[[guides]]
title = "Remove the `Component` trait implementation from `Handle`"
prs = [15796]
Expand Down Expand Up @@ -490,12 +484,6 @@ prs = [16139]
areas = ["ECS", "Reflection"]
file_name = "16139_ReflectBundleremove_improvement.md"

[[guides]]
title = "feat: Add `World::get_reflect()` and `World::get_reflect_mut()`"
prs = [14416]
areas = ["ECS", "Reflection"]
file_name = "14416_feat_Add_Worldget_reflect_and_Worldget_reflect_mut.md"

[[guides]]
title = "Use crate: `disqualified`"
prs = [15372]
Expand Down

0 comments on commit dc85f90

Please sign in to comment.