Skip to content

Asmdef support #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
soraphis wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Asmdef support #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 22 additions & 27 deletions Assets/Plugins/EventBus/EventBus.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,23 @@ namespace EventBus
using UnityEngine;
using EventBus.Internal;
using System.Collections;
using UnityEngine.Pool;

#if UNITY_EDITOR
using UnityEditor;
#endif

/// <summary>
/// Marks an assembly containing EventBus types.
/// Used to identify relevant assemblies for the EventBus system cleanup steps.
/// </summary>
[AttributeUsage(AttributeTargets.Assembly)]
public class EventBusAssemblyAttribute : Attribute
{

}


public static class EventBusUtility
{
public static IReadOnlyList<Type> EventTypes { get; private set; }
Expand Down Expand Up @@ -39,47 +51,30 @@ private static void HandleEditorStateChange(PlayModeStateChange state)
public static void Init()
{
var assemblies = AppDomain.CurrentDomain.GetAssemblies();
Type[] assemblyCSharp = null;
Type[] assemblyCSharpFirstpass = null;
List<Type[]> assemblyTypesToScan = ListPool<Type[]>.Get();

for (int i = 0; i < assemblies.Length; i++)
{
if (assemblies[i].GetName().Name == "Assembly-CSharp")
assemblyCSharp = assemblies[i].GetTypes();
else
if (assemblies[i].GetName().Name == "Assembly-CSharp-firstpass")
assemblyCSharpFirstpass = assemblies[i].GetTypes();

if (assemblyCSharp != null && assemblyCSharpFirstpass != null)
break;
if (assemblies[i].GetName().Name == "Assembly-CSharp"
|| assemblies[i].GetName().Name == "Assembly-CSharp-firstpass"
|| assemblies[i].GetCustomAttribute<EventBusAssemblyAttribute>() is not null)
assemblyTypesToScan.Add(assemblies[i].GetTypes());
}

List<Type> eventTypes = new List<Type>();

if (assemblyCSharp != null)
foreach (var assemblyTypes in assemblyTypesToScan)
{
for (int i = 0; i < assemblyCSharp.Length; i++)
for (int i = 0; i < assemblyTypes.Length; i++)
{
var type = assemblyCSharp[i].GetType();
var type = assemblyTypes[i];
if ((typeof(IEvent)) != type && (typeof(IEvent)).IsAssignableFrom(type))
{
eventTypes.Add(type);
}
}
}

if (assemblyCSharpFirstpass != null)
{
for (int i = 0; i < assemblyCSharpFirstpass.Length; i++)
{
var type = assemblyCSharpFirstpass[i].GetType();
if ((typeof(IEvent)) != type && (typeof(IEvent)).IsAssignableFrom(type))
{
eventTypes.Add(type);
}
}
}

ListPool<Type[]>.Release(assemblyTypesToScan);
EventTypes = eventTypes;

List<Type> staticEventBusesTypes = new List<Type>();
Expand All @@ -98,7 +93,7 @@ public static void ClearAllBuses()
{
for (int i = 0; i < StaticEventBusesTypes.Count; i++)
{
var type = EventTypes[i];
var type = StaticEventBusesTypes[i];
var clearMethod = type.GetMethod("Clear", BindingFlags.Static | BindingFlags.NonPublic);
clearMethod.Invoke(null, null);
}
Expand Down
8 changes: 8 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,4 +89,12 @@ public class EventBusTest : MonoBehaviour
}
```

4. Using Assembly Definitions

once in your custom assembly mark the assembly, such that it can be cleaned up properly in the Editor even without Domain reload

```
[assembly: EventBus.EventBusAssembly()]
```