Implemented internals

Author: jeffreylanters

Runtime/Controller.cs

@@ -44,9 +44,9 @@ private void Update () {
 
       // Invoking 'Internal_OnUpdate' on each system.
       for (var _systemIndex = 0; _systemIndex < this.systems.Count; _systemIndex++)
-        this.systems[_systemIndex].Internal_OnUpdate ();
+        (this.systems[_systemIndex] as IEntitySystemInternals).OnUpdateInternal ();
       for (var _serviceIndex = 0; _serviceIndex < this.services.Count; _serviceIndex++)
-        this.services[_serviceIndex].Internal_OnUpdate ();
+        (this.services[_serviceIndex] as IServiceInternals).OnUpdateInternal ();
       // Invoking 'OnUpdate' on the controller.
       this.OnUpdate ();
       // Invoking 'OnUpdate' on each enabled system that Should to be updated.
@@ -133,15 +133,15 @@ public void Register (params System.Type[] typesOf) {
           this.systems.Add (_system);
           this.enabledSystemsCache.Add (_system);
           _system.OnInitialize ();
-          _system.Internal_OnInitialize ();
+          (_system as IEntitySystemInternals).OnInitializeInternal ();
         }
 
         // When the instance is a type of the system, add it to the services
         if (_instance is IService) {
           var _service = _instance as IService;
           this.services.Add (_service);
           _service.OnInitialize ();
-          _service.Internal_OnInitialize ();
+          (_service as IServiceInternals).OnInitializeInternal ();
         }
       }
 

Runtime/EntityComponent.cs

@@ -1,7 +1,7 @@
 namespace ElRaccoone.EntityComponentSystem {
 
   /// Base class for every entity component.
-  public abstract class EntityComponent<EntityComponentType, EntitySystemType> : UnityEngine.MonoBehaviour, IEntityComponent
+  public abstract class EntityComponent<EntityComponentType, EntitySystemType> : UnityEngine.MonoBehaviour, IEntityComponent, IEntityComponentInternals
     where EntityComponentType : EntityComponent<EntityComponentType, EntitySystemType>, new()
     where EntitySystemType : EntitySystem<EntitySystemType, EntityComponentType>, new() {
 
@@ -27,7 +27,7 @@ private EntitySystemType GetSystem () {
     /// During the 'Start' the entity component will be registered 
     /// to the matching system.
     private void Start () =>
-      this.GetSystem ().Internal_AddEntity ((EntityComponentType)this);
+      this.GetSystem ().AddEntity ((EntityComponentType)this);
 
     /// During the 'OnDisabled' the entity component will invoke its
     /// 'OnEntityDisabled' on the system.
@@ -39,7 +39,7 @@ private void OnDisable () {
     /// During the 'OnDestroy' the entity component will unregister it self
     /// to the matching system.
     private void OnDestroy () =>
-      this.GetSystem ().Internal_RemoveEntry ((EntityComponentType)this);
+      this.GetSystem ().RemoveEntry ((EntityComponentType)this);
 
     /// Sets the game object of the entity active.
     public void SetActive (bool value) =>
@@ -119,7 +119,7 @@ public void AddLocalScale (float x, float y, float z) =>
 
     /// During the 'InteralOnUpdate' the entity component will invoke its 
     /// 'OnEntityEnabled' and 'OnEntityInitialized' if needed.
-    public void Internal_OnUpdate () {
+    void IEntityComponentInternals.OnUpdateInternal () {
       if (this.isInitialized == false) {
         this.isInitialized = true;
         this.GetSystem ().OnEntityInitialized ((EntityComponentType)this);

Runtime/EntitySystem.cs

@@ -1,7 +1,7 @@
 namespace ElRaccoone.EntityComponentSystem {
 
   /// Base class for every entity system.
-  public abstract class EntitySystem<EntitySystemType, EntityComponentType> : IEntitySystem
+  public abstract class EntitySystem<EntitySystemType, EntityComponentType> : IEntitySystem, IEntitySystemInternals
     where EntitySystemType : EntitySystem<EntitySystemType, EntityComponentType>, new()
     where EntityComponentType : EntityComponent<EntityComponentType, EntitySystemType>, new() {
 
@@ -132,25 +132,8 @@ public void StopCoroutine (UnityEngine.Coroutine routine) =>
     public void SetEnabled (bool value) =>
       Controller.Instance.SetSystemEnabled<EntitySystemType> (value);
 
-    /// Internal method to set the instance reference. This method will
-    /// be called after the controller and system initialization.
-    public void Internal_OnInitialize () =>
-      Instance = Controller.Instance.GetSystem<EntitySystemType> ();
-
-    /// Internal method to update the children of the system.
-    public void Internal_OnUpdate () {
-      if (this.isInitialized == false) {
-        this.OnInitialized ();
-        if (Controller.Instance.IsSystemEnabled<EntitySystemType> () == true)
-          this.OnEnabled ();
-        this.isInitialized = true;
-      }
-      for (var _entityIndex = 0; _entityIndex < this.entityCount; _entityIndex++)
-        this.entities[_entityIndex].Internal_OnUpdate ();
-    }
-
     /// Internal method to add an entity's component to this system.
-    public void Internal_AddEntity (EntityComponentType component) {
+    internal void AddEntity (EntityComponentType component) {
       if (this.hasEntities == false)
         this.entity = component;
       this.entityCount++;
@@ -160,12 +143,29 @@ public void Internal_AddEntity (EntityComponentType component) {
     }
 
     /// Internal method to remove an entity's component from this system.
-    public void Internal_RemoveEntry (EntityComponentType component) {
+    internal void RemoveEntry (EntityComponentType component) {
       this.entityCount--;
       this.hasEntities = this.entityCount > 0;
       this.OnEntityWillDestroy (component);
       this.entities.Remove (component);
       this.entity = this.hasEntities == false ? null : this.entities[0];
     }
+
+    /// Internal method to set the instance reference. This method will
+    /// be called after the controller and system initialization.
+    void IEntitySystemInternals.OnInitializeInternal () =>
+      Instance = Controller.Instance.GetSystem<EntitySystemType> ();
+
+    /// Internal method to update the children of the system.
+    void IEntitySystemInternals.OnUpdateInternal () {
+      if (this.isInitialized == false) {
+        this.OnInitialized ();
+        if (Controller.Instance.IsSystemEnabled<EntitySystemType> () == true)
+          this.OnEnabled ();
+        this.isInitialized = true;
+      }
+      for (var _entityIndex = 0; _entityIndex < this.entityCount; _entityIndex++)
+        (this.entities[_entityIndex] as IEntityComponentInternals).OnUpdateInternal ();
+    }
   }
 }

Runtime/Interfaces/IEntityComponent.cs

@@ -1,10 +1,5 @@
 namespace ElRaccoone.EntityComponentSystem {
 
   /// Base interface for every component
-  public interface IEntityComponent {
-
-    /// During the 'InteralOnUpdate' the entity component will invoke its 
-    /// 'OnEntityEnabled' and 'OnEntityInitialized' if needed.
-    void Internal_OnUpdate ();
-  }
+  public interface IEntityComponent { }
 }

Runtime/Interfaces/IEntityComponentInternals.cs

@@ -0,0 +1,10 @@
+namespace ElRaccoone.EntityComponentSystem {
+
+  /// Base interface for component internals.
+  internal interface IEntityComponentInternals {
+
+    /// During the 'InteralOnUpdate' the entity component will invoke its 
+    /// 'OnEntityEnabled' and 'OnEntityInitialized' if needed.
+    void OnUpdateInternal ();
+  }
+}

Runtime/Interfaces/IEntityComponentInternals.cs.meta

@@ -47,12 +47,5 @@ public interface IEntitySystem {
     /// Sets whether the system is enabled or disabled, enabling the system allows
     /// it to invoke all of the cycle calls such as OnUpdate and OnDrawGizmos.
     void SetEnabled (bool value);
-
-    /// Internal method to set the instance reference. This method will
-    /// be called after the controller and system initialization.
-    void Internal_OnInitialize ();
-
-    /// Internal method to update the children of the system.
-    void Internal_OnUpdate ();
   }
 }

Runtime/Interfaces/IEntitySystem.cs

@@ -0,0 +1,12 @@
+namespace ElRaccoone.EntityComponentSystem {
+
+  /// Base interface for system internals.
+  internal interface IEntitySystemInternals {
+    /// Internal method to set the instance reference. This method will
+    /// be called after the controller and system initialization.
+    void OnInitializeInternal ();
+
+    /// Internal method to update the children of the system.
+    void OnUpdateInternal ();
+  }
+}

Runtime/Interfaces/IEntitySystemInternals.cs

@@ -20,12 +20,5 @@ public interface IService {
     /// Method invoked when the service will be destroyed, this will happen when
     /// the application is closing or the controller is being destroyed.
     void OnWillDestroy ();
-
-    /// Internal method to set the instance reference. This method will
-    /// be called after the controller and service initialization.
-    void Internal_OnInitialize ();
-
-    /// Internal method to update the service.
-    void Internal_OnUpdate ();
   }
 }