mirrors/stevenarella
mirrors
/
stevenarella
mirror of https://github.com/iceiix/stevenarella.git
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Clean up lifetimes in the ecs

This commit is contained in:
Thinkofname 2016-03-27 14:42:02 +01:00
parent 6a692ba37d
commit 347244c65c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ecs/mod.rs
View File

@ -389,7 +389,7 @@ impl Manager {
}
/// Returns the given component that the key points to if it exists.
pub fn get_component<'a, 'b, T>(&'a self, entity: Entity, key: Key<T>) -> Option<&'b T> {
pub fn get_component<'a, 'b: 'a, T>(&'a self, entity: Entity, key: Key<T>) -> Option<&'b T> {
let components = match self.components.get(key.id).and_then(|v| v.as_ref()) {
Some(val) => val,
None => return None,
@ -407,13 +407,13 @@ impl Manager {
/// Same as `get_component` but doesn't require a key. Using a key
/// is better for frequent lookups.
pub fn get_component_direct<'a, 'b, T: Any>(&'a self, entity: Entity) -> Option<&'b T> {
pub fn get_component_direct<'a, 'b: 'a, T: Any>(&'a self, entity: Entity) -> Option<&'b T> {
let key = self.get_key();
self.get_component(entity, key)
}
/// Returns the given component that the key points to if it exists.
pub fn get_component_mut<'a, 'b, T>(&'a mut self, entity: Entity, key: Key<T>) -> Option<&'b mut T> {
pub fn get_component_mut<'a, 'b: 'a, T>(&'a mut self, entity: Entity, key: Key<T>) -> Option<&'b mut T> {
let components = match self.components.get_mut(key.id).and_then(|v| v.as_mut()) {
Some(val) => val,
None => return None,
@ -431,7 +431,7 @@ impl Manager {
/// Same as `get_component_mut` but doesn't require a key. Using a key
/// is better for frequent lookups.
pub fn get_component_mut_direct<'a, 'b, T: Any>(&'a mut self, entity: Entity) -> Option<&'b mut T> {
pub fn get_component_mut_direct<'a, 'b: 'a, T: Any>(&'a mut self, entity: Entity) -> Option<&'b mut T> {
let key = self.get_key();
self.get_component_mut(entity, key)
}