Ellpeck/MLEM
1
0
Fork 0
mirror of https://github.com/Ellpeck/MLEM.git synced 2024-11-22 20:58:34 +01:00
Code Issues Projects Releases Wiki Activity

Improved RawContentManager's reader loading and added better exception handling

Browse source
This commit is contained in:
Ell 2021-07-27 16:40:42 +02:00
parent 8fac4a0b69
commit 57f8e56c38
2 changed files with 34 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -41,6 +41,9 @@ Improvements
Additions Additions
- Added the ability to specify a coordinate offset in data texture atlases - Added the ability to specify a coordinate offset in data texture atlases
Improvements
- Improved RawContentManager's reader loading and added better exception handling
## 5.0.0 ## 5.0.0
### MLEM ### MLEM
Additions Additions

39
MLEM.Data/Content/RawContentManager.cs
View file

@ -1,7 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq;
using Microsoft.Xna.Framework; using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Content; using Microsoft.Xna.Framework.Content;
using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Graphics;
@ -12,12 +11,7 @@ namespace MLEM.Data.Content {
/// </summary> /// </summary>
public class RawContentManager : ContentManager, IGameComponent { public class RawContentManager : ContentManager, IGameComponent {
private static readonly RawContentReader[] Readers = AppDomain.CurrentDomain.GetAssemblies() private static List<RawContentReader> readers;
.Where(a => !a.IsDynamic)
.SelectMany(a => a.GetExportedTypes())
.Where(t => t.IsSubclassOf(typeof(RawContentReader)) && !t.IsAbstract)
.Select(t => t.GetConstructor(Type.EmptyTypes).Invoke(null))
.Cast<RawContentReader>().ToArray();
private readonly List<IDisposable> disposableAssets = new List<IDisposable>(); private readonly List<IDisposable> disposableAssets = new List<IDisposable>();
@ -57,7 +51,11 @@ namespace MLEM.Data.Content {
private T Read<T>(string assetName, T existing) { private T Read<T>(string assetName, T existing) {
var triedFiles = new List<string>(); var triedFiles = new List<string>();
foreach (var reader in Readers.Where(r => r.CanRead(typeof(T)))) { if (readers == null)
readers = CollectContentReaders();
foreach (var reader in readers) {
if (!reader.CanRead(typeof(T)))
continue;
foreach (var ext in reader.GetFileExtensions()) { foreach (var ext in reader.GetFileExtensions()) {
var file = Path.Combine(this.RootDirectory, $"{assetName}.{ext}"); var file = Path.Combine(this.RootDirectory, $"{assetName}.{ext}");
triedFiles.Add(file); triedFiles.Add(file);
@ -89,5 +87,30 @@ namespace MLEM.Data.Content {
public void Initialize() { public void Initialize() {
} }
private static List<RawContentReader> CollectContentReaders() {
var ret = new List<RawContentReader>();
foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies()) {
try {
if (assembly.IsDynamic)
continue;
foreach (var type in assembly.GetExportedTypes()) {
try {
if (type.IsAbstract)
continue;
if (!type.IsSubclassOf(typeof(RawContentReader)))
continue;
var inst = type.GetConstructor(Type.EmptyTypes).Invoke(null);
ret.Add((RawContentReader) inst);
} catch (Exception e) {
throw new NotSupportedException($"The type {type} cannot be constructed by a RawContentManager. Does it have a visible parameterless constructor?", e);
}
}
} catch {
// ignored
}
}
return ret;
}
} }
} }