diff --git a/src/Builtin/Aspects.cs b/src/Builtin/Aspects.cs index 9f552c9..fd83108 100644 --- a/src/Builtin/Aspects.cs +++ b/src/Builtin/Aspects.cs @@ -7,7 +7,7 @@ public readonly TPool pool; public SingleAspect(Builder b) { - pool = b.Include(); + pool = b.IncludePool(); } } public sealed class CombinedAspect : EcsAspect diff --git a/src/EcsAspect.cs b/src/EcsAspect.cs index 587771f..0436848 100644 --- a/src/EcsAspect.cs +++ b/src/EcsAspect.cs @@ -104,19 +104,19 @@ namespace DCFApixels.DragonECS } #region Include/Exclude/Optional/Combine - public TPool Include() where TPool : IEcsPoolImplementation, new() + public TPool IncludePool() where TPool : IEcsPoolImplementation, new() { var pool = _world.GetPoolInstance(); IncludeImplicit(pool.ComponentType); return pool; } - public TPool Exclude() where TPool : IEcsPoolImplementation, new() + public TPool ExcludePool() where TPool : IEcsPoolImplementation, new() { var pool = _world.GetPoolInstance(); ExcludeImplicit(pool.ComponentType); return pool; } - public TPool Optional() where TPool : IEcsPoolImplementation, new() + public TPool OptionalPool() where TPool : IEcsPoolImplementation, new() { return _world.GetPoolInstance(); } @@ -147,9 +147,9 @@ namespace DCFApixels.DragonECS #endif private void SupportReflectionHack() where TPool : IEcsPoolImplementation, new() { - Include(); - Exclude(); - Optional(); + IncludePool(); + ExcludePool(); + OptionalPool(); IncludeImplicit(null); ExcludeImplicit(null); } diff --git a/src/Pools/EcsPool.cs b/src/Pools/EcsPool.cs index ce9364b..5fc251e 100644 --- a/src/Pools/EcsPool.cs +++ b/src/Pools/EcsPool.cs @@ -269,17 +269,17 @@ namespace DCFApixels.DragonECS [MethodImpl(MethodImplOptions.AggressiveInlining)] public static EcsPool Include(this EcsAspect.Builder self) where TComponent : struct, IEcsComponent { - return self.Include>(); + return self.IncludePool>(); } [MethodImpl(MethodImplOptions.AggressiveInlining)] public static EcsPool Exclude(this EcsAspect.Builder self) where TComponent : struct, IEcsComponent { - return self.Exclude>(); + return self.ExcludePool>(); } [MethodImpl(MethodImplOptions.AggressiveInlining)] public static EcsPool Optional(this EcsAspect.Builder self) where TComponent : struct, IEcsComponent { - return self.Optional>(); + return self.OptionalPool>(); } } } diff --git a/src/Pools/EcsTagPool.cs b/src/Pools/EcsTagPool.cs index 8ee7ac0..eb5b56d 100644 --- a/src/Pools/EcsTagPool.cs +++ b/src/Pools/EcsTagPool.cs @@ -250,17 +250,17 @@ namespace DCFApixels.DragonECS [MethodImpl(MethodImplOptions.AggressiveInlining)] public static EcsTagPool Include(this EcsAspect.Builder self) where TTagComponent : struct, IEcsTagComponent { - return self.Include>(); + return self.IncludePool>(); } [MethodImpl(MethodImplOptions.AggressiveInlining)] public static EcsTagPool Exclude(this EcsAspect.Builder self) where TTagComponent : struct, IEcsTagComponent { - return self.Exclude>(); + return self.ExcludePool>(); } [MethodImpl(MethodImplOptions.AggressiveInlining)] public static EcsTagPool Optional(this EcsAspect.Builder self) where TTagComponent : struct, IEcsTagComponent { - return self.Optional>(); + return self.OptionalPool>(); } //--------------------------------------------------- @@ -279,17 +279,17 @@ namespace DCFApixels.DragonECS [MethodImpl(MethodImplOptions.AggressiveInlining)] public static EcsTagPool IncludeTag(this EcsAspect.Builder self) where TTagComponent : struct, IEcsTagComponent { - return self.Include>(); + return self.IncludePool>(); } [MethodImpl(MethodImplOptions.AggressiveInlining)] public static EcsTagPool ExcludeTag(this EcsAspect.Builder self) where TTagComponent : struct, IEcsTagComponent { - return self.Exclude>(); + return self.ExcludePool>(); } [MethodImpl(MethodImplOptions.AggressiveInlining)] public static EcsTagPool OptionalTag(this EcsAspect.Builder self) where TTagComponent : struct, IEcsTagComponent { - return self.Optional>(); + return self.OptionalPool>(); } } }