mirror of
https://github.com/bevyengine/bevy
synced 2024-12-23 03:23:20 +00:00
afe0a0650b
# Objective The type `Local<T>` unnecessarily has the bound `T: Sync` when the local is used in an exclusive system. ## Solution Lift the bound. --- ## Changelog Removed the bound `T: Sync` from `Local<T>` when used as an `ExclusiveSystemParam`.
97 lines
3 KiB
Rust
97 lines
3 KiB
Rust
use crate::{
|
|
prelude::{FromWorld, QueryState},
|
|
query::{ReadOnlyWorldQuery, WorldQuery},
|
|
system::{Local, SystemMeta, SystemParam, SystemState},
|
|
world::World,
|
|
};
|
|
use bevy_ecs_macros::all_tuples;
|
|
use bevy_utils::synccell::SyncCell;
|
|
|
|
pub trait ExclusiveSystemParam: Sized {
|
|
type State: Send + Sync + 'static;
|
|
type Item<'s>: ExclusiveSystemParam<State = Self::State>;
|
|
|
|
fn init(world: &mut World, system_meta: &mut SystemMeta) -> Self::State;
|
|
#[inline]
|
|
fn apply(_state: &mut Self::State, _world: &mut World) {}
|
|
|
|
fn get_param<'s>(state: &'s mut Self::State, system_meta: &SystemMeta) -> Self::Item<'s>;
|
|
}
|
|
|
|
pub type ExclusiveSystemParamItem<'s, P> = <P as ExclusiveSystemParam>::Item<'s>;
|
|
|
|
impl<'a, Q: WorldQuery + 'static, F: ReadOnlyWorldQuery + 'static> ExclusiveSystemParam
|
|
for &'a mut QueryState<Q, F>
|
|
{
|
|
type State = QueryState<Q, F>;
|
|
type Item<'s> = &'s mut QueryState<Q, F>;
|
|
|
|
fn init(world: &mut World, _system_meta: &mut SystemMeta) -> Self::State {
|
|
QueryState::new(world)
|
|
}
|
|
|
|
fn get_param<'s>(state: &'s mut Self::State, _system_meta: &SystemMeta) -> Self::Item<'s> {
|
|
state
|
|
}
|
|
}
|
|
|
|
impl<'a, P: SystemParam + 'static> ExclusiveSystemParam for &'a mut SystemState<P> {
|
|
type State = SystemState<P>;
|
|
type Item<'s> = &'s mut SystemState<P>;
|
|
|
|
fn init(world: &mut World, _system_meta: &mut SystemMeta) -> Self::State {
|
|
SystemState::new(world)
|
|
}
|
|
|
|
fn get_param<'s>(state: &'s mut Self::State, _system_meta: &SystemMeta) -> Self::Item<'s> {
|
|
state
|
|
}
|
|
}
|
|
|
|
impl<'_s, T: FromWorld + Send + 'static> ExclusiveSystemParam for Local<'_s, T> {
|
|
type State = SyncCell<T>;
|
|
type Item<'s> = Local<'s, T>;
|
|
|
|
fn init(world: &mut World, _system_meta: &mut SystemMeta) -> Self::State {
|
|
SyncCell::new(T::from_world(world))
|
|
}
|
|
|
|
fn get_param<'s>(state: &'s mut Self::State, _system_meta: &SystemMeta) -> Self::Item<'s> {
|
|
Local(state.get())
|
|
}
|
|
}
|
|
|
|
macro_rules! impl_exclusive_system_param_tuple {
|
|
($($param: ident),*) => {
|
|
#[allow(unused_variables)]
|
|
#[allow(non_snake_case)]
|
|
impl<$($param: ExclusiveSystemParam),*> ExclusiveSystemParam for ($($param,)*) {
|
|
type State = ($($param::State,)*);
|
|
type Item<'s> = ($($param::Item<'s>,)*);
|
|
|
|
#[inline]
|
|
fn init(_world: &mut World, _system_meta: &mut SystemMeta) -> Self::State {
|
|
(($($param::init(_world, _system_meta),)*))
|
|
}
|
|
|
|
#[inline]
|
|
fn apply(state: &mut Self::State, _world: &mut World) {
|
|
let ($($param,)*) = state;
|
|
$($param::apply($param, _world);)*
|
|
}
|
|
|
|
#[inline]
|
|
#[allow(clippy::unused_unit)]
|
|
fn get_param<'s>(
|
|
state: &'s mut Self::State,
|
|
system_meta: &SystemMeta,
|
|
) -> Self::Item<'s> {
|
|
|
|
let ($($param,)*) = state;
|
|
($($param::get_param($param, system_meta),)*)
|
|
}
|
|
}
|
|
};
|
|
}
|
|
|
|
all_tuples!(impl_exclusive_system_param_tuple, 0, 16, P);
|