
# Objective This is a necessary precursor to #9122 (this was split from that PR to reduce the amount of code to review all at once). Moving `!Send` resource ownership to `App` will make it unambiguously `!Send`. `SubApp` must be `Send`, so it can't wrap `App`. ## Solution Refactor `App` and `SubApp` to not have a recursive relationship. Since `SubApp` no longer wraps `App`, once `!Send` resources are moved out of `World` and into `App`, `SubApp` will become unambiguously `Send`. There could be less code duplication between `App` and `SubApp`, but that would break `App` method chaining. ## Changelog - `SubApp` no longer wraps `App`. - `App` fields are no longer publicly accessible. - `App` can no longer be converted into a `SubApp`. - Various methods now return references to a `SubApp` instead of an `App`. ## Migration Guide - To construct a sub-app, use `SubApp::new()`. `App` can no longer convert into `SubApp`. - If you implemented a trait for `App`, you may want to implement it for `SubApp` as well. - If you're accessing `app.world` directly, you now have to use `app.world()` and `app.world_mut()`. - `App::sub_app` now returns `&SubApp`. - `App::sub_app_mut` now returns `&mut SubApp`. - `App::get_sub_app` now returns `Option<&SubApp>.` - `App::get_sub_app_mut` now returns `Option<&mut SubApp>.`
149 lines
4.3 KiB
Rust
149 lines
4.3 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 std::marker::PhantomData;
|
|
|
|
use bevy_app::{App, Plugin};
|
|
use bevy_asset::{Asset, AssetId, Handle};
|
|
use bevy_derive::{Deref, DerefMut};
|
|
use bevy_ecs::{
|
|
entity::EntityHashMap,
|
|
prelude::Entity,
|
|
query::{QueryFilter, QueryItem, ReadOnlyQueryData},
|
|
system::{lifetimeless::Read, Query, ResMut, Resource},
|
|
};
|
|
|
|
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>(EntityHashMap<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, 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, extract_instance);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<A> ExtractInstance for AssetId<A>
|
|
where
|
|
A: Asset,
|
|
{
|
|
type QueryData = Read<Handle<A>>;
|
|
type QueryFilter = ();
|
|
|
|
fn extract(item: QueryItem<'_, Self::QueryData>) -> Option<Self> {
|
|
Some(item.id())
|
|
}
|
|
}
|