diff --git a/MiraAPI/Utilities/Assets/LoadableAddressableAsset.cs b/MiraAPI/Utilities/Assets/LoadableAddressableAsset.cs index 85424e2..59c6de1 100644 --- a/MiraAPI/Utilities/Assets/LoadableAddressableAsset.cs +++ b/MiraAPI/Utilities/Assets/LoadableAddressableAsset.cs @@ -11,7 +11,7 @@ namespace MiraAPI.Utilities.Assets; /// The type of the asset to be loaded. public class LoadableAddressableAsset(string uid) : LoadableAsset where T : UnityEngine.Object { - private readonly Action>? gcAction; + private readonly Action>? _gcAction; /// /// Initializes a new instance of the class, with added garbageCollector logic, @@ -21,7 +21,7 @@ public class LoadableAddressableAsset(string uid) : LoadableAsset where T /// A lambda that allows GCHandle.Alloc calls without garbage collection interferences. public LoadableAddressableAsset(string uid, Action> garbageCollection) : this(uid) { - gcAction = garbageCollection; + _gcAction = garbageCollection; } /// @@ -47,10 +47,7 @@ public class LoadableAddressableAsset(string uid) : LoadableAsset where T throw new InvalidOperationException($"INVALID ASSET: {uid}"); } - if (gcAction != null) - { - gcAction.Invoke(this); - } + _gcAction?.Invoke(this); GC.EndNoGCRegion(); return LoadedAsset; diff --git a/MiraAPI/Utilities/Assets/LoadableAddressableAssets.cs b/MiraAPI/Utilities/Assets/LoadableAddressableAssets.cs index 1ad5dd2..e7d88a9 100644 --- a/MiraAPI/Utilities/Assets/LoadableAddressableAssets.cs +++ b/MiraAPI/Utilities/Assets/LoadableAddressableAssets.cs @@ -13,7 +13,7 @@ namespace MiraAPI.Utilities.Assets; /// The type of the asset to be loaded. public class LoadableAddressableAssets(string key) where T : UnityEngine.Object { - private readonly Action>? gcAction; + private readonly Action>? _gcAction; /// /// Gets or sets reference to the loaded asset. Intended to be used for caching purposes. @@ -28,7 +28,7 @@ public class LoadableAddressableAssets(string key) where T : UnityEngine.Obje /// A lambda that allows GCHandle.Alloc calls without garbage collection interferences. public LoadableAddressableAssets(string key, Action> garbageCollection) : this(key) { - gcAction = garbageCollection; + _gcAction = garbageCollection; } /// @@ -57,10 +57,7 @@ public class LoadableAddressableAssets(string key) where T : UnityEngine.Obje var assetsList = new Il2CppSystem.Collections.Generic.List(assetsIList.Pointer); LoadedAssets = assetsList.ToArray().ToList(); - if (gcAction != null) - { - gcAction.Invoke(this); - } + _gcAction?.Invoke(this); GC.EndNoGCRegion(); return LoadedAssets.AsReadOnly(); diff --git a/MiraAPI/Utilities/Assets/PreloadedAsset.cs b/MiraAPI/Utilities/Assets/PreloadedAsset.cs index ed28ebf..5f7cd99 100644 --- a/MiraAPI/Utilities/Assets/PreloadedAsset.cs +++ b/MiraAPI/Utilities/Assets/PreloadedAsset.cs @@ -3,17 +3,17 @@ namespace MiraAPI.Utilities.Assets; /// -/// An implementation for creating loadable assets from preloaded assets. +/// An implementation for creating loadable assets from existing assets. /// /// /// public class PreloadedAsset(T asset) : LoadableAsset where T : UnityEngine.Object { - private readonly T loadedAsset = asset ?? throw new ArgumentNullException(nameof(asset)); + private readonly T _loadedAsset = asset ?? throw new ArgumentNullException(nameof(asset)); /// public override T LoadAsset() { - return loadedAsset; + return _loadedAsset; } }