diff options
Diffstat (limited to 'engine/src/windowing.rs')
| -rw-r--r-- | engine/src/windowing.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/src/windowing.rs b/engine/src/windowing.rs index b02a34c..e07ba3e 100644 --- a/engine/src/windowing.rs +++ b/engine/src/windowing.rs @@ -11,7 +11,7 @@ use crossbeam_channel::{ use ecs::actions::Actions; use ecs::component::Component; use ecs::entity::obtainer::Obtainer as EntityObtainer; -use ecs::event::component::{Added, Changed, Removed}; +use ecs::event::component::{Added, Changed, EventMatchExt, Removed}; use ecs::pair::{ChildOf, Pair}; use ecs::phase::{Phase, UPDATE as UPDATE_PHASE}; use ecs::sole::Single; @@ -99,7 +99,7 @@ fn handle_window_creation_ready( ) { for evt_match in &observe { - let Some(ent) = evt_match.get_entity() else { + let Some(ent) = evt_match.try_get_entity() else { unreachable!(); }; @@ -252,9 +252,9 @@ fn handle_window_changed( ) { for evt_match in &observe { - let window_ent_id = evt_match.id(); + let window_ent_id = evt_match.entity_id(); - let window = evt_match.get_changed_comp(); + let window = evt_match.get_ent_target_comp(); let Some((winit_window, _)) = context.windows.get(&window.wid()) else { tracing::error!( @@ -282,11 +282,11 @@ fn handle_window_removed( ) { for evt_match in &observe { - let window = evt_match.get_removed_comp(); + let window = evt_match.get_ent_target_comp(); context.windows.remove(window.wid()); - actions.add_components(evt_match.id(), (WindowClosed,)); + actions.add_components(evt_match.entity_id(), (WindowClosed,)); } if window_query.iter().count() == 1 { |