Merge remote-tracking branch 'origin/master'

This commit is contained in:
Gered 2023-05-30 18:52:39 -04:00
commit 3beb0f3449

View file

@ -35,10 +35,8 @@ impl AppState<GameContext> for DemoState {
ui.separator(); ui.separator();
ui.text_colored([1.0, 1.0, 0.0, 1.0], "Slimes"); ui.text_colored([1.0, 1.0, 0.0, 1.0], "Slimes");
let mut positions = context.core.entities.components_mut::<Position>().unwrap(); let mut positions = context.core.entities.components_mut::<Position>().unwrap();
let mut slime_types = context.core.entities.components::<Slime>(); for (slime, slime_type) in context.core.entities.components::<Slime>().unwrap().iter() {
for (slime, _) in context.core.entities.components::<Slime>().unwrap().iter() {
let position = positions.get(slime).unwrap(); let position = positions.get(slime).unwrap();
let slime_type = slime_types.get(slime).unwrap();
ui.text(format!("{:2} @ {:3.0},{:3.0}", *slime, position.0.x, position.0.y)); ui.text(format!("{:2} @ {:3.0},{:3.0}", *slime, position.0.x, position.0.y));
if let Some(slime_type_texture_id) = context.core.slime_texture_id_map.get(&slime_type.0) { if let Some(slime_type_texture_id) = context.core.slime_texture_id_map.get(&slime_type.0) {