summaryrefslogtreecommitdiff
path: root/engine/src/asset.rs
diff options
context:
space:
mode:
Diffstat (limited to 'engine/src/asset.rs')
-rw-r--r--engine/src/asset.rs16
1 files changed, 5 insertions, 11 deletions
diff --git a/engine/src/asset.rs b/engine/src/asset.rs
index ebcf5c7..b72fc74 100644
--- a/engine/src/asset.rs
+++ b/engine/src/asset.rs
@@ -18,22 +18,16 @@ use std::sync::Arc;
use ecs::actions::Actions;
-use crate::ecs::pair::{ChildOf, Pair};
+use crate::ecs::pair;
+use crate::ecs::pair::ChildOf;
use crate::ecs::phase::{Phase, PRE_UPDATE as PRE_UPDATE_PHASE};
use crate::ecs::sole::Single;
use crate::ecs::{declare_entity, Sole};
use crate::work_queue::{Work, WorkQueue};
-declare_entity!(
- pub HANDLE_ASSETS_PHASE,
- (
- Phase,
- Pair::builder()
- .relation::<ChildOf>()
- .target_id(*PRE_UPDATE_PHASE)
- .build()
- )
-);
+declare_entity! {
+pub HANDLE_ASSETS_PHASE: (Phase, pair!(ChildOf, { *PRE_UPDATE_PHASE }));
+}
/// Asset label.
#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]