From 723f48d8e008d216978b8ed7d70499c972cc5a1c Mon Sep 17 00:00:00 2001 From: HampusM Date: Fri, 30 Oct 2026 05:24:39 +0100 Subject: refactor(engine-ecs): replace uid::WithUid* traits with new component traits --- engine-ecs/src/uid.rs | 45 +-------------------------------------------- 1 file changed, 1 insertion(+), 44 deletions(-) (limited to 'engine-ecs/src/uid.rs') diff --git a/engine-ecs/src/uid.rs b/engine-ecs/src/uid.rs index 78ca2ad..6b1a4b5 100644 --- a/engine-ecs/src/uid.rs +++ b/engine-ecs/src/uid.rs @@ -1,10 +1,7 @@ use std::fmt::{Debug, Display, Formatter}; use std::sync::atomic::{AtomicU32, Ordering}; -use seq_macro::seq; - -use crate::component::Component; -use crate::util::{gen_mask_64, Array, BitMask, NumberExt}; +use crate::util::{gen_mask_64, BitMask, NumberExt}; static NEXT: AtomicU32 = AtomicU32::new(Uid::FIRST_UNIQUE_ID); @@ -165,43 +162,3 @@ pub struct PairParams pub relation: Uid, pub target: Uid, } - -pub trait With: 'static -{ - fn uid() -> Uid; -} - -impl With for ComponentT -{ - fn uid() -> Uid - { - Self::id() - } -} - -pub trait WithUidTuple -{ - type UidsArray: Array; - - fn uids() -> Self::UidsArray; -} - -macro_rules! impl_with_uid_tuple { - ($c: tt) => { - seq!(I in 0..=$c { - impl<#(WithUid~I: With,)*> WithUidTuple for (#(WithUid~I,)*) - { - type UidsArray = [Uid; $c + 1]; - - fn uids() -> Self::UidsArray - { - [#(WithUid~I::uid(),)*] - } - } - }); - }; -} - -seq!(C in 0..=16 { - impl_with_uid_tuple!(C); -}); -- cgit v1.2.3-18-g5258