Rename data control classes (LostArtefacts#656)

Part of LostArtefacts#653.
lahm86 · May 4, 2024 · 56da5de · 56da5de
1 parent c1b497f
commit 56da5de
Show file tree

Hide file tree

Showing 79 changed files with 211 additions and 211 deletions.
diff --git a/ModelExport/Program.cs b/ModelExport/Program.cs
@@ -29,7 +29,7 @@ static void Main(string[] args)
 
     static void TR1Export(bool exportSegments)
     {
-        MassTR1ModelExporter exporter = new();
+        TR1MassExporter exporter = new();
         string exportFolder = @"TR1\Models";
         string segmentFolder = exportSegments ? @"TR1\ModelSegments" : null;
 
@@ -38,7 +38,7 @@ static void TR1Export(bool exportSegments)
 
     static void TR2Export(bool exportSegments)
     {
-        MassTR2ModelExporter exporter = new();
+        TR2MassExporter exporter = new();
         string exportFolder = @"TR2\Models";
         string segmentFolder = exportSegments ? @"TR2\ModelSegments" : null;
 
@@ -47,7 +47,7 @@ static void TR2Export(bool exportSegments)
 
     static void TR3Export(bool exportSegments)
     {
-        MassTR3ModelExporter exporter = new();
+        TR3MassExporter exporter = new();
         string exportFolder = @"TR3\Models";
         string segmentFolder = exportSegments ? @"TR3\ModelSegments" : null;
 

diff --git a/TRDataControl/Data/ITransportDataProvider.cs → TRDataControl/Data/IDataProvider.cs b/TRDataControl/Data/ITransportDataProvider.cs → TRDataControl/Data/IDataProvider.cs
@@ -1,6 +1,6 @@
 namespace TRModelTransporter.Data;
 
-public interface ITransportDataProvider<E> where E : Enum
+public interface IDataProvider<E> where E : Enum
 {
     int TextureTileLimit { get; set; }
     int TextureObjectLimit { get; set; }

diff --git a/TRDataControl/Data/TR1DefaultDataProvider.cs → TRDataControl/Data/TR1DataProvider.cs b/TRDataControl/Data/TR1DefaultDataProvider.cs → TRDataControl/Data/TR1DataProvider.cs
@@ -3,7 +3,7 @@
 
 namespace TRModelTransporter.Data;
 
-public class TR1DefaultDataProvider : ITransportDataProvider<TR1Type>
+public class TR1DataProvider : IDataProvider<TR1Type>
 {
     public int TextureTileLimit { get; set; } = 16;
     public int TextureObjectLimit { get; set; } = 2048;

diff --git a/TRDataControl/Data/TR2DefaultDataProvider.cs → TRDataControl/Data/TR2DataProvider.cs b/TRDataControl/Data/TR2DefaultDataProvider.cs → TRDataControl/Data/TR2DataProvider.cs
@@ -3,7 +3,7 @@
 
 namespace TRModelTransporter.Data;
 
-public class TR2DefaultDataProvider : ITransportDataProvider<TR2Type>
+public class TR2DataProvider : IDataProvider<TR2Type>
 {
     public int TextureTileLimit { get; set; } = 16;
     public int TextureObjectLimit { get; set; } = 2048;

diff --git a/TRDataControl/Data/TR3DefaultDataProvider.cs → TRDataControl/Data/TR3DataProvider.cs b/TRDataControl/Data/TR3DefaultDataProvider.cs → TRDataControl/Data/TR3DataProvider.cs
@@ -3,7 +3,7 @@
 
 namespace TRModelTransporter.Data;
 
-public class TR3DefaultDataProvider : ITransportDataProvider<TR3Type>
+public class TR3DataProvider : IDataProvider<TR3Type>
 {
     public int TextureTileLimit { get; set; } = 32;
     public int TextureObjectLimit { get; set; } = 4096;

diff --git a/TRDataControl/Environment/Model/Types/Models/EMImportModelFunction.cs b/TRDataControl/Environment/Model/Types/Models/EMImportModelFunction.cs
@@ -11,7 +11,7 @@ public class EMImportModelFunction : BaseEMFunction
 
     public override void ApplyToLevel(TR1Level level)
     {
-        TR1ModelImporter importer = new(Tags?.Contains(EMTag.CommunityPatchOnly) ?? false)
+        TR1DataImporter importer = new(Tags?.Contains(EMTag.CommunityPatchOnly) ?? false)
         {
             Level = level,
             EntitiesToImport = Models.Select(m => (TR1Type)m),
@@ -25,7 +25,7 @@ public override void ApplyToLevel(TR1Level level)
 
     public override void ApplyToLevel(TR2Level level)
     {
-        TR2ModelImporter importer = new()
+        TR2DataImporter importer = new()
         {
             Level = level,
             EntitiesToImport = Models.Select(m => (TR2Type)m),
@@ -39,7 +39,7 @@ public override void ApplyToLevel(TR2Level level)
 
     public override void ApplyToLevel(TR3Level level)
     {
-        TR3ModelImporter importer = new()
+        TR3DataImporter importer = new()
         {
             Level = level,
             EntitiesToImport = Models.Select(m => (TR3Type)m),

diff --git a/TRDataControl/Environment/Model/Types/Models/EMImportNonGraphicsModelFunction.cs b/TRDataControl/Environment/Model/Types/Models/EMImportNonGraphicsModelFunction.cs
@@ -15,7 +15,7 @@ public override void ApplyToLevel(TR1Level level)
             return;
         }
 
-        TR1ModelImporter importer = new()
+        TR1DataImporter importer = new()
         {
             Level = level,
             ClearUnusedSprites = false,
@@ -36,7 +36,7 @@ public override void ApplyToLevel(TR2Level level)
             return;
         }
 
-        TR2ModelImporter importer = new()
+        TR2DataImporter importer = new()
         {
             Level = level,
             ClearUnusedSprites = false,
@@ -57,7 +57,7 @@ public override void ApplyToLevel(TR3Level level)
             return;
         }
 
-        TR3ModelImporter importer = new()
+        TR3DataImporter importer = new()
         {
             Level = level,
             ClearUnusedSprites = false,

diff --git a/TRDataControl/Environment/Model/Types/Textures/EMCreateTextureFunction.cs b/TRDataControl/Environment/Model/Types/Textures/EMCreateTextureFunction.cs
@@ -1,7 +1,7 @@
 using System.Drawing;
+using TRImageControl.Packing;
 using TRLevelControl.Model;
 using TRModelTransporter.Model.Textures;
-using TRModelTransporter.Packing;
 using TRTexture16Importer.Helpers;
 
 namespace TRDataControl.Environment;

diff --git a/TRDataControl/Environment/Model/Types/Textures/EMOverwriteTextureFunction.cs b/TRDataControl/Environment/Model/Types/Textures/EMOverwriteTextureFunction.cs
@@ -1,6 +1,6 @@
 using System.Drawing;
+using TRImageControl.Packing;
 using TRLevelControl.Model;
-using TRModelTransporter.Packing;
 using TRTexture16Importer.Helpers;
 
 namespace TRDataControl.Environment;

diff --git a/TRDataControl/Handlers/CinematicTransportHandler.cs b/TRDataControl/Handlers/CinematicTransportHandler.cs
@@ -5,7 +5,7 @@ namespace TRModelTransporter.Handlers;
 
 public class CinematicTransportHandler
 {
-    public static void Export(TR1Level level, TR1ModelDefinition definition, IEnumerable<TR1Type> entityTypes)
+    public static void Export(TR1Level level, TR1Blob definition, IEnumerable<TR1Type> entityTypes)
     {
         List<TRCinematicFrame> frames = new();
         if (entityTypes != null && entityTypes.Contains(definition.Entity))
@@ -16,7 +16,7 @@ public static void Export(TR1Level level, TR1ModelDefinition definition, IEnumer
         definition.CinematicFrames = frames.ToArray();
     }
 
-    public static void Export(TR2Level level, TR2ModelDefinition definition, IEnumerable<TR2Type> entityTypes)
+    public static void Export(TR2Level level, TR2Blob definition, IEnumerable<TR2Type> entityTypes)
     {
         List<TRCinematicFrame> frames = new();
         if (entityTypes != null && entityTypes.Contains(definition.Entity))
@@ -27,7 +27,7 @@ public static void Export(TR2Level level, TR2ModelDefinition definition, IEnumer
         definition.CinematicFrames = frames.ToArray();
     }
 
-    public static void Export(TR3Level level, TR3ModelDefinition definition, IEnumerable<TR3Type> entityTypes)
+    public static void Export(TR3Level level, TR3Blob definition, IEnumerable<TR3Type> entityTypes)
     {
         List<TRCinematicFrame> frames = new();
         if (entityTypes != null && entityTypes.Contains(definition.Entity))
@@ -38,7 +38,7 @@ public static void Export(TR3Level level, TR3ModelDefinition definition, IEnumer
         definition.CinematicFrames = frames.ToArray();
     }
 
-    public static void Import(TR1Level level, TR1ModelDefinition definition, bool forceOverwrite)
+    public static void Import(TR1Level level, TR1Blob definition, bool forceOverwrite)
     {
         // We only import frames if the level doesn't have any already.
         if (level.CinematicFrames.Count == 0 || forceOverwrite)
@@ -47,15 +47,15 @@ public static void Import(TR1Level level, TR1ModelDefinition definition, bool fo
         }
     }
 
-    public static void Import(TR2Level level, TR2ModelDefinition definition, bool forceOverwrite)
+    public static void Import(TR2Level level, TR2Blob definition, bool forceOverwrite)
     {
         if (level.CinematicFrames.Count == 0 || forceOverwrite)
         {
             level.CinematicFrames = new(definition.CinematicFrames);
         }
     }
 
-    public static void Import(TR3Level level, TR3ModelDefinition definition, bool forceOverwrite)
+    public static void Import(TR3Level level, TR3Blob definition, bool forceOverwrite)
     {
         if (level.CinematicFrames.Count == 0 || forceOverwrite)
         {

diff --git a/TRDataControl/Handlers/ColourTransportHandler.cs b/TRDataControl/Handlers/ColourTransportHandler.cs
@@ -6,17 +6,17 @@ namespace TRModelTransporter.Handlers;
 
 public class ColourTransportHandler
 {
-    public static void Export(TR1Level level, TR1ModelDefinition definition)
+    public static void Export(TR1Level level, TR1Blob definition)
     {
         definition.Colours = GetUsedMeshColours(definition.Meshes, level.Palette);
     }
 
-    public static void Export(TR2Level level, TR2ModelDefinition definition)
+    public static void Export(TR2Level level, TR2Blob definition)
     {
         definition.Colours = GetUsedMeshColours(definition.Meshes, level.Palette16);
     }
 
-    public static void Export(TR3Level level, TR3ModelDefinition definition)
+    public static void Export(TR3Level level, TR3Blob definition)
     {
         definition.Colours = GetUsedMeshColours(definition.Meshes, level.Palette16);
     }
@@ -61,7 +61,7 @@ private static ISet<int> GetAllColourIndices(List<TRMesh> meshes, bool has16Bit)
         return colourIndices;
     }
 
-    public static void Import(TR1ModelDefinition definition, TRPalette8Control paletteManager)
+    public static void Import(TR1Blob definition, TRPalette8Control paletteManager)
     {
         Dictionary<int, int> indexMap = new();
 
@@ -75,7 +75,7 @@ public static void Import(TR1ModelDefinition definition, TRPalette8Control palet
         ReindexMeshTextures(definition.Meshes, indexMap, false);
     }
 
-    public static void Import(TR2Level level, TR2ModelDefinition definition)
+    public static void Import(TR2Level level, TR2Blob definition)
     {
         Dictionary<int, int> indexMap = new();
         TRPalette16Control tracker = new(level);
@@ -89,7 +89,7 @@ public static void Import(TR2Level level, TR2ModelDefinition definition)
         ReindexMeshTextures(definition.Meshes, indexMap, true);
     }
 
-    public static void Import(TR3Level level, TR3ModelDefinition definition)
+    public static void Import(TR3Level level, TR3Blob definition)
     {
         Dictionary<int, int> indexMap = new();
         TRPalette16Control tracker = new(level);

diff --git a/TRDataControl/Handlers/ModelTransportHandler.cs b/TRDataControl/Handlers/ModelTransportHandler.cs
@@ -6,22 +6,22 @@ namespace TRModelTransporter.Handlers;
 
 public class ModelTransportHandler
 {
-    public static void Export(TR1Level level, TR1ModelDefinition definition, TR1Type entity)
+    public static void Export(TR1Level level, TR1Blob definition, TR1Type entity)
     {
         definition.Model = level.Models[entity];
     }
 
-    public static void Export(TR2Level level, TR2ModelDefinition definition, TR2Type entity)
+    public static void Export(TR2Level level, TR2Blob definition, TR2Type entity)
     {
         definition.Model = level.Models[entity];
     }
 
-    public static void Export(TR3Level level, TR3ModelDefinition definition, TR3Type entity)
+    public static void Export(TR3Level level, TR3Blob definition, TR3Type entity)
     {
         definition.Model = level.Models[entity];
     }
 
-    public static void Import(TR1Level level, TR1ModelDefinition definition, Dictionary<TR1Type, TR1Type> aliasPriority, IEnumerable<TR1Type> laraDependants)
+    public static void Import(TR1Level level, TR1Blob definition, Dictionary<TR1Type, TR1Type> aliasPriority, IEnumerable<TR1Type> laraDependants)
     {
         if (!level.Models.ContainsKey(definition.Entity))
         {
@@ -51,7 +51,7 @@ public static void Import(TR1Level level, TR1ModelDefinition definition, Diction
         }
     }
 
-    public static void Import(TR2Level level, TR2ModelDefinition definition, Dictionary<TR2Type, TR2Type> aliasPriority, IEnumerable<TR2Type> laraDependants)
+    public static void Import(TR2Level level, TR2Blob definition, Dictionary<TR2Type, TR2Type> aliasPriority, IEnumerable<TR2Type> laraDependants)
     {
         if (!level.Models.ContainsKey(definition.Entity))
         {
@@ -75,7 +75,7 @@ public static void Import(TR2Level level, TR2ModelDefinition definition, Diction
         }
     }
 
-    public static void Import(TR3Level level, TR3ModelDefinition definition, Dictionary<TR3Type, TR3Type> aliasPriority, IEnumerable<TR3Type> laraDependants, IEnumerable<TR3Type> unsafeReplacements)
+    public static void Import(TR3Level level, TR3Blob definition, Dictionary<TR3Type, TR3Type> aliasPriority, IEnumerable<TR3Type> laraDependants, IEnumerable<TR3Type> unsafeReplacements)
     {
         if (!level.Models.ContainsKey(definition.Entity))
         {

diff --git a/TRDataControl/Handlers/Sound/SoundTransportHandler.cs b/TRDataControl/Handlers/Sound/SoundTransportHandler.cs
@@ -5,7 +5,7 @@ namespace TRModelTransporter.Handlers;
 
 public class SoundTransportHandler
 {
-    public static void Export(TR1Level level, TR1ModelDefinition definition, short[] hardcodedSounds)
+    public static void Export(TR1Level level, TR1Blob definition, short[] hardcodedSounds)
     {
         if (hardcodedSounds == null || hardcodedSounds.Length == 0)
         {
@@ -23,7 +23,7 @@ public static void Export(TR1Level level, TR1ModelDefinition definition, short[]
         }
     }
 
-    public static void Export(TR2Level level, TR2ModelDefinition definition, short[] hardcodedSounds)
+    public static void Export(TR2Level level, TR2Blob definition, short[] hardcodedSounds)
     {
         if (hardcodedSounds == null || hardcodedSounds.Length == 0)
         {
@@ -41,7 +41,7 @@ public static void Export(TR2Level level, TR2ModelDefinition definition, short[]
         }
     }
 
-    public static void Export(TR3Level level, TR3ModelDefinition definition, short[] hardcodedSounds)
+    public static void Export(TR3Level level, TR3Blob definition, short[] hardcodedSounds)
     {
         if (hardcodedSounds == null || hardcodedSounds.Length == 0)
         {
@@ -59,9 +59,9 @@ public static void Export(TR3Level level, TR3ModelDefinition definition, short[]
         }
     }
 
-    public static void Import(TR1Level level, IEnumerable<TR1ModelDefinition> definitions)
+    public static void Import(TR1Level level, IEnumerable<TR1Blob> definitions)
     {
-        foreach (TR1ModelDefinition definition in definitions)
+        foreach (TR1Blob definition in definitions)
         {
             if (definition.SoundEffects == null)
             {
@@ -75,9 +75,9 @@ public static void Import(TR1Level level, IEnumerable<TR1ModelDefinition> defini
         }
     }
 
-    public static void Import(TR2Level level, IEnumerable<TR2ModelDefinition> definitions)
+    public static void Import(TR2Level level, IEnumerable<TR2Blob> definitions)
     {
-        foreach (TR2ModelDefinition definition in definitions)
+        foreach (TR2Blob definition in definitions)
         {
             if (definition.SoundEffects == null)
             {
@@ -91,9 +91,9 @@ public static void Import(TR2Level level, IEnumerable<TR2ModelDefinition> defini
         }
     }
 
-    public static void Import(TR3Level level, IEnumerable<TR3ModelDefinition> definitions)
+    public static void Import(TR3Level level, IEnumerable<TR3Blob> definitions)
     {
-        foreach (TR3ModelDefinition definition in definitions)
+        foreach (TR3Blob definition in definitions)
         {
             if (definition.SoundEffects == null)
             {

diff --git a/TRDataControl/Handlers/Textures/AbstractTextureExportHandler.cs b/TRDataControl/Handlers/Textures/AbstractTextureExportHandler.cs
@@ -1,18 +1,18 @@
 using RectanglePacker.Organisation;
 using System.Drawing;
+using TRImageControl.Packing;
 using TRLevelControl.Model;
 using TRModelTransporter.Events;
 using TRModelTransporter.Model;
 using TRModelTransporter.Model.Textures;
-using TRModelTransporter.Packing;
 using TRModelTransporter.Utilities;
 
 namespace TRModelTransporter.Handlers;
 
 public abstract class AbstractTextureExportHandler<E, L, D>
     where E : Enum
     where L : class
-    where D : AbstractTRModelDefinition<E>
+    where D : TRBlobBase<E>
 {
     protected const int _exportBitmapWidth = 320;
     protected const int _exportBitmapHeight = 640;

diff --git a/TRDataControl/Handlers/Textures/AbstractTextureImportHandler.cs b/TRDataControl/Handlers/Textures/AbstractTextureImportHandler.cs
@@ -1,20 +1,20 @@
 using RectanglePacker.Events;
 using System.Drawing;
+using TRImageControl.Packing;
 using TRLevelControl.Model;
 using TRModelTransporter.Data;
 using TRModelTransporter.Model;
 using TRModelTransporter.Model.Textures;
-using TRModelTransporter.Packing;
 using TRTexture16Importer.Helpers;
 
 namespace TRModelTransporter.Handlers;
 
 public abstract class AbstractTextureImportHandler<E, L, D>
     where E : Enum
     where L : class
-    where D : AbstractTRModelDefinition<E>
+    where D : TRBlobBase<E>
 {
-    public ITransportDataProvider<E> Data { get; set; }
+    public IDataProvider<E> Data { get; set; }
 
     protected Dictionary<D, List<TexturedTileSegment>> _importSegments;