Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bevy_reflect: Adding support for Atomic values #14419

Merged
merged 6 commits into from
Jul 29, 2024
Merged

bevy_reflect: Adding support for Atomic values #14419

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1dd08c9
bevy_reflect: Adding support for Atomic types (except for AtomicPtr)
recatek Jul 21, 2024
b28dc57
Merge branch 'main' into main
recatek Jul 21, 2024
ce9ef66
- Adding ReflectSerialize and ReflectDeserialize
recatek Jul 22, 2024
56469f9
Merge branch 'bevyengine:main' into main
recatek Jul 22, 2024
bb37f80
Merge branch 'main' into main
recatek Jul 27, 2024
12be19a
Fixing duplicates from merge artifacts
recatek Jul 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
165 changes: 165 additions & 0 deletions crates/bevy_reflect/src/impls/std.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,171 @@ impl_type_path!(::bevy_utils::NoOpHash);
impl_type_path!(::bevy_utils::EntityHash);
impl_type_path!(::bevy_utils::FixedState);

macro_rules! impl_reflect_for_atomic {
($ty:ty, $ordering:ident) => {
recatek marked this conversation as resolved.
Show resolved Hide resolved
const _: () = {
#[allow(unused_mut)]
impl bevy_reflect::GetTypeRegistration for $ty
recatek marked this conversation as resolved.
Show resolved Hide resolved
where
$ty: ::core::any::Any + ::core::marker::Send + ::core::marker::Sync,
{
fn get_type_registration() -> bevy_reflect::TypeRegistration {
let mut registration = bevy_reflect::TypeRegistration::of::<Self>();
registration.insert::<bevy_reflect::ReflectFromPtr>(bevy_reflect::FromType::<
Self,
>::from_type());
registration.insert::<bevy_reflect::ReflectFromReflect>(
bevy_reflect::FromType::<Self>::from_type(),
);
registration
.insert::<ReflectDefault>(bevy_reflect::FromType::<Self>::from_type());
registration
recatek marked this conversation as resolved.
Show resolved Hide resolved
}
}

impl_type_path!($ty);
recatek marked this conversation as resolved.
Show resolved Hide resolved
recatek marked this conversation as resolved.
Show resolved Hide resolved

impl bevy_reflect::Typed for $ty
where
$ty: ::core::any::Any + ::core::marker::Send + ::core::marker::Sync,
{
fn type_info() -> &'static bevy_reflect::TypeInfo {
static CELL: bevy_reflect::utility::NonGenericTypeInfoCell =
bevy_reflect::utility::NonGenericTypeInfoCell::new();
CELL.get_or_set(|| {
let info = bevy_reflect::ValueInfo::new::<Self>();
bevy_reflect::TypeInfo::Value(info)
})
}
}
impl bevy_reflect::Reflect for $ty
where
$ty: ::core::any::Any + ::core::marker::Send + ::core::marker::Sync,
{
#[inline]
fn get_represented_type_info(
&self,
) -> ::core::option::Option<&'static bevy_reflect::TypeInfo> {
::core::option::Option::Some(<Self as bevy_reflect::Typed>::type_info())
}
#[inline]
fn into_any(
self: ::std::boxed::Box<Self>,
) -> ::std::boxed::Box<dyn ::core::any::Any> {
self
}
#[inline]
fn as_any(&self) -> &dyn ::core::any::Any {
self
}
#[inline]
fn as_any_mut(&mut self) -> &mut dyn ::core::any::Any {
self
}
#[inline]
fn into_reflect(
self: ::std::boxed::Box<Self>,
) -> ::std::boxed::Box<dyn bevy_reflect::Reflect> {
self
}
#[inline]
fn as_reflect(&self) -> &dyn bevy_reflect::Reflect {
self
}
#[inline]
fn as_reflect_mut(&mut self) -> &mut dyn bevy_reflect::Reflect {
self
}
#[inline]
fn clone_value(&self) -> ::std::boxed::Box<dyn bevy_reflect::Reflect> {
::std::boxed::Box::new(<$ty>::new(
self.load(::std::sync::atomic::Ordering::$ordering),
))
}
#[inline]
fn try_apply(
&mut self,
value: &dyn bevy_reflect::Reflect,
) -> ::core::result::Result<(), bevy_reflect::ApplyError> {
let any = bevy_reflect::Reflect::as_any(value);
if let ::core::option::Option::Some(value) =
<dyn ::core::any::Any>::downcast_ref::<Self>(any)
{
*self = <$ty>::new(value.load(::std::sync::atomic::Ordering::$ordering));
} else {
return ::core::result::Result::Err(
bevy_reflect::ApplyError::MismatchedTypes {
from_type: ::core::convert::Into::into(
bevy_reflect::DynamicTypePath::reflect_type_path(value),
),
to_type: ::core::convert::Into::into(
<Self as bevy_reflect::TypePath>::type_path(),
),
},
);
}
::core::result::Result::Ok(())
}
#[inline]
fn set(
&mut self,
value: ::std::boxed::Box<dyn bevy_reflect::Reflect>,
) -> ::core::result::Result<(), ::std::boxed::Box<dyn bevy_reflect::Reflect>>
{
*self = <dyn bevy_reflect::Reflect>::take(value)?;
::core::result::Result::Ok(())
}
#[inline]
fn reflect_kind(&self) -> bevy_reflect::ReflectKind {
bevy_reflect::ReflectKind::Value
}
#[inline]
fn reflect_ref(&self) -> bevy_reflect::ReflectRef {
bevy_reflect::ReflectRef::Value(self)
}
#[inline]
fn reflect_mut(&mut self) -> bevy_reflect::ReflectMut {
bevy_reflect::ReflectMut::Value(self)
}
#[inline]
fn reflect_owned(self: ::std::boxed::Box<Self>) -> bevy_reflect::ReflectOwned {
bevy_reflect::ReflectOwned::Value(self)
}
fn debug(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
::core::fmt::Debug::fmt(self, f)
}
}
impl bevy_reflect::FromReflect for $ty
where
$ty: ::core::any::Any + ::core::marker::Send + ::core::marker::Sync,
{
fn from_reflect(
reflect: &dyn bevy_reflect::Reflect,
) -> ::core::option::Option<Self> {
::core::option::Option::Some(<$ty>::new(
<dyn ::core::any::Any>::downcast_ref::<$ty>(
<dyn bevy_reflect::Reflect>::as_any(reflect),
)?
.load(::std::sync::atomic::Ordering::$ordering),
))
}
}
};
};
}

impl_reflect_for_atomic!(::std::sync::atomic::AtomicIsize, SeqCst);
impl_reflect_for_atomic!(::std::sync::atomic::AtomicUsize, SeqCst);
impl_reflect_for_atomic!(::std::sync::atomic::AtomicI64, SeqCst);
impl_reflect_for_atomic!(::std::sync::atomic::AtomicU64, SeqCst);
impl_reflect_for_atomic!(::std::sync::atomic::AtomicI32, SeqCst);
impl_reflect_for_atomic!(::std::sync::atomic::AtomicU32, SeqCst);
impl_reflect_for_atomic!(::std::sync::atomic::AtomicI16, SeqCst);
impl_reflect_for_atomic!(::std::sync::atomic::AtomicU16, SeqCst);
impl_reflect_for_atomic!(::std::sync::atomic::AtomicI8, SeqCst);
impl_reflect_for_atomic!(::std::sync::atomic::AtomicU8, SeqCst);
impl_reflect_for_atomic!(::std::sync::atomic::AtomicBool, SeqCst);

macro_rules! impl_reflect_for_veclike {
($ty:path, $insert:expr, $remove:expr, $push:expr, $pop:expr, $sub:ty) => {
impl<T: FromReflect + MaybeTyped + TypePath + GetTypeRegistration> List for $ty {
Expand Down