From e728cacfc928f4ce06dca4ee2d3e4d4f7fdaf665 Mon Sep 17 00:00:00 2001 From: Mikhail <99481254+DCFApixels@users.noreply.github.com> Date: Thu, 22 Jun 2023 14:30:03 +0800 Subject: [PATCH] rename Subject to Aspect --- src/Extensions/EcsEntityConnect.cs | 8 ++++---- src/Extensions/Systems.cs | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Extensions/EcsEntityConnect.cs b/src/Extensions/EcsEntityConnect.cs index e7cff20..a32f320 100644 --- a/src/Extensions/EcsEntityConnect.cs +++ b/src/Extensions/EcsEntityConnect.cs @@ -5,10 +5,10 @@ namespace DCFApixels.DragonECS { public class EcsEntityConnect : MonoBehaviour { - private sealed class Subject : EcsSubject + private sealed class Aspect : EcsAspect { public readonly EcsPool unityGameObjects; - public Subject(Builder b) + public Aspect(Builder b) { unityGameObjects = b.Include(); } @@ -49,7 +49,7 @@ namespace DCFApixels.DragonECS { if(_entity.TryGetID(out int oldE) && _world != null) { - var s = _world.GetSubject(); + var s = _world.GetAspect(); s.unityGameObjects.Del(oldE); } _world = null; @@ -58,7 +58,7 @@ namespace DCFApixels.DragonECS { _entity = entity; _world = _entity.World; - var s = _world.GetSubject(); + var s = _world.GetAspect(); if (!s.unityGameObjects.Has(newE)) s.unityGameObjects.Add(newE) = new UnityGameObject(gameObject); if (applyTemplates) diff --git a/src/Extensions/Systems.cs b/src/Extensions/Systems.cs index 686a940..0c8f39d 100644 --- a/src/Extensions/Systems.cs +++ b/src/Extensions/Systems.cs @@ -7,10 +7,10 @@ namespace DCFApixels.DragonECS public class DeleteOneFrameComponentFixedSystem : IEcsFixedRunProcess, IEcsInject where TComponent : struct, IEcsComponent { - private sealed class Subject : EcsSubject + private sealed class Aspect : EcsAspect { public EcsPool pool; - public Subject(Builder b) => pool = b.Include(); + public Aspect(Builder b) => pool = b.Include(); } List _worlds = new List(); public void Inject(EcsWorld obj) => _worlds.Add(obj); @@ -21,8 +21,8 @@ namespace DCFApixels.DragonECS EcsWorld world = _worlds[i]; if (world.IsComponentTypeDeclared()) { - foreach (var e in world.Where(out Subject s)) - s.pool.Del(e); + foreach (var e in world.Where(out Aspect a)) + a.pool.Del(e); } } }