From 8b0f4631290d2b1e3ee9ff8256b4eea86fc07bbf Mon Sep 17 00:00:00 2001 From: Mikhail <99481254+DCFApixels@users.noreply.github.com> Date: Mon, 29 May 2023 23:03:02 +0800 Subject: [PATCH] refactoring --- src/EcsSubject.cs | 4 ++-- src/EcsWorld.cs | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/EcsSubject.cs b/src/EcsSubject.cs index a1f60b3..9efb761 100644 --- a/src/EcsSubject.cs +++ b/src/EcsSubject.cs @@ -82,7 +82,7 @@ namespace DCFApixels.DragonECS { return _world.GetPool(); } - public void IncludeImplicit() + private void IncludeImplicit() { int id = _world.GetComponentID(); #if (DEBUG && !DISABLE_DEBUG) || !DISABLE_DRAGONECS_ASSERT_CHEKS @@ -90,7 +90,7 @@ namespace DCFApixels.DragonECS #endif _inc.Add(_world.GetComponentID()); } - public void ExcludeImplicit() + private void ExcludeImplicit() { int id = _world.GetComponentID(); #if (DEBUG && !DISABLE_DEBUG) || !DISABLE_DRAGONECS_ASSERT_CHEKS diff --git a/src/EcsWorld.cs b/src/EcsWorld.cs index ccae5fa..194da51 100644 --- a/src/EcsWorld.cs +++ b/src/EcsWorld.cs @@ -108,7 +108,8 @@ namespace DCFApixels.DragonECS #endregion #region GetComponentID - public int GetComponentID() => WorldMetaStorage.GetComponentId(_worldTypeID);////ComponentType.uniqueID; + public int GetComponentID() => WorldMetaStorage.GetComponentId(_worldTypeID); + public bool IsComponentTypeDeclared() => WorldMetaStorage.IsComponentTypeDeclared(_worldTypeID); #endregion @@ -380,7 +381,7 @@ namespace DCFApixels.DragonECS } #region WorldMetaStorage - public static class WorldMetaStorage + internal static class WorldMetaStorage { private static List _resizer = new List(); private static int _tokenCount = 0; @@ -421,6 +422,7 @@ namespace DCFApixels.DragonECS [MethodImpl(MethodImplOptions.AggressiveInlining)] public static int GetExecutorId(int worldID) => Executor.Get(worldID); + public static bool IsComponentTypeDeclared(int worldID) => IsComponentTypeDeclared(worldID, typeof(TComponent)); public static bool IsComponentTypeDeclared(int worldID, Type type) => _metas[worldID].IsDeclaredType(type); public static Type GetComponentType(int worldID, int componentID) => _metas[worldID].GetComponentType(componentID);