
# Objective One of the changes in #14704 made `DynamicFunction` effectively the same as `DynamicClosure<'static>`. This change meant that the de facto function type would likely be `DynamicClosure<'static>` instead of the intended `DynamicFunction`, since the former is much more flexible. We _could_ explore ways of making `DynamicFunction` implement `Copy` using some unsafe code, but it likely wouldn't be worth it. And users would likely still reach for the convenience of `DynamicClosure<'static>` over the copy-ability of `DynamicFunction`. The goal of this PR is to fix this confusion between the two types. ## Solution Firstly, the `DynamicFunction` type was removed. Again, it was no different than `DynamicClosure<'static>` so it wasn't a huge deal to remove. Secondly, `DynamicClosure<'env>` and `DynamicClosureMut<'env>` were renamed to `DynamicFunction<'env>` and `DynamicFunctionMut<'env>`, respectively. Yes, we still ultimately kept the naming of `DynamicFunction`, but changed its behavior to that of `DynamicClosure<'env>`. We need a term to refer to both functions and closures, and "function" was the best option. [Originally](https://discord.com/channels/691052431525675048/1002362493634629796/1274091992162242710), I was going to go with "callable" as the replacement term to encompass both functions and closures (e.g. `DynamciCallable<'env>`). However, it was [suggested](https://discord.com/channels/691052431525675048/1002362493634629796/1274653581777047625) by @SkiFire13 that the simpler "function" term could be used instead. While "callable" is perhaps the better umbrella term—being truly ambiguous over functions and closures— "function" is more familiar, used more often, easier to discover, and is subjectively just "better-sounding". ## Testing Most changes are purely swapping type names or updating documentation, but you can verify everything still works by running the following command: ``` cargo test --package bevy_reflect ```
487 lines
15 KiB
Rust
487 lines
15 KiB
Rust
use crate::{App, AppLabel, InternedAppLabel, Plugin, Plugins, PluginsState};
|
|
use bevy_ecs::{
|
|
event::EventRegistry,
|
|
prelude::*,
|
|
schedule::{InternedScheduleLabel, ScheduleBuildSettings, ScheduleLabel},
|
|
system::SystemId,
|
|
};
|
|
|
|
#[cfg(feature = "trace")]
|
|
use bevy_utils::tracing::info_span;
|
|
use bevy_utils::{HashMap, HashSet};
|
|
use std::fmt::Debug;
|
|
|
|
type ExtractFn = Box<dyn Fn(&mut World, &mut World) + Send>;
|
|
|
|
/// A secondary application with its own [`World`]. These can run independently of each other.
|
|
///
|
|
/// These are useful for situations where certain processes (e.g. a render thread) need to be kept
|
|
/// separate from the main application.
|
|
///
|
|
/// # Example
|
|
///
|
|
/// ```
|
|
/// # use bevy_app::{App, AppLabel, SubApp, Main};
|
|
/// # use bevy_ecs::prelude::*;
|
|
/// # use bevy_ecs::schedule::ScheduleLabel;
|
|
///
|
|
/// #[derive(Resource, Default)]
|
|
/// struct Val(pub i32);
|
|
///
|
|
/// #[derive(Debug, Clone, Copy, Hash, PartialEq, Eq, AppLabel)]
|
|
/// struct ExampleApp;
|
|
///
|
|
/// // Create an app with a certain resource.
|
|
/// let mut app = App::new();
|
|
/// app.insert_resource(Val(10));
|
|
///
|
|
/// // Create a sub-app with the same resource and a single schedule.
|
|
/// let mut sub_app = SubApp::new();
|
|
/// sub_app.insert_resource(Val(100));
|
|
///
|
|
/// // Setup an extract function to copy the resource's value in the main world.
|
|
/// sub_app.set_extract(|main_world, sub_world| {
|
|
/// sub_world.resource_mut::<Val>().0 = main_world.resource::<Val>().0;
|
|
/// });
|
|
///
|
|
/// // Schedule a system that will verify extraction is working.
|
|
/// sub_app.add_systems(Main, |counter: Res<Val>| {
|
|
/// // The value will be copied during extraction, so we should see 10 instead of 100.
|
|
/// assert_eq!(counter.0, 10);
|
|
/// });
|
|
///
|
|
/// // Add the sub-app to the main app.
|
|
/// app.insert_sub_app(ExampleApp, sub_app);
|
|
///
|
|
/// // Update the application once (using the default runner).
|
|
/// app.run();
|
|
/// ```
|
|
pub struct SubApp {
|
|
/// The data of this application.
|
|
world: World,
|
|
/// List of plugins that have been added.
|
|
pub(crate) plugin_registry: Vec<Box<dyn Plugin>>,
|
|
/// The names of plugins that have been added to this app. (used to track duplicates and
|
|
/// already-registered plugins)
|
|
pub(crate) plugin_names: HashSet<String>,
|
|
/// Panics if an update is attempted while plugins are building.
|
|
pub(crate) plugin_build_depth: usize,
|
|
pub(crate) plugins_state: PluginsState,
|
|
/// The schedule that will be run by [`update`](Self::update).
|
|
pub update_schedule: Option<InternedScheduleLabel>,
|
|
/// A function that gives mutable access to two app worlds. This is primarily
|
|
/// intended for copying data from the main world to secondary worlds.
|
|
extract: Option<ExtractFn>,
|
|
}
|
|
|
|
impl Debug for SubApp {
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
write!(f, "SubApp")
|
|
}
|
|
}
|
|
|
|
impl Default for SubApp {
|
|
fn default() -> Self {
|
|
let mut world = World::new();
|
|
world.init_resource::<Schedules>();
|
|
Self {
|
|
world,
|
|
plugin_registry: Vec::default(),
|
|
plugin_names: HashSet::default(),
|
|
plugin_build_depth: 0,
|
|
plugins_state: PluginsState::Adding,
|
|
update_schedule: None,
|
|
extract: None,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl SubApp {
|
|
/// Returns a default, empty [`SubApp`].
|
|
pub fn new() -> Self {
|
|
Self::default()
|
|
}
|
|
|
|
/// This method is a workaround. Each [`SubApp`] can have its own plugins, but [`Plugin`]
|
|
/// works on an [`App`] as a whole.
|
|
fn run_as_app<F>(&mut self, f: F)
|
|
where
|
|
F: FnOnce(&mut App),
|
|
{
|
|
let mut app = App::empty();
|
|
std::mem::swap(self, &mut app.sub_apps.main);
|
|
f(&mut app);
|
|
std::mem::swap(self, &mut app.sub_apps.main);
|
|
}
|
|
|
|
/// Returns a reference to the [`World`].
|
|
pub fn world(&self) -> &World {
|
|
&self.world
|
|
}
|
|
|
|
/// Returns a mutable reference to the [`World`].
|
|
pub fn world_mut(&mut self) -> &mut World {
|
|
&mut self.world
|
|
}
|
|
|
|
/// Runs the default schedule.
|
|
///
|
|
/// Does not clear internal trackers used for change detection.
|
|
pub fn run_default_schedule(&mut self) {
|
|
if self.is_building_plugins() {
|
|
panic!("SubApp::update() was called while a plugin was building.");
|
|
}
|
|
|
|
if let Some(label) = self.update_schedule {
|
|
self.world.run_schedule(label);
|
|
}
|
|
}
|
|
|
|
/// Runs the default schedule and updates internal component trackers.
|
|
pub fn update(&mut self) {
|
|
self.run_default_schedule();
|
|
self.world.clear_trackers();
|
|
}
|
|
|
|
/// Extracts data from `world` into the app's world using the registered extract method.
|
|
///
|
|
/// **Note:** There is no default extract method. Calling `extract` does nothing if
|
|
/// [`set_extract`](Self::set_extract) has not been called.
|
|
pub fn extract(&mut self, world: &mut World) {
|
|
if let Some(f) = self.extract.as_mut() {
|
|
f(world, &mut self.world);
|
|
}
|
|
}
|
|
|
|
/// Sets the method that will be called by [`extract`](Self::extract).
|
|
///
|
|
/// The first argument is the `World` to extract data from, the second argument is the app `World`.
|
|
pub fn set_extract<F>(&mut self, extract: F) -> &mut Self
|
|
where
|
|
F: Fn(&mut World, &mut World) + Send + 'static,
|
|
{
|
|
self.extract = Some(Box::new(extract));
|
|
self
|
|
}
|
|
|
|
/// See [`App::insert_resource`].
|
|
pub fn insert_resource<R: Resource>(&mut self, resource: R) -> &mut Self {
|
|
self.world.insert_resource(resource);
|
|
self
|
|
}
|
|
|
|
/// See [`App::init_resource`].
|
|
pub fn init_resource<R: Resource + FromWorld>(&mut self) -> &mut Self {
|
|
self.world.init_resource::<R>();
|
|
self
|
|
}
|
|
|
|
/// See [`App::add_systems`].
|
|
pub fn add_systems<M>(
|
|
&mut self,
|
|
schedule: impl ScheduleLabel,
|
|
systems: impl IntoSystemConfigs<M>,
|
|
) -> &mut Self {
|
|
let mut schedules = self.world.resource_mut::<Schedules>();
|
|
schedules.add_systems(schedule, systems);
|
|
|
|
self
|
|
}
|
|
|
|
/// See [`App::register_system`].
|
|
pub fn register_system<I: 'static, O: 'static, M, S: IntoSystem<I, O, M> + 'static>(
|
|
&mut self,
|
|
system: S,
|
|
) -> SystemId<I, O> {
|
|
self.world.register_system(system)
|
|
}
|
|
|
|
/// See [`App::configure_sets`].
|
|
#[track_caller]
|
|
pub fn configure_sets(
|
|
&mut self,
|
|
schedule: impl ScheduleLabel,
|
|
sets: impl IntoSystemSetConfigs,
|
|
) -> &mut Self {
|
|
let mut schedules = self.world.resource_mut::<Schedules>();
|
|
schedules.configure_sets(schedule, sets);
|
|
self
|
|
}
|
|
|
|
/// See [`App::add_schedule`].
|
|
pub fn add_schedule(&mut self, schedule: Schedule) -> &mut Self {
|
|
let mut schedules = self.world.resource_mut::<Schedules>();
|
|
schedules.insert(schedule);
|
|
self
|
|
}
|
|
|
|
/// See [`App::init_schedule`].
|
|
pub fn init_schedule(&mut self, label: impl ScheduleLabel) -> &mut Self {
|
|
let label = label.intern();
|
|
let mut schedules = self.world.resource_mut::<Schedules>();
|
|
if !schedules.contains(label) {
|
|
schedules.insert(Schedule::new(label));
|
|
}
|
|
self
|
|
}
|
|
|
|
/// See [`App::get_schedule`].
|
|
pub fn get_schedule(&self, label: impl ScheduleLabel) -> Option<&Schedule> {
|
|
let schedules = self.world.get_resource::<Schedules>()?;
|
|
schedules.get(label)
|
|
}
|
|
|
|
/// See [`App::get_schedule_mut`].
|
|
pub fn get_schedule_mut(&mut self, label: impl ScheduleLabel) -> Option<&mut Schedule> {
|
|
let schedules = self.world.get_resource_mut::<Schedules>()?;
|
|
// We must call `.into_inner` here because the borrow checker only understands reborrows
|
|
// using ordinary references, not our `Mut` smart pointers.
|
|
schedules.into_inner().get_mut(label)
|
|
}
|
|
|
|
/// See [`App::edit_schedule`].
|
|
pub fn edit_schedule(
|
|
&mut self,
|
|
label: impl ScheduleLabel,
|
|
mut f: impl FnMut(&mut Schedule),
|
|
) -> &mut Self {
|
|
let label = label.intern();
|
|
let mut schedules = self.world.resource_mut::<Schedules>();
|
|
if !schedules.contains(label) {
|
|
schedules.insert(Schedule::new(label));
|
|
}
|
|
|
|
let schedule = schedules.get_mut(label).unwrap();
|
|
f(schedule);
|
|
|
|
self
|
|
}
|
|
|
|
/// See [`App::configure_schedules`].
|
|
pub fn configure_schedules(
|
|
&mut self,
|
|
schedule_build_settings: ScheduleBuildSettings,
|
|
) -> &mut Self {
|
|
self.world_mut()
|
|
.resource_mut::<Schedules>()
|
|
.configure_schedules(schedule_build_settings);
|
|
self
|
|
}
|
|
|
|
/// See [`App::allow_ambiguous_component`].
|
|
pub fn allow_ambiguous_component<T: Component>(&mut self) -> &mut Self {
|
|
self.world_mut().allow_ambiguous_component::<T>();
|
|
self
|
|
}
|
|
|
|
/// See [`App::allow_ambiguous_resource`].
|
|
pub fn allow_ambiguous_resource<T: Resource>(&mut self) -> &mut Self {
|
|
self.world_mut().allow_ambiguous_resource::<T>();
|
|
self
|
|
}
|
|
|
|
/// See [`App::ignore_ambiguity`].
|
|
#[track_caller]
|
|
pub fn ignore_ambiguity<M1, M2, S1, S2>(
|
|
&mut self,
|
|
schedule: impl ScheduleLabel,
|
|
a: S1,
|
|
b: S2,
|
|
) -> &mut Self
|
|
where
|
|
S1: IntoSystemSet<M1>,
|
|
S2: IntoSystemSet<M2>,
|
|
{
|
|
let schedule = schedule.intern();
|
|
let mut schedules = self.world.resource_mut::<Schedules>();
|
|
|
|
schedules.ignore_ambiguity(schedule, a, b);
|
|
|
|
self
|
|
}
|
|
|
|
/// See [`App::add_event`].
|
|
pub fn add_event<T>(&mut self) -> &mut Self
|
|
where
|
|
T: Event,
|
|
{
|
|
if !self.world.contains_resource::<Events<T>>() {
|
|
EventRegistry::register_event::<T>(self.world_mut());
|
|
}
|
|
|
|
self
|
|
}
|
|
|
|
/// See [`App::add_plugins`].
|
|
pub fn add_plugins<M>(&mut self, plugins: impl Plugins<M>) -> &mut Self {
|
|
self.run_as_app(|app| plugins.add_to_app(app));
|
|
self
|
|
}
|
|
|
|
/// See [`App::is_plugin_added`].
|
|
pub fn is_plugin_added<T>(&self) -> bool
|
|
where
|
|
T: Plugin,
|
|
{
|
|
self.plugin_names.contains(std::any::type_name::<T>())
|
|
}
|
|
|
|
/// See [`App::get_added_plugins`].
|
|
pub fn get_added_plugins<T>(&self) -> Vec<&T>
|
|
where
|
|
T: Plugin,
|
|
{
|
|
self.plugin_registry
|
|
.iter()
|
|
.filter_map(|p| p.downcast_ref())
|
|
.collect()
|
|
}
|
|
|
|
/// Returns `true` if there is no plugin in the middle of being built.
|
|
pub(crate) fn is_building_plugins(&self) -> bool {
|
|
self.plugin_build_depth > 0
|
|
}
|
|
|
|
/// Return the state of plugins.
|
|
#[inline]
|
|
pub fn plugins_state(&mut self) -> PluginsState {
|
|
match self.plugins_state {
|
|
PluginsState::Adding => {
|
|
let mut state = PluginsState::Ready;
|
|
let plugins = std::mem::take(&mut self.plugin_registry);
|
|
self.run_as_app(|app| {
|
|
for plugin in &plugins {
|
|
if !plugin.ready(app) {
|
|
state = PluginsState::Adding;
|
|
return;
|
|
}
|
|
}
|
|
});
|
|
self.plugin_registry = plugins;
|
|
state
|
|
}
|
|
state => state,
|
|
}
|
|
}
|
|
|
|
/// Runs [`Plugin::finish`] for each plugin.
|
|
pub fn finish(&mut self) {
|
|
let plugins = std::mem::take(&mut self.plugin_registry);
|
|
self.run_as_app(|app| {
|
|
for plugin in &plugins {
|
|
plugin.finish(app);
|
|
}
|
|
});
|
|
self.plugin_registry = plugins;
|
|
self.plugins_state = PluginsState::Finished;
|
|
}
|
|
|
|
/// Runs [`Plugin::cleanup`] for each plugin.
|
|
pub fn cleanup(&mut self) {
|
|
let plugins = std::mem::take(&mut self.plugin_registry);
|
|
self.run_as_app(|app| {
|
|
for plugin in &plugins {
|
|
plugin.cleanup(app);
|
|
}
|
|
});
|
|
self.plugin_registry = plugins;
|
|
self.plugins_state = PluginsState::Cleaned;
|
|
}
|
|
|
|
/// See [`App::register_type`].
|
|
#[cfg(feature = "bevy_reflect")]
|
|
pub fn register_type<T: bevy_reflect::GetTypeRegistration>(&mut self) -> &mut Self {
|
|
let registry = self.world.resource_mut::<AppTypeRegistry>();
|
|
registry.write().register::<T>();
|
|
self
|
|
}
|
|
|
|
/// See [`App::register_type_data`].
|
|
#[cfg(feature = "bevy_reflect")]
|
|
pub fn register_type_data<
|
|
T: bevy_reflect::Reflect + bevy_reflect::TypePath,
|
|
D: bevy_reflect::TypeData + bevy_reflect::FromType<T>,
|
|
>(
|
|
&mut self,
|
|
) -> &mut Self {
|
|
let registry = self.world.resource_mut::<AppTypeRegistry>();
|
|
registry.write().register_type_data::<T, D>();
|
|
self
|
|
}
|
|
|
|
/// See [`App::register_function`].
|
|
#[cfg(feature = "reflect_functions")]
|
|
pub fn register_function<F, Marker>(&mut self, function: F) -> &mut Self
|
|
where
|
|
F: bevy_reflect::func::IntoFunction<'static, Marker> + 'static,
|
|
{
|
|
let registry = self.world.resource_mut::<AppFunctionRegistry>();
|
|
registry.write().register(function).unwrap();
|
|
self
|
|
}
|
|
|
|
/// See [`App::register_function_with_name`].
|
|
#[cfg(feature = "reflect_functions")]
|
|
pub fn register_function_with_name<F, Marker>(
|
|
&mut self,
|
|
name: impl Into<std::borrow::Cow<'static, str>>,
|
|
function: F,
|
|
) -> &mut Self
|
|
where
|
|
F: bevy_reflect::func::IntoFunction<'static, Marker> + 'static,
|
|
{
|
|
let registry = self.world.resource_mut::<AppFunctionRegistry>();
|
|
registry.write().register_with_name(name, function).unwrap();
|
|
self
|
|
}
|
|
}
|
|
|
|
/// The collection of sub-apps that belong to an [`App`].
|
|
#[derive(Default)]
|
|
pub struct SubApps {
|
|
/// The primary sub-app that contains the "main" world.
|
|
pub main: SubApp,
|
|
/// Other, labeled sub-apps.
|
|
pub sub_apps: HashMap<InternedAppLabel, SubApp>,
|
|
}
|
|
|
|
impl SubApps {
|
|
/// Calls [`update`](SubApp::update) for the main sub-app, and then calls
|
|
/// [`extract`](SubApp::extract) and [`update`](SubApp::update) for the rest.
|
|
pub fn update(&mut self) {
|
|
#[cfg(feature = "trace")]
|
|
let _bevy_update_span = info_span!("update").entered();
|
|
{
|
|
#[cfg(feature = "trace")]
|
|
let _bevy_frame_update_span = info_span!("main app").entered();
|
|
self.main.run_default_schedule();
|
|
}
|
|
for (_label, sub_app) in self.sub_apps.iter_mut() {
|
|
#[cfg(feature = "trace")]
|
|
let _sub_app_span = info_span!("sub app", name = ?_label).entered();
|
|
sub_app.extract(&mut self.main.world);
|
|
sub_app.update();
|
|
}
|
|
|
|
self.main.world.clear_trackers();
|
|
}
|
|
|
|
/// Returns an iterator over the sub-apps (starting with the main one).
|
|
pub fn iter(&self) -> impl Iterator<Item = &SubApp> + '_ {
|
|
std::iter::once(&self.main).chain(self.sub_apps.values())
|
|
}
|
|
|
|
/// Returns a mutable iterator over the sub-apps (starting with the main one).
|
|
pub fn iter_mut(&mut self) -> impl Iterator<Item = &mut SubApp> + '_ {
|
|
std::iter::once(&mut self.main).chain(self.sub_apps.values_mut())
|
|
}
|
|
|
|
/// Extract data from the main world into the [`SubApp`] with the given label and perform an update if it exists.
|
|
pub fn update_subapp_by_label(&mut self, label: impl AppLabel) {
|
|
if let Some(sub_app) = self.sub_apps.get_mut(&label.intern()) {
|
|
sub_app.extract(&mut self.main.world);
|
|
sub_app.update();
|
|
}
|
|
}
|
|
}
|