diff --git a/Assets/Scripts/Importing/Collision/CollisionFile.cs b/Assets/Scripts/Importing/Collision/CollisionFile.cs index a2af5fc1..d71a1bac 100644 --- a/Assets/Scripts/Importing/Collision/CollisionFile.cs +++ b/Assets/Scripts/Importing/Collision/CollisionFile.cs @@ -52,7 +52,7 @@ namespace SanAndreasUnity.Importing.Collision private static readonly Dictionary _sModelNameDict = new Dictionary(StringComparer.InvariantCultureIgnoreCase); - private static readonly Utilities.AsyncLoader s_asyncLoader = + private static readonly AsyncLoader s_asyncLoader = new AsyncLoader (StringComparer.InvariantCultureIgnoreCase); diff --git a/Assets/Scripts/Importing/Conversion/CollisionModel.cs b/Assets/Scripts/Importing/Conversion/CollisionModel.cs index 36452e70..718447d2 100644 --- a/Assets/Scripts/Importing/Conversion/CollisionModel.cs +++ b/Assets/Scripts/Importing/Conversion/CollisionModel.cs @@ -117,7 +117,7 @@ namespace SanAndreasUnity.Importing.Conversion // collision file already loaded // just call other function - Utilities.F.RunExceptionSafe( () => Load(file, destParent, forceConvex) ); + UGameCore.Utilities.F.RunExceptionSafe( () => Load(file, destParent, forceConvex) ); onFinish (); return; } @@ -127,7 +127,7 @@ namespace SanAndreasUnity.Importing.Conversion // loading finished // call other function if(cf != null) - Utilities.F.RunExceptionSafe( () => Load( cf, destParent, forceConvex ) ); + UGameCore.Utilities.F.RunExceptionSafe( () => Load( cf, destParent, forceConvex ) ); onFinish (); }); diff --git a/Assets/Scripts/Importing/Conversion/Geometry.cs b/Assets/Scripts/Importing/Conversion/Geometry.cs index 78b9e832..babaf8db 100644 --- a/Assets/Scripts/Importing/Conversion/Geometry.cs +++ b/Assets/Scripts/Importing/Conversion/Geometry.cs @@ -517,7 +517,7 @@ namespace SanAndreasUnity.Importing.Conversion } - private static Utilities.AsyncLoader s_asyncLoader = new Utilities.AsyncLoader (); + private static AsyncLoader s_asyncLoader = new AsyncLoader (); public static int NumGeometryPartsLoaded { get { return s_asyncLoader.GetNumObjectsLoaded (); } } diff --git a/Assets/Scripts/Importing/Conversion/TextureDictionary.cs b/Assets/Scripts/Importing/Conversion/TextureDictionary.cs index bf0b151f..f5ec06d2 100644 --- a/Assets/Scripts/Importing/Conversion/TextureDictionary.cs +++ b/Assets/Scripts/Importing/Conversion/TextureDictionary.cs @@ -237,8 +237,8 @@ namespace SanAndreasUnity.Importing.Conversion private static readonly Dictionary _sParents = new Dictionary(StringComparer.InvariantCultureIgnoreCase); - private static readonly Utilities.AsyncLoader s_asyncLoader = - new Utilities.AsyncLoader (StringComparer.InvariantCultureIgnoreCase); + private static readonly UGameCore.Utilities.AsyncLoader s_asyncLoader = + new UGameCore.Utilities.AsyncLoader (StringComparer.InvariantCultureIgnoreCase); public static bool DontLoadTextures { get; set; } = false; @@ -246,7 +246,7 @@ namespace SanAndreasUnity.Importing.Conversion private static Texture2D DummyTexture { get { if (null == s_dummyTexture) - s_dummyTexture = Utilities.F.CreateTexture(32, 32, Color.gray); + s_dummyTexture = UGameCore.Utilities.F.CreateTexture(32, 32, Color.gray); return s_dummyTexture; } } @@ -282,7 +282,7 @@ namespace SanAndreasUnity.Importing.Conversion TextureDictionary loadedTxd = null; bool bDontLoad = DontLoadTextures; - Behaviours.LoadingThread.RegisterJob (new Utilities.BackgroundJobRunner.Job () { + Behaviours.LoadingThread.RegisterJob (new UGameCore.Utilities.BackgroundJobRunner.Job () { priority = loadPriority, action = () => { return bDontLoad ? null : ArchiveManager.ReadFile(name + ".txd"); diff --git a/Assets/Scripts/Importing/Items/Item.cs b/Assets/Scripts/Importing/Items/Item.cs index 3b2b539a..2a08469a 100644 --- a/Assets/Scripts/Importing/Items/Item.cs +++ b/Assets/Scripts/Importing/Items/Item.cs @@ -9,7 +9,7 @@ namespace SanAndreasUnity.Importing.Items { public static class Item { - private static readonly List _zones = new List(); + private static readonly List _zones = new List(); private static readonly List _enexes = new List(); public static IReadOnlyList Enexes => _enexes; @@ -79,7 +79,7 @@ namespace SanAndreasUnity.Importing.Items { var file = new ItemFile(ArchiveManager.GetCaseSensitiveFilePath(Path.GetFileName(path))); - foreach (var zone in file.GetSection("zone")) + foreach (var zone in file.GetSection("zone")) { _zones.Add(zone); } diff --git a/Assets/Scripts/Importing/ZoneHelpers.cs b/Assets/Scripts/Importing/ZoneHelpers.cs index 58d104ef..c069f06b 100644 --- a/Assets/Scripts/Importing/ZoneHelpers.cs +++ b/Assets/Scripts/Importing/ZoneHelpers.cs @@ -1,4 +1,6 @@ -namespace SanAndreasUnity.Importing +using UGameCore.Utilities; + +namespace SanAndreasUnity.Importing { public class ZoneHelpers