
# Objective `bevy_ecs`'s `system` module is something of a grab bag, and *very* large. This is particularly true for the `system_param` module, which is more than 2k lines long! While it could be defensible to put `Res` and `ResMut` there (lol no they're in change_detection.rs, obviously), it doesn't make any sense to put the `Resource` trait there. This is confusing to navigate (and painful to work on and review). ## Solution - Create a root level `bevy_ecs/resource.rs` module to mirror `bevy_ecs/component.rs` - move the `Resource` trait to that module - move the `Resource` derive macro to that module as well (Rust really likes when you pun on the names of the derive macro and trait and put them in the same path) - fix all of the imports ## Notes to reviewers - We could probably move more stuff into here, but I wanted to keep this PR as small as possible given the absurd level of import changes. - This PR is ground work for my upcoming attempts to store resource data on components (resources-as-entities). Splitting this code out will make the work and review a bit easier, and is the sort of overdue refactor that's good to do as part of more meaningful work. ## Testing cargo build works! ## Migration Guide `bevy_ecs::system::Resource` has been moved to `bevy_ecs::resource::Resource`.
137 lines
4.1 KiB
Rust
137 lines
4.1 KiB
Rust
//! Convenience logic for turning components from the main world into extracted
|
|
//! instances in the render world.
|
|
//!
|
|
//! This is essentially the same as the `extract_component` module, but
|
|
//! higher-performance because it avoids the ECS overhead.
|
|
|
|
use core::marker::PhantomData;
|
|
|
|
use bevy_app::{App, Plugin};
|
|
use bevy_derive::{Deref, DerefMut};
|
|
use bevy_ecs::{
|
|
prelude::Entity,
|
|
query::{QueryFilter, QueryItem, ReadOnlyQueryData},
|
|
resource::Resource,
|
|
system::{Query, ResMut},
|
|
};
|
|
|
|
use crate::sync_world::MainEntityHashMap;
|
|
use crate::{prelude::ViewVisibility, Extract, ExtractSchedule, RenderApp};
|
|
|
|
/// Describes how to extract data needed for rendering from a component or
|
|
/// components.
|
|
///
|
|
/// Before rendering, any applicable components will be transferred from the
|
|
/// main world to the render world in the [`ExtractSchedule`] step.
|
|
///
|
|
/// This is essentially the same as
|
|
/// [`ExtractComponent`](crate::extract_component::ExtractComponent), but
|
|
/// higher-performance because it avoids the ECS overhead.
|
|
pub trait ExtractInstance: Send + Sync + Sized + 'static {
|
|
/// ECS [`ReadOnlyQueryData`] to fetch the components to extract.
|
|
type QueryData: ReadOnlyQueryData;
|
|
/// Filters the entities with additional constraints.
|
|
type QueryFilter: QueryFilter;
|
|
|
|
/// Defines how the component is transferred into the "render world".
|
|
fn extract(item: QueryItem<'_, Self::QueryData>) -> Option<Self>;
|
|
}
|
|
|
|
/// This plugin extracts one or more components into the "render world" as
|
|
/// extracted instances.
|
|
///
|
|
/// Therefore it sets up the [`ExtractSchedule`] step for the specified
|
|
/// [`ExtractedInstances`].
|
|
#[derive(Default)]
|
|
pub struct ExtractInstancesPlugin<EI>
|
|
where
|
|
EI: ExtractInstance,
|
|
{
|
|
only_extract_visible: bool,
|
|
marker: PhantomData<fn() -> EI>,
|
|
}
|
|
|
|
/// Stores all extract instances of a type in the render world.
|
|
#[derive(Resource, Deref, DerefMut)]
|
|
pub struct ExtractedInstances<EI>(MainEntityHashMap<EI>)
|
|
where
|
|
EI: ExtractInstance;
|
|
|
|
impl<EI> Default for ExtractedInstances<EI>
|
|
where
|
|
EI: ExtractInstance,
|
|
{
|
|
fn default() -> Self {
|
|
Self(Default::default())
|
|
}
|
|
}
|
|
|
|
impl<EI> ExtractInstancesPlugin<EI>
|
|
where
|
|
EI: ExtractInstance,
|
|
{
|
|
/// Creates a new [`ExtractInstancesPlugin`] that unconditionally extracts to
|
|
/// the render world, whether the entity is visible or not.
|
|
pub fn new() -> Self {
|
|
Self {
|
|
only_extract_visible: false,
|
|
marker: PhantomData,
|
|
}
|
|
}
|
|
|
|
/// Creates a new [`ExtractInstancesPlugin`] that extracts to the render world
|
|
/// if and only if the entity it's attached to is visible.
|
|
pub fn extract_visible() -> Self {
|
|
Self {
|
|
only_extract_visible: true,
|
|
marker: PhantomData,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<EI> Plugin for ExtractInstancesPlugin<EI>
|
|
where
|
|
EI: ExtractInstance,
|
|
{
|
|
fn build(&self, app: &mut App) {
|
|
if let Some(render_app) = app.get_sub_app_mut(RenderApp) {
|
|
render_app.init_resource::<ExtractedInstances<EI>>();
|
|
if self.only_extract_visible {
|
|
render_app.add_systems(ExtractSchedule, extract_visible::<EI>);
|
|
} else {
|
|
render_app.add_systems(ExtractSchedule, extract_all::<EI>);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
fn extract_all<EI>(
|
|
mut extracted_instances: ResMut<ExtractedInstances<EI>>,
|
|
query: Extract<Query<(Entity, EI::QueryData), EI::QueryFilter>>,
|
|
) where
|
|
EI: ExtractInstance,
|
|
{
|
|
extracted_instances.clear();
|
|
for (entity, other) in &query {
|
|
if let Some(extract_instance) = EI::extract(other) {
|
|
extracted_instances.insert(entity.into(), extract_instance);
|
|
}
|
|
}
|
|
}
|
|
|
|
fn extract_visible<EI>(
|
|
mut extracted_instances: ResMut<ExtractedInstances<EI>>,
|
|
query: Extract<Query<(Entity, &ViewVisibility, EI::QueryData), EI::QueryFilter>>,
|
|
) where
|
|
EI: ExtractInstance,
|
|
{
|
|
extracted_instances.clear();
|
|
for (entity, view_visibility, other) in &query {
|
|
if view_visibility.get() {
|
|
if let Some(extract_instance) = EI::extract(other) {
|
|
extracted_instances.insert(entity.into(), extract_instance);
|
|
}
|
|
}
|
|
}
|
|
}
|