Use forward slashes in file paths (#780)

LostArtefacts · Oct 24, 2024 · 63b97a6 · 63b97a6
1 parent f656124
commit 63b97a6
Show file tree

Hide file tree

Showing 95 changed files with 231 additions and 231 deletions.
diff --git a/LocationExport/Program.cs b/LocationExport/Program.cs
@@ -30,9 +30,9 @@ static void Main(string[] args)
         _reader1 = new();
         _reader2 = new();
         _reader3 = new();
-        _allTR1Exclusions = JsonConvert.DeserializeObject<Dictionary<string, List<Location>>>(File.ReadAllText(@"Resources\TR1\Locations\invalid_item_locations.json"));
-        _allTR2Exclusions = JsonConvert.DeserializeObject<Dictionary<string, List<Location>>>(File.ReadAllText(@"Resources\TR2\Locations\invalid_item_locations.json"));
-        _allTR3Exclusions = JsonConvert.DeserializeObject<Dictionary<string, List<Location>>>(File.ReadAllText(@"Resources\TR3\Locations\invalid_item_locations.json"));
+        _allTR1Exclusions = JsonConvert.DeserializeObject<Dictionary<string, List<Location>>>(File.ReadAllText("Resources/TR1/Locations/invalid_item_locations.json"));
+        _allTR2Exclusions = JsonConvert.DeserializeObject<Dictionary<string, List<Location>>>(File.ReadAllText("Resources/TR2/Locations/invalid_item_locations.json"));
+        _allTR3Exclusions = JsonConvert.DeserializeObject<Dictionary<string, List<Location>>>(File.ReadAllText("Resources/TR3/Locations/invalid_item_locations.json"));
 
         if (args[0].ToLower() == "export")
         {
@@ -244,7 +244,7 @@ private static void Adjust(string[] args)
             return;
         }
 
-        var allLocs = JsonConvert.DeserializeObject<Dictionary<string, List<Location>>>(File.ReadAllText($@"Resources\{version}\Locations\locations.json"));
+        var allLocs = JsonConvert.DeserializeObject<Dictionary<string, List<Location>>>(File.ReadAllText($"Resources/{version}/Locations/locations.json"));
         var diff = new Dictionary<string, List<Location>>();
         foreach (var (lvl, locs) in allLocs)
         {

diff --git a/ModelExport/Program.cs b/ModelExport/Program.cs
@@ -29,19 +29,19 @@ static void Main(string[] args)
     static void TR1Export()
     {
         TR1MassExporter exporter = new();
-        exporter.Export(Directory.GetCurrentDirectory(), @"TR1\Objects");
+        exporter.Export(Directory.GetCurrentDirectory(), "TR1/Objects");
     }
 
     static void TR2Export()
     {
         TR2MassExporter exporter = new();
-        exporter.Export(Directory.GetCurrentDirectory(), @"TR2\Objects");
+        exporter.Export(Directory.GetCurrentDirectory(), "TR2/Objects");
     }
 
     static void TR3Export()
     {
         TR3MassExporter exporter = new();
-        exporter.Export(Directory.GetCurrentDirectory(), @"TR3\Objects");
+        exporter.Export(Directory.GetCurrentDirectory(), "TR3/Objects");
     }
 
     private static void Usage()

diff --git a/TRDataControl/Environment/Model/Types/Models/EMImportModelFunction.cs b/TRDataControl/Environment/Model/Types/Models/EMImportModelFunction.cs
@@ -14,7 +14,7 @@ public override void ApplyToLevel(TR1Level level)
         {
             Level = level,
             TypesToImport = new(Models.Select(m => (TR1Type)m)),
-            DataFolder = @"Resources\TR1\Objects",
+            DataFolder = "Resources/TR1/Objects",
             ForceCinematicOverwrite = ForceCinematicOverwrite
         };
 
@@ -28,7 +28,7 @@ public override void ApplyToLevel(TR2Level level)
         {
             Level = level,
             TypesToImport = new(Models.Select(m => (TR2Type)m)),
-            DataFolder = @"Resources\TR2\Objects",
+            DataFolder = "Resources/TR2/Objects",
             ForceCinematicOverwrite = ForceCinematicOverwrite
         };
 
@@ -42,7 +42,7 @@ public override void ApplyToLevel(TR3Level level)
         {
             Level = level,
             TypesToImport = new(Models.Select(m => (TR3Type)m)),
-            DataFolder = @"Resources\TR3\Objects",
+            DataFolder = "Resources/TR3/Objects",
             ForceCinematicOverwrite = ForceCinematicOverwrite
         };
 

diff --git a/TRDataControl/Environment/Model/Types/Models/EMImportNonGraphicsModelFunction.cs b/TRDataControl/Environment/Model/Types/Models/EMImportNonGraphicsModelFunction.cs
@@ -19,7 +19,7 @@ public override void ApplyToLevel(TR1Level level)
             Level = level,
             ClearUnusedSprites = false,
             TypesToImport = new(data.Select(m => (TR1Type)m.ModelID)),
-            DataFolder = @"Resources\TR1\Objects",
+            DataFolder = "Resources/TR1/Objects",
             IgnoreGraphics = true
         };
         importer.Import();
@@ -40,7 +40,7 @@ public override void ApplyToLevel(TR2Level level)
             Level = level,
             ClearUnusedSprites = false,
             TypesToImport = new(data.Select(m => (TR2Type)m.ModelID)),
-            DataFolder = @"Resources\TR2\Objects",
+            DataFolder = "Resources/TR2/Objects",
             IgnoreGraphics = true
         };
         importer.Import();
@@ -61,7 +61,7 @@ public override void ApplyToLevel(TR3Level level)
             Level = level,
             ClearUnusedSprites = false,
             TypesToImport = new(data.Select(m => (TR3Type)m.ModelID)),
-            DataFolder = @"Resources\TR3\Objects",
+            DataFolder = "Resources/TR3/Objects",
             IgnoreGraphics = true
         };
         importer.Import();

diff --git a/TRDataControl/Environment/Model/Types/Rooms/BaseEMRoomImportFunction.cs b/TRDataControl/Environment/Model/Types/Rooms/BaseEMRoomImportFunction.cs
@@ -13,7 +13,7 @@ public abstract class BaseEMRoomImportFunction : BaseEMFunction
 
     protected string ReadRoomResource(string versionID)
     {
-        string path = string.Format(@"Resources\{0}\Rooms\{1}-Rooms.json", versionID, LevelID);
+        string path = string.Format("Resources/{0}/Rooms/{1}-Rooms.json", versionID, LevelID);
         if (!File.Exists(path))
         {
             throw new IOException("Missing room definition data: " + path);
@@ -24,7 +24,7 @@ protected string ReadRoomResource(string versionID)
 
     protected string ReadZoningResource(string versionID)
     {
-        string path = string.Format(@"Resources\{0}\Rooms\{1}-Zoning.json", versionID, LevelID);
+        string path = string.Format("Resources/{0}/Rooms/{1}-Zoning.json", versionID, LevelID);
         if (!File.Exists(path))
         {
             throw new IOException("Missing room zoning data: " + path);

diff --git a/TRDataControl/Transport/TRDataTransport.cs b/TRDataControl/Transport/TRDataTransport.cs
@@ -9,7 +9,7 @@ public abstract class TRDataTransport<L, T, S, B>
     where S : Enum
     where B : TRBlobBase<T>
 {
-    protected static readonly string _defaultDataFolder = @"Resources\Objects";
+    protected static readonly string _defaultDataFolder = "Resources/Objects";
     protected static readonly string _blobExt = ".TRB";
 
     public IDataProvider<T, S> Data { get; set; }

diff --git a/TRDataControlTests/IO/ExportTests.cs b/TRDataControlTests/IO/ExportTests.cs
@@ -41,7 +41,7 @@ public void TestTR1ExportIO()
         TR1Level level = GetTR1TestLevel();
         TR1DataExporter exporter = new()
         {
-            DataFolder = @"Objects\TR1"
+            DataFolder = "Objects/TR1"
         };
         TR1Blob blob1 = exporter.Export(level, TR1Type.Bear);
         exporter.StoreBlob(blob1);
@@ -89,7 +89,7 @@ public void TestTR2ExportIO()
         TR2Level level = GetTR2TestLevel();
         TR2DataExporter exporter = new()
         {
-            DataFolder = @"Objects\TR2"
+            DataFolder = "Objects/TR2"
         };
         TR2Blob blob1 = exporter.Export(level, TR2Type.BengalTiger);
         exporter.StoreBlob(blob1);
@@ -137,7 +137,7 @@ public void TestTR3ExportIO()
         TR3Level level = GetTR3TestLevel();
         TR3DataExporter exporter = new()
         {
-            DataFolder = @"Objects\TR3"
+            DataFolder = "Objects/TR3"
         };
         TR3Blob blob1 = exporter.Export(level, TR3Type.Monkey);
         exporter.StoreBlob(blob1);
@@ -179,7 +179,7 @@ public void TestTR4ExportIO()
         TR4Level level = GetTR4TestLevel();
         TR4DataExporter exporter = new()
         {
-            DataFolder = @"Objects\TR4"
+            DataFolder = "Objects/TR4"
         };
         TR4Blob blob1 = exporter.Export(level, TR4Type.Dog);
         exporter.StoreBlob(blob1);
@@ -222,7 +222,7 @@ public void TestTR5ExportIO()
         TR5Level level = GetTR5TestLevel();
         TR5DataExporter exporter = new()
         {
-            DataFolder = @"Objects\TR5"
+            DataFolder = "Objects/TR5"
         };
         TR5Blob blob1 = exporter.Export(level, TR5Type.Huskie);
         exporter.StoreBlob(blob1);

diff --git a/TRDataControlTests/IO/ImportTests.cs b/TRDataControlTests/IO/ImportTests.cs
@@ -21,7 +21,7 @@ public void TestTR1Import()
 
         TR1DataImporter importer = new()
         {
-            DataFolder = @"Objects\TR1",
+            DataFolder = "Objects/TR1",
             Level = level,
             TypesToImport = new() { TR1Type.Bear },
         };
@@ -42,7 +42,7 @@ public void TestTR1RMerge()
 
         TR1DataImporter importer = new()
         {
-            DataFolder = @"Objects\TR1",
+            DataFolder = "Objects/TR1",
             Level = level,
             TypesToImport = new() { TR1Type.Bear },
             TypesToRemove = new() { TR1Type.Larson },
@@ -83,7 +83,7 @@ public void TestTR2Import()
 
         TR2DataImporter importer = new()
         {
-            DataFolder = @"Objects\TR2",
+            DataFolder = "Objects/TR2",
             Level = level,
             TypesToImport = new() { TR2Type.BengalTiger },
         };
@@ -104,7 +104,7 @@ public void TestTR2RMerge()
 
         TR2DataImporter importer = new()
         {
-            DataFolder = @"Objects\TR2",
+            DataFolder = "Objects/TR2",
             Level = level,
             TypesToImport = new() { TR2Type.BengalTiger },
             TypesToRemove = new() { TR2Type.Yeti },
@@ -145,7 +145,7 @@ public void TestTR3Import()
 
         TR3DataImporter importer = new()
         {
-            DataFolder = @"Objects\TR3",
+            DataFolder = "Objects/TR3",
             Level = level,
             TypesToImport = new() { TR3Type.Monkey },
         };
@@ -166,7 +166,7 @@ public void TestTR3RMerge()
 
         TR3DataImporter importer = new()
         {
-            DataFolder = @"Objects\TR3",
+            DataFolder = "Objects/TR3",
             Level = level,
             TypesToImport = new() { TR3Type.Monkey },
             TypesToRemove = new() { TR3Type.Dog },
@@ -207,7 +207,7 @@ public void TestTR4Import()
 
         TR4DataImporter importer = new()
         {
-            DataFolder = @"Objects\TR4",
+            DataFolder = "Objects/TR4",
             Level = level,
             TypesToImport = new() { TR4Type.Dog },
         };
@@ -227,7 +227,7 @@ public void TestTR5Import()
 
         TR5DataImporter importer = new()
         {
-            DataFolder = @"Objects\TR5",
+            DataFolder = "Objects/TR5",
             Level = level,
             TypesToImport = new() { TR5Type.Huskie },
         };
@@ -264,7 +264,7 @@ public void TestDirectDependency()
         TR2Level level = GetTR2AltTestLevel();
         TR2DataImporter importer = new()
         {
-            DataFolder = @"Objects\TR2",
+            DataFolder = "Objects/TR2",
             Level = level,
             TypesToImport = new() { TR2Type.MaskedGoon2 },
         };
@@ -286,7 +286,7 @@ public void TestDependencyRemoval()
         TR2Level level = GetTR2AltTestLevel();
         TR2DataImporter importer = new()
         {
-            DataFolder = @"Objects\TR2",
+            DataFolder = "Objects/TR2",
             Level = level,
             TypesToImport = new() { TR2Type.MaskedGoon1 },
         };
@@ -295,7 +295,7 @@ public void TestDependencyRemoval()
 
         importer = new()
         {
-            DataFolder = @"Objects\TR2",
+            DataFolder = "Objects/TR2",
             Level = level,
             TypesToImport = new() { TR2Type.MaskedGoon2 },
             TypesToRemove = new() { TR2Type.MaskedGoon1 },
@@ -306,7 +306,7 @@ public void TestDependencyRemoval()
 
         importer = new()
         {
-            DataFolder = @"Objects\TR2",
+            DataFolder = "Objects/TR2",
             Level = level,
             TypesToImport = new() { TR2Type.BengalTiger },
             TypesToRemove = new() { TR2Type.MaskedGoon1, TR2Type.MaskedGoon2 },
@@ -322,7 +322,7 @@ private static void ExportTR1Model(TR1Type type)
         TR1Level level = GetTR1TestLevel();
         TR1DataExporter exporter = new()
         {
-            DataFolder = @"Objects\TR1"
+            DataFolder = "Objects/TR1"
         };
         TR1Blob blob = exporter.Export(level, type);
         exporter.StoreBlob(blob);
@@ -346,7 +346,7 @@ private static void ExportTR2Model(TR2Type type)
         TR2Level level = GetTR2TestLevel();
         TR2DataExporter exporter = new()
         {
-            DataFolder = @"Objects\TR2"
+            DataFolder = "Objects/TR2"
         };
         TR2Blob blob = exporter.Export(level, type);
         exporter.StoreBlob(blob);
@@ -370,7 +370,7 @@ private static void ExportTR3Model(TR3Type type)
         TR3Level level = GetTR3TestLevel();
         TR3DataExporter exporter = new()
         {
-            DataFolder = @"Objects\TR3"
+            DataFolder = "Objects/TR3"
         };
         TR3Blob blob = exporter.Export(level, type);
         exporter.StoreBlob(blob);
@@ -394,7 +394,7 @@ private static void ExportTR4Model(TR4Type type)
         TR4Level level = GetTR4TestLevel();
         TR4DataExporter exporter = new()
         {
-            DataFolder = @"Objects\TR4"
+            DataFolder = "Objects/TR4"
         };
         TR4Blob blob = exporter.Export(level, type);
         exporter.StoreBlob(blob);
@@ -410,7 +410,7 @@ private static void ExportTR5Model(TR5Type type)
         TR5Level level = GetTR5TestLevel();
         TR5DataExporter exporter = new()
         {
-            DataFolder = @"Objects\TR5"
+            DataFolder = "Objects/TR5"
         };
         TR5Blob blob = exporter.Export(level, type);
         exporter.StoreBlob(blob);

diff --git a/TRImageControl/Textures/Data/TR1TextureDatabase.cs b/TRImageControl/Textures/Data/TR1TextureDatabase.cs
@@ -5,5 +5,5 @@ namespace TRImageControl.Textures;
 public class TR1TextureDatabase : TextureDatabase<TR1Type>
 {
     public TR1TextureDatabase()
-        : base(@"Resources\TR1\Textures\Source") { }
+        : base("Resources/TR1/Textures/Source") { }
 }
diff --git a/TRImageControl/Textures/Data/TR2TextureDatabase.cs b/TRImageControl/Textures/Data/TR2TextureDatabase.cs
@@ -5,5 +5,5 @@ namespace TRImageControl.Textures;
 public class TR2TextureDatabase : TextureDatabase<TR2Type>
 {
     public TR2TextureDatabase()
-        : base(@"Resources\TR2\Textures\Source") { }
+        : base("Resources/TR2/Textures/Source") { }
 }
diff --git a/TRImageControl/Textures/Data/TR3TextureDatabase.cs b/TRImageControl/Textures/Data/TR3TextureDatabase.cs
@@ -5,5 +5,5 @@ namespace TRImageControl.Textures;
 public class TR3TextureDatabase : TextureDatabase<TR3Type>
 {
     public TR3TextureDatabase()
-        : base(@"Resources\TR3\Textures\Source") { }
+        : base("Resources/TR3/Textures/Source") { }
 }
diff --git a/TRImageControl/Textures/Data/TextureDatabase.cs b/TRImageControl/Textures/Data/TextureDatabase.cs
@@ -5,9 +5,9 @@ namespace TRImageControl.Textures;
 public class TextureDatabase<E>
     where E : Enum
 {
-    private static readonly string _entityLookupPath = @"Static\entity_lookup.json";
-    private static readonly string _dynamicDataPath = @"Dynamic\{0}.json";
-    private static readonly string _staticDataPath = @"Static\{0}";
+    private static readonly string _entityLookupPath = "Static/entity_lookup.json";
+    private static readonly string _dynamicDataPath = "Dynamic/{0}.json";
+    private static readonly string _staticDataPath = "Static/{0}";
     private static readonly string _staticPngFile = "Segments.png";
     private static readonly string _staticDataFile = "Data.json";
 
@@ -65,7 +65,7 @@ public StaticTextureSource<E>[] GetStaticSource(E entity)
 
     private DynamicTextureSource LoadDynamicSource(string name)
     {
-        string source = Path.Combine(DataPath, string.Format(_dynamicDataPath, name.Replace(".", @"\")));
+        string source = Path.Combine(DataPath, string.Format(_dynamicDataPath, name.Replace(".", "/")));
         if (!File.Exists(source))
         {
             throw new IOException(string.Format("Missing texture pack source JSON ({0})", source));
@@ -76,7 +76,7 @@ private DynamicTextureSource LoadDynamicSource(string name)
 
     private StaticTextureSource<E> LoadStaticSource(string name)
     {
-        string dir = Path.Combine(DataPath, string.Format(_staticDataPath, name.Replace(".", @"\")));
+        string dir = Path.Combine(DataPath, string.Format(_staticDataPath, name.Replace(".", "/")));
         if (!Directory.Exists(dir))
         {
             throw new IOException(string.Format("Missing texture pack source folder ({0})", name));

diff --git a/TRImageControl/Textures/Grouping/GlobalGrouping.cs b/TRImageControl/Textures/Grouping/GlobalGrouping.cs
@@ -5,7 +5,7 @@ namespace TRImageControl.Textures;
 public class GlobalGrouping<E>
     where E : Enum
 {
-    private static readonly string _groupingDataPath = @"Static\global_grouping.json";
+    private static readonly string _groupingDataPath = "Static/global_grouping.json";
 
     public Dictionary<StaticTextureSource<E>, List<StaticTextureTarget>> Sources { get; private set; }
     public List<TextureGrouping<E>> Grouping { get; private set; }

diff --git a/TRImageControl/Textures/Mapping/TR1TextureMapping.cs b/TRImageControl/Textures/Mapping/TR1TextureMapping.cs
@@ -12,7 +12,7 @@ protected TR1TextureMapping(TR1Level level)
 
     public static TR1TextureMapping Get(TR1Level level, string mappingFilePrefix, TR1TextureDatabase database, Dictionary<StaticTextureSource<TR1Type>, List<StaticTextureTarget>> predefinedMapping = null, List<TR1Type> entitiesToIgnore = null, Dictionary<TR1Type, TR1Type> entityMap = null)
     {
-        string mapFile = Path.Combine(@"Resources\TR1\Textures\Mapping\", mappingFilePrefix + "-Textures.json");
+        string mapFile = Path.Combine("Resources/TR1/Textures/Mapping/", mappingFilePrefix + "-Textures.json");
         if (!File.Exists(mapFile))
         {
             return null;