From 63675d4168224b66d28c9d64a8e121ef397d4edd Mon Sep 17 00:00:00 2001 From: HampusM Date: Tue, 21 Jul 2026 14:32:26 +0200 Subject: refactor(engine): use pair macro in phase entity declarations --- engine/src/rendering/shader.rs | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'engine/src/rendering/shader.rs') diff --git a/engine/src/rendering/shader.rs b/engine/src/rendering/shader.rs index 74109a7..7d5bd51 100644 --- a/engine/src/rendering/shader.rs +++ b/engine/src/rendering/shader.rs @@ -28,8 +28,9 @@ use crate::asset::{ Submitter as AssetSubmitter, HANDLE_ASSETS_PHASE, }; +use crate::ecs::pair; use crate::builder; -use crate::ecs::pair::{ChildOf, Pair}; +use crate::ecs::pair::ChildOf; use crate::ecs::phase::{Phase, POST_UPDATE as POST_UPDATE_PHASE}; use crate::ecs::sole::Single; use crate::ecs::{declare_entity, Component, Sole}; @@ -1004,16 +1005,9 @@ enum ImportError CanonicalizePathFailed(#[source] std::io::Error), } -declare_entity!( - IMPORT_SHADERS_PHASE, - ( - Phase, - Pair::builder() - .relation::() - .target_id(*HANDLE_ASSETS_PHASE) - .build() - ) -); +declare_entity! { +pub IMPORT_SHADERS_PHASE: (Phase, pair!(ChildOf, { *HANDLE_ASSETS_PHASE })); +} pub(super) fn prepare(collector: &mut crate::ecs::extension::Collector<'_>) { -- cgit v1.2.3-18-g5258