Mirrors/bevy
2
0
Fork 0
mirror of https://github.com/bevyengine/bevy synced 2024-11-30 00:20:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Extract resources into their target location (#5271)

Browse source 
# Objective

- Extracting resources currently always uses commands, which requires *at least* one additional move of the extracted value, as well as dynamic dispatch.
- Addresses https://github.com/bevyengine/bevy/pull/4402#discussion_r911634931

## Solution

- Write the resource into a `ResMut<R>` directly.
- Fall-back to commands if the resource hasn't been added yet.
This commit is contained in:
Daniel McNab 2022-07-10 21:04:35 +00:00
parent 8eb0440f1e
commit 8de03b0839
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
crates/bevy_render/Cargo.toml
View file

@ -34,6 +34,7 @@ bevy_core = { path = "../bevy_core", version = "0.8.0-dev" }
bevy_derive = { path = "../bevy_derive", version = "0.8.0-dev" } bevy_derive = { path = "../bevy_derive", version = "0.8.0-dev" }
bevy_ecs = { path = "../bevy_ecs", version = "0.8.0-dev" } bevy_ecs = { path = "../bevy_ecs", version = "0.8.0-dev" }
bevy_encase_derive = { path = "../bevy_encase_derive", version = "0.8.0-dev" } bevy_encase_derive = { path = "../bevy_encase_derive", version = "0.8.0-dev" }
bevy_log = { path = "../bevy_log", version = "0.8.0-dev" }
bevy_math = { path = "../bevy_math", version = "0.8.0-dev" } bevy_math = { path = "../bevy_math", version = "0.8.0-dev" }
bevy_mikktspace = { path = "../bevy_mikktspace", version = "0.8.0-dev" } bevy_mikktspace = { path = "../bevy_mikktspace", version = "0.8.0-dev" }
bevy_reflect = { path = "../bevy_reflect", version = "0.8.0-dev", features = ["bevy"] } bevy_reflect = { path = "../bevy_reflect", version = "0.8.0-dev", features = ["bevy"] }

24
crates/bevy_render/src/extract_resource.rs
View file

@ -1,7 +1,7 @@
use std::marker::PhantomData; use std::marker::PhantomData;
use bevy_app::{App, Plugin}; use bevy_app::{App, Plugin};
use bevy_ecs::system::{Commands, Res, Resource}; use bevy_ecs::system::{Commands, Local, Res, ResMut, Resource};
pub use bevy_render_macros::ExtractResource; pub use bevy_render_macros::ExtractResource;
use crate::{Extract, RenderApp, RenderStage}; use crate::{Extract, RenderApp, RenderStage};
@ -38,12 +38,26 @@ impl<R: ExtractResource> Plugin for ExtractResourcePlugin<R> {
} }
/// This system extracts the resource of the corresponding [`Resource`] type /// This system extracts the resource of the corresponding [`Resource`] type
/// by cloning it.
pub fn extract_resource<R: ExtractResource>( pub fn extract_resource<R: ExtractResource>(
mut commands: Commands, mut commands: Commands,
resource: Extract<Res<R::Source>>, main_resource: Extract<Res<R::Source>>,
target_resource: Option<ResMut<R>>,
#[cfg(debug_assertions)] mut has_warned_on_remove: Local<bool>,
) { ) {
if resource.is_changed() { if let Some(mut target_resource) = target_resource {
commands.insert_resource(R::extract_resource(&*resource)); if main_resource.is_changed() {
*target_resource = R::extract_resource(&*main_resource);
}
} else {
#[cfg(debug_assertions)]
if !main_resource.is_added() && !*has_warned_on_remove {
*has_warned_on_remove = true;
bevy_log::warn!(
"Removing resource {} from render world not expected, adding using `Commands`.
This may decrease performance",
std::any::type_name::<R>()
);
}
commands.insert_resource(R::extract_resource(&*main_resource));
} }
} }