alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2024-12-23 08:11:33 +11:00
Code Issues Packages Projects Releases Wiki Activity

simplify entity update loop

Browse source
This commit is contained in:
Corwin 2023-08-28 14:00:39 +01:00
parent 0b45c006c8
commit 2a02da1c2f
No known key found for this signature in database
1 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
examples/the-dungeon-puzzlers-lament/src/game/simulation/entity.rs
View file

@ -315,36 +315,35 @@ impl EntityMap {
.map .map
.iter() .iter()
.map(|(key, entity)| (key, entity.desired_action(hero))) .map(|(key, entity)| (key, entity.desired_action(hero)))
.filter_map(|(key, action)| match action {
Action::Nothing => None,
Action::Direction(direction) => Some((key, direction)),
})
.collect::<Vec<_>>(); .collect::<Vec<_>>();
entities_to_try_update.sort_unstable_by_key(|(e, _)| { entities_to_try_update.sort_unstable_by_key(|(e, _)| {
let e = self.map.get(*e).unwrap(); let e = self.map.get(*e).unwrap();
e.location.x + e.location.y * 1000 e.location.x + e.location.y * 1000
}); });
let mut entities_to_try_update = VecDeque::from(entities_to_try_update);
while let Some((entity_to_update_key, desired_action)) = entities_to_try_update.pop_front() let entities_to_try_update = entities_to_try_update;
{
match desired_action {
Action::Nothing => {}
Action::Direction(direction) => {
let (_, hero_has_died_result, win_has_triggered_result) = self
.attempt_move_in_direction(
map,
&mut animations,
entity_to_update_key,
direction,
true,
self.map
.get(entity_to_update_key)
.and_then(|e| e.push_depth())
.unwrap_or(0),
);
hero_has_died |= hero_has_died_result; for (entity_to_update_key, direction) in entities_to_try_update.iter().copied() {
win_has_triggered |= win_has_triggered_result; let (_, hero_has_died_result, win_has_triggered_result) = self
} .attempt_move_in_direction(
} map,
&mut animations,
entity_to_update_key,
direction,
true,
self.map
.get(entity_to_update_key)
.and_then(|e| e.push_depth())
.unwrap_or(0),
);
hero_has_died |= hero_has_died_result;
win_has_triggered |= win_has_triggered_result;
} }
( (