diff options
Diffstat (limited to 'ecs')
| -rw-r--r-- | ecs/src/component.rs | 22 | ||||
| -rw-r--r-- | ecs/src/component/storage.rs | 21 |
2 files changed, 21 insertions, 22 deletions
diff --git a/ecs/src/component.rs b/ecs/src/component.rs index 46fbf8a..525bd98 100644 --- a/ecs/src/component.rs +++ b/ecs/src/component.rs @@ -50,12 +50,6 @@ pub trait Component: SystemInput + Any + TypeName /// Returns the component UID of a component event for this component. fn get_event_uid(&self, event_kind: ComponentEventKind) -> Uid; - #[doc(hidden)] - fn as_any_mut(&mut self) -> &mut dyn Any; - - #[doc(hidden)] - fn as_any(&self) -> &dyn Any; - /// Returns whether the component `self` is optional. fn self_is_optional(&self) -> bool { @@ -76,17 +70,17 @@ impl dyn Component { pub fn downcast_mut<Real: 'static>(&mut self) -> Option<&mut Real> { - self.as_any_mut().downcast_mut() + (self as &mut dyn Any).downcast_mut() } pub fn downcast_ref<Real: 'static>(&self) -> Option<&Real> { - self.as_any().downcast_ref() + (self as &dyn Any).downcast_ref() } pub fn is<Other: 'static>(&self) -> bool { - self.as_any().is::<Other>() + (self as &dyn Any).is::<Other>() } } @@ -128,16 +122,6 @@ where } } - fn as_any_mut(&mut self) -> &mut dyn Any - { - self - } - - fn as_any(&self) -> &dyn Any - { - self - } - fn self_is_optional(&self) -> bool { true diff --git a/ecs/src/component/storage.rs b/ecs/src/component/storage.rs index 4a00510..40909fb 100644 --- a/ecs/src/component/storage.rs +++ b/ecs/src/component/storage.rs @@ -192,10 +192,24 @@ impl Storage }); } - let add_edge_archetype_id = archetype_node + let add_edge_archetype_id = match archetype_node .get_or_insert_edges(component_id, ArchetypeEdges::default) .add - .unwrap_or_else(|| { + { + Some(add_edge_id) => { + if !self.graph.contains_archetype(add_edge_id) { + let (_, add_edge_comp_ids) = self + .graph + .get_node_by_id(archetype_id) + .expect("Archetype should exist") + .make_add_edge(component_id); + + self.graph.create_node(add_edge_id, &add_edge_comp_ids); + } + + add_edge_id + } + None => { let archetype_node = self .graph .get_node_by_id_mut(archetype_id) @@ -214,7 +228,8 @@ impl Storage } add_edge_id - }); + } + }; { let add_edge_archetype_node = self |