Mirrors/SanAndreasUnity
2
0
Fork 0
mirror of https://github.com/GTA-ASM/SanAndreasUnity synced 2024-11-10 06:34:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix some namespace errors

Browse source
This commit is contained in:
in0finite 2022-09-30 15:01:39 +02:00
parent b640621409
commit 6780d48c27
6 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Assets/Scripts/Importing/Collision/CollisionFile.cs
View file

@ -52,7 +52,7 @@ namespace SanAndreasUnity.Importing.Collision
private static readonly Dictionary<String, CollisionFileInfo> _sModelNameDict private static readonly Dictionary<String, CollisionFileInfo> _sModelNameDict
= new Dictionary<string, CollisionFileInfo>(StringComparer.InvariantCultureIgnoreCase); = new Dictionary<string, CollisionFileInfo>(StringComparer.InvariantCultureIgnoreCase);
private static readonly Utilities.AsyncLoader<String, CollisionFile> s_asyncLoader = private static readonly AsyncLoader<String, CollisionFile> s_asyncLoader =
new AsyncLoader<String, CollisionFile> (StringComparer.InvariantCultureIgnoreCase); new AsyncLoader<String, CollisionFile> (StringComparer.InvariantCultureIgnoreCase);

4
Assets/Scripts/Importing/Conversion/CollisionModel.cs
View file

@ -117,7 +117,7 @@ namespace SanAndreasUnity.Importing.Conversion
// collision file already loaded // collision file already loaded
// just call other function // just call other function
Utilities.F.RunExceptionSafe( () => Load(file, destParent, forceConvex) ); UGameCore.Utilities.F.RunExceptionSafe( () => Load(file, destParent, forceConvex) );
onFinish (); onFinish ();
return; return;
} }
@ -127,7 +127,7 @@ namespace SanAndreasUnity.Importing.Conversion
// loading finished // loading finished
// call other function // call other function
if(cf != null) if(cf != null)
Utilities.F.RunExceptionSafe( () => Load( cf, destParent, forceConvex ) ); UGameCore.Utilities.F.RunExceptionSafe( () => Load( cf, destParent, forceConvex ) );
onFinish (); onFinish ();
}); });

2
Assets/Scripts/Importing/Conversion/Geometry.cs
View file

@ -517,7 +517,7 @@ namespace SanAndreasUnity.Importing.Conversion
} }
private static Utilities.AsyncLoader<string, GeometryParts> s_asyncLoader = new Utilities.AsyncLoader<string, GeometryParts> (); private static AsyncLoader<string, GeometryParts> s_asyncLoader = new AsyncLoader<string, GeometryParts> ();
public static int NumGeometryPartsLoaded { get { return s_asyncLoader.GetNumObjectsLoaded (); } } public static int NumGeometryPartsLoaded { get { return s_asyncLoader.GetNumObjectsLoaded (); } }

8
Assets/Scripts/Importing/Conversion/TextureDictionary.cs
View file

@ -237,8 +237,8 @@ namespace SanAndreasUnity.Importing.Conversion
private static readonly Dictionary<string, string> _sParents = new Dictionary<string, string>(StringComparer.InvariantCultureIgnoreCase); private static readonly Dictionary<string, string> _sParents = new Dictionary<string, string>(StringComparer.InvariantCultureIgnoreCase);
private static readonly Utilities.AsyncLoader<string, TextureDictionary> s_asyncLoader = private static readonly UGameCore.Utilities.AsyncLoader<string, TextureDictionary> s_asyncLoader =
new Utilities.AsyncLoader<string, TextureDictionary> (StringComparer.InvariantCultureIgnoreCase); new UGameCore.Utilities.AsyncLoader<string, TextureDictionary> (StringComparer.InvariantCultureIgnoreCase);
public static bool DontLoadTextures { get; set; } = false; public static bool DontLoadTextures { get; set; } = false;
@ -246,7 +246,7 @@ namespace SanAndreasUnity.Importing.Conversion
private static Texture2D DummyTexture { private static Texture2D DummyTexture {
get { get {
if (null == s_dummyTexture) 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; return s_dummyTexture;
} }
} }
@ -282,7 +282,7 @@ namespace SanAndreasUnity.Importing.Conversion
TextureDictionary loadedTxd = null; TextureDictionary loadedTxd = null;
bool bDontLoad = DontLoadTextures; bool bDontLoad = DontLoadTextures;
Behaviours.LoadingThread.RegisterJob (new Utilities.BackgroundJobRunner.Job<RenderWareStream.TextureDictionary> () { Behaviours.LoadingThread.RegisterJob (new UGameCore.Utilities.BackgroundJobRunner.Job<RenderWareStream.TextureDictionary> () {
priority = loadPriority, priority = loadPriority,
action = () => { action = () => {
return bDontLoad ? null : ArchiveManager.ReadFile<RenderWareStream.TextureDictionary>(name + ".txd"); return bDontLoad ? null : ArchiveManager.ReadFile<RenderWareStream.TextureDictionary>(name + ".txd");

4
Assets/Scripts/Importing/Items/Item.cs
View file

@ -9,7 +9,7 @@ namespace SanAndreasUnity.Importing.Items
{ {
public static class Item public static class Item
{ {
private static readonly List<Zone> _zones = new List<Zone>(); private static readonly List<Placements.Zone> _zones = new List<Placements.Zone>();
private static readonly List<EntranceExit> _enexes = new List<EntranceExit>(); private static readonly List<EntranceExit> _enexes = new List<EntranceExit>();
public static IReadOnlyList<EntranceExit> Enexes => _enexes; public static IReadOnlyList<EntranceExit> Enexes => _enexes;
@ -79,7 +79,7 @@ namespace SanAndreasUnity.Importing.Items
{ {
var file = new ItemFile<Placement>(ArchiveManager.GetCaseSensitiveFilePath(Path.GetFileName(path))); var file = new ItemFile<Placement>(ArchiveManager.GetCaseSensitiveFilePath(Path.GetFileName(path)));
foreach (var zone in file.GetSection<Zone>("zone")) foreach (var zone in file.GetSection<Placements.Zone>("zone"))
{ {
_zones.Add(zone); _zones.Add(zone);
} }

4
Assets/Scripts/Importing/ZoneHelpers.cs
View file

@ -1,4 +1,6 @@
namespace SanAndreasUnity.Importing using UGameCore.Utilities;
namespace SanAndreasUnity.Importing
{ {
public class ZoneHelpers public class ZoneHelpers