rework and add GetReflectionEvent

Author: vanifatovvlad

Scellecs.Morpeh/Event.cs

@@ -14,10 +14,8 @@ namespace Scellecs.Morpeh
     [Il2CppSetOption(Option.NullChecks, false)]
     [Il2CppSetOption(Option.ArrayBoundsChecks, false)]
     [Il2CppSetOption(Option.DivideByZeroChecks, false)]
-    public class Event<TData> : IEventInternal where TData : struct, IEventData
+    public class Event<TData> : EventBase where TData : struct, IEventData
     {
-        private readonly EventRegistry _registry;
-
         [PublicAPI] public FastList<TData> BatchedChanges { get; } = new FastList<TData>();
         [PublicAPI] public FastList<TData> ScheduledChanges { get; } = new FastList<TData>();
 
@@ -26,19 +24,14 @@ public class Event<TData> : IEventInternal where TData : struct, IEventData
 
         internal event Action<FastList<TData>> Callback;
 
-        internal Event(EventRegistry registry)
-        {
-            _registry = registry;
-        }
-
         [PublicAPI]
         public void NextFrame(TData data)
         {
             ScheduledChanges.Add(data);
 
             if (!IsPublished && !IsScheduled)
             {
-                _registry.DispatchedEvents.Add(this);
+                registry.DispatchedEvents.Add(this);
             }
 
             IsScheduled = true;
@@ -69,7 +62,7 @@ public void Dispose()
             }
         }
 
-        void IEventInternal.OnFrameEnd()
+        internal sealed override void OnFrameEnd()
         {
             if (IsPublished)
             {
@@ -90,7 +83,7 @@ void IEventInternal.OnFrameEnd()
                 BatchedChanges.AddListRange(ScheduledChanges);
                 ScheduledChanges.Clear();
 
-                _registry.DispatchedEvents.Add(this);
+                registry.DispatchedEvents.Add(this);
             }
         }
 
@@ -117,8 +110,10 @@ private void TryCatchInvokeCallback()
         }
     }
 
-    public interface IEventInternal
+    public abstract class EventBase
     {
-        void OnFrameEnd();
+        internal EventRegistry registry;
+
+        internal abstract void OnFrameEnd();
     }
 }

Scellecs.Morpeh/EventIdentifier.cs

@@ -1,12 +1,14 @@
+using System;
+using System.Collections.Generic;
 using Scellecs.Morpeh.Collections;
 
 namespace Scellecs.Morpeh
 {
     internal class EventRegistry
     {
-        internal readonly IntHashMap<IEventInternal> RegisteredEvents = new IntHashMap<IEventInternal>();
+        internal readonly Dictionary<Type, EventBase> RegisteredEvents = new Dictionary<Type, EventBase>();
 
-        internal FastList<IEventInternal> DispatchedEvents = new FastList<IEventInternal>();
-        internal FastList<IEventInternal> ExecutingEvents = new FastList<IEventInternal>();
+        internal FastList<EventBase> DispatchedEvents = new FastList<EventBase>();
+        internal FastList<EventBase> ExecutingEvents = new FastList<EventBase>();
     }
 }

Scellecs.Morpeh/EventIdentifier.cs.meta

@@ -1,3 +1,4 @@
+using System;
 using JetBrains.Annotations;
 using Scellecs.Morpeh.Collections;
 
@@ -27,17 +28,39 @@ internal static void CleanupEventRegistry(World world)
         public static Event<TData> GetEvent<TData>(this World world)
             where TData : struct, IEventData
         {
-            var eventIdentifier = EventIdentifier<TData>.identifier;
+            var type = typeof(TData);
             var registry = Registries.GetValueByKey(world.identifier);
 
-            if (!registry.RegisteredEvents.TryGetValue(eventIdentifier, out var registeredEvent))
+            if (registry.RegisteredEvents.TryGetValue(type, out var registeredEvent))
             {
-                registeredEvent = new Event<TData>(registry);
-
-                registry.RegisteredEvents.Add(eventIdentifier, registeredEvent, out _);
+                return (Event<TData>) registeredEvent;
             }
 
+            registeredEvent = new Event<TData>();
+            registeredEvent.registry = registry;
+
+            registry.RegisteredEvents.Add(type, registeredEvent);
+
             return (Event<TData>) registeredEvent;
         }
+
+        [PublicAPI]
+        public static EventBase GetReflectionEvent(this World world, Type type)
+        {
+            var registry = Registries.GetValueByKey(world.identifier);
+
+            if (registry.RegisteredEvents.TryGetValue(type, out var registeredEvent))
+            {
+                return registeredEvent;
+            }
+
+            var constructedType = typeof(Event<>).MakeGenericType(type);
+            registeredEvent = (EventBase) Activator.CreateInstance(constructedType, true);
+            registeredEvent.registry = registry;
+
+            registry.RegisteredEvents.Add(type, registeredEvent);
+
+            return registeredEvent;
+        }
     }
 }