diff options
| -rw-r--r-- | engine/src/input.rs | 7 | ||||
| -rw-r--r-- | engine/src/window.rs | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/engine/src/input.rs b/engine/src/input.rs index 95de048..d6a82f6 100644 --- a/engine/src/input.rs +++ b/engine/src/input.rs @@ -1,8 +1,8 @@ use std::collections::HashMap; use ecs::extension::Collector as ExtensionCollector; +use ecs::pair::{ChildOf, Pair}; use ecs::phase::{Phase, PRE_UPDATE as PRE_UPDATE_PHASE, START as START_PHASE}; -use ecs::relationship::{ChildOf, Relationship}; use ecs::sole::Single; use ecs::{static_entity, Sole}; @@ -18,10 +18,7 @@ pub use reexports::*; static_entity!( SET_PREV_KEY_STATE_PHASE, - ( - Phase, - <Relationship<ChildOf, Phase>>::new(*WINDOW_UPDATE_PHASE) - ) + (Phase, Pair::new::<ChildOf>(*WINDOW_UPDATE_PHASE)) ); #[derive(Debug, Sole)] diff --git a/engine/src/window.rs b/engine/src/window.rs index 00c360e..614ed92 100644 --- a/engine/src/window.rs +++ b/engine/src/window.rs @@ -4,8 +4,8 @@ use std::ffi::{CStr, CString}; use bitflags::bitflags; use ecs::actions::Actions; use ecs::extension::Collector as ExtensionCollector; +use ecs::pair::{ChildOf, Pair}; use ecs::phase::{Phase, PRESENT as PRESENT_PHASE, START as START_PHASE}; -use ecs::relationship::{ChildOf, Relationship}; use ecs::sole::Single; use ecs::{static_entity, Sole}; use glfw::window::{Hint as WindowCreationHint, HintValue as WindowCreationHintValue}; @@ -17,7 +17,7 @@ use crate::vector::Vec2; static_entity!( pub UPDATE_PHASE, - (Phase, <Relationship<ChildOf, Phase>>::new(*PRESENT_PHASE)) + (Phase, Pair::new::<ChildOf>(*PRESENT_PHASE)) ); #[derive(Debug, Sole)] |