FyroxEngine/Fyrox
1
0
Fork 0
mirror of https://github.com/FyroxEngine/Fyrox.git synced 2026-10-12 02:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

unified naming for field fetching via reflection

Browse Source 
- previous approach with `ComponentProvider` trait was quite misleading, it didn't return a "component" - it simply returned marked fieds
- the new approach is more explicit - method names tells exactly what they do
This commit is contained in:
Dmitry Stepanov
2026-05-10 18:28:18 +03:00
parent fcd280057b
commit 1c0cf15c50
52 changed files with 216 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fyrox-graph/src/lib.rs
+14 -14
View File
@@ -629,20 +629,20 @@ pub trait SceneGraphNode: Reflect + NameProvider + Clone + 'static {
/// Tries to borrow a component of given type.
#[inline]
fn component_ref<T: Reflect>(&self) -> Option<&T> {
(self as &dyn Reflect).self_or_field_ref_of_type::<T>()
fn self_or_field_ref<T: Reflect>(&self) -> Option<&T> {
(self as &dyn Reflect).self_or_field_ref::<T>()
}
/// Tries to borrow a component of given type.
#[inline]
fn component_mut<T: Reflect>(&mut self) -> Option<&mut T> {
(self as &mut dyn Reflect).self_or_field_mut_of_type::<T>()
fn self_or_field_mut<T: Reflect>(&mut self) -> Option<&mut T> {
(self as &mut dyn Reflect).self_or_field_mut::<T>()
}
/// Checks if the node has a component of given type.
#[inline]
fn has_component<T: Reflect>(&self) -> bool {
self.component_ref::<T>().is_some()
fn is_or_has_field<T: Reflect>(&self) -> bool {
self.self_or_field_ref::<T>().is_some()
}
}
@@ -886,8 +886,8 @@ pub trait SceneGraph: 'static {
{
self.try_get_node(handle).and_then(|n| {
(n as &dyn Reflect)
.self_or_field_ref_of_type()
.ok_or(PoolError::NoSuchComponent(handle.into()))
.self_or_field_ref()
.ok_or(PoolError::NoSuchField(handle.into()))
})
}
@@ -899,8 +899,8 @@ pub trait SceneGraph: 'static {
{
self.try_get_node_mut(handle).and_then(|n| {
(n as &mut dyn Reflect)
.self_or_field_mut_of_type()
.ok_or(PoolError::NoSuchComponent(handle.into()))
.self_or_field_mut()
.ok_or(PoolError::NoSuchField(handle.into()))
})
}
@@ -974,7 +974,7 @@ pub trait SceneGraph: 'static {
}
#[inline]
fn find_component_up<T>(
fn find_self_or_field_up<T>(
&self,
node_handle: Handle<impl ObjectOrVariant<Self::Node>>,
) -> Option<(Handle<Self::Node>, &T)>
@@ -982,12 +982,12 @@ pub trait SceneGraph: 'static {
T: Reflect,
{
self.find_up_map(node_handle, &mut |node| {
(node as &dyn Reflect).self_or_field_ref_of_type::<T>()
(node as &dyn Reflect).self_or_field_ref::<T>()
})
}
#[inline]
fn find_component<T>(
fn find_self_or_field<T>(
&self,
node_handle: Handle<impl ObjectOrVariant<Self::Node>>,
) -> Option<(Handle<Self::Node>, &T)>
@@ -995,7 +995,7 @@ pub trait SceneGraph: 'static {
T: Reflect,
{
self.find_map(node_handle, &mut |node| {
(node as &dyn Reflect).self_or_field_ref_of_type::<T>()
(node as &dyn Reflect).self_or_field_ref::<T>()
})
}