Skip to content

Cannot LoadAudioLibrary when AssemblyReferences used #64

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
ligofff wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Cannot LoadAudioLibrary when AssemblyReferences used #64

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
36 changes: 25 additions & 11 deletions Runtime/Scripts/AudioManagerInternal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -841,44 +841,44 @@ public void LoadAudioLibrary(AudioLibrary l)
var newLib = new LoadedLibrary { Library = l, Users = 1 };

List<string> enums = new List<string>();
var soundType = l.soundEnumGenerated;
var soundTypeName = l.soundEnumGenerated;

if (!l.soundNamespaceGenerated.IsNullEmptyOrWhiteSpace())
{
soundType = l.soundNamespaceGenerated + "." + soundType;
soundTypeName = l.soundNamespaceGenerated + "." + soundTypeName;
}
var assembly = soundType + ", Assembly-CSharp";

Type enumType = Type.GetType(assembly);
Type enumType = FindEnumType(soundTypeName);

enums.AddRange(Enum.GetNames(enumType));

newLib.SoundKeys = new long[enums.Count];
for (int i = 0; i < l.Sounds.Count; i++)
{
l.Sounds[i].Initialize();
var soundName = soundType + "." + enums[i];
var soundName = soundTypeName + "." + enums[i];
long key = ComputeEnumHash(enumType, i);
newLib.SoundKeys[i] = key;
audioFileLookup.Add(soundName, l.Sounds[i]);
enumNameLookup[key] = soundName;
}

enums.Clear();
var musicType = l.musicEnumGenerated;
var musicTypeName = l.musicEnumGenerated;

if (!l.musicNamespaceGenerated.IsNullEmptyOrWhiteSpace())
{
musicType = l.musicNamespaceGenerated + "." + musicType;
musicTypeName = l.musicNamespaceGenerated + "." + musicTypeName;
}
assembly = musicType + ", Assembly-CSharp";

enumType = Type.GetType(assembly);

enumType = FindEnumType(musicTypeName);

enums.AddRange(Enum.GetNames(enumType));

newLib.MusicKeys = new long[enums.Count];
for (int i = 0; i < l.Music.Count; i++)
{
var musicName = musicType + "." + enums[i];
var musicName = musicTypeName + "." + enums[i];
long key = ComputeEnumHash(enumType, i);
newLib.MusicKeys[i] = key;
audioFileLookup.Add(musicName, l.Music[i]);
Expand Down Expand Up @@ -932,5 +932,19 @@ private static int GetEnumUnderlyingValue<T>(T e) where T : Enum
{
return unchecked(UnsafeUtility.As<T, int>(ref e));
}

private Type FindEnumType(string soundType)
{
foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
{
var type = assembly.GetType(soundType);
if (type != null && type.IsEnum)
{
return type;
}
}

throw new InvalidOperationException($"Enum type '{soundType}' was not found in loaded assemblies.");
}
}
}