Rename texture packer (LostArtefacts#658)

Part of LostArtefacts#653.
lahm86 · May 5, 2024 · 07b4a34 · 07b4a34
1 parent 6446699
commit 07b4a34
Show file tree

Hide file tree

Showing 30 changed files with 52 additions and 52 deletions.
diff --git a/TRDataControl/Environment/Model/Types/Textures/EMCreateTextureFunction.cs b/TRDataControl/Environment/Model/Types/Textures/EMCreateTextureFunction.cs
@@ -45,7 +45,7 @@ public override void ApplyToLevel(TR3Level level)
         }.ApplyToLevel(level));
     }
 
-    private List<EMTextureMap> BuildAndPackTextures<E, L>(AbstractTexturePacker<E, L> packer, List<TRObjectTexture> textures)
+    private List<EMTextureMap> BuildAndPackTextures<E, L>(TRTexturePacker<E, L> packer, List<TRObjectTexture> textures)
         where L : class
         where E : Enum
     {

diff --git a/TRDataControl/Handlers/Textures/AbstractTextureExportHandler.cs b/TRDataControl/Handlers/Textures/AbstractTextureExportHandler.cs
@@ -22,7 +22,7 @@ public abstract class AbstractTextureExportHandler<E, L, D>
     protected IEnumerable<E> _spriteDependencies;
     protected IEnumerable<int> _ignoreableTextureIndices;
 
-    protected AbstractTexturePacker<E, L> _packer;
+    protected TRTexturePacker<E, L> _packer;
 
     protected List<TexturedTileSegment> _allSegments;
     public event EventHandler<SegmentEventArgs> SegmentExported;
@@ -45,7 +45,7 @@ public void Export(L level, D definition, ITextureClassifier classifier, IEnumer
         }
     }
 
-    protected abstract AbstractTexturePacker<E, L> CreatePacker();
+    protected abstract TRTexturePacker<E, L> CreatePacker();
 
     protected abstract TRSpriteSequence GetSprite(E entity);
 

diff --git a/TRDataControl/Handlers/Textures/AbstractTextureImportHandler.cs b/TRDataControl/Handlers/Textures/AbstractTextureImportHandler.cs
@@ -137,7 +137,7 @@ protected virtual void CollateSegments()
 
     protected virtual PackingResult<TexturedTile, TexturedTileSegment> Pack()
     {
-        using AbstractTexturePacker<E, L> packer = CreatePacker();
+        using TRTexturePacker<E, L> packer = CreatePacker();
         packer.MaximumTiles = Data.TextureTileLimit;
 
         ProcessRemovals(packer);
@@ -255,9 +255,9 @@ protected virtual void MergeSpriteTextures()
 
     protected abstract TRDictionary<E, TRSpriteSequence> GetExistingSpriteSequences();
 
-    protected abstract AbstractTexturePacker<E, L> CreatePacker();
+    protected abstract TRTexturePacker<E, L> CreatePacker();
 
-    protected abstract void ProcessRemovals(AbstractTexturePacker<E, L> packer);
+    protected abstract void ProcessRemovals(TRTexturePacker<E, L> packer);
 
     protected abstract List<TRObjectTexture> GetExistingObjectTextures();
 

diff --git a/TRDataControl/Handlers/Textures/TR1/TR1TextureExportHandler.cs b/TRDataControl/Handlers/Textures/TR1/TR1TextureExportHandler.cs
@@ -6,7 +6,7 @@ namespace TRModelTransporter.Handlers.Textures;
 
 public class TR1TextureExportHandler : AbstractTextureExportHandler<TR1Type, TR1Level, TR1Blob>
 {
-    protected override AbstractTexturePacker<TR1Type, TR1Level> CreatePacker()
+    protected override TRTexturePacker<TR1Type, TR1Level> CreatePacker()
     {
         return new TR1TexturePacker(_level, _classifier);
     }

diff --git a/TRDataControl/Handlers/Textures/TR1/TR1TextureImportHandler.cs b/TRDataControl/Handlers/Textures/TR1/TR1TextureImportHandler.cs
@@ -20,15 +20,15 @@ protected override TRDictionary<TR1Type, TRSpriteSequence> GetExistingSpriteSequ
         return _level.Sprites;
     }
 
-    protected override AbstractTexturePacker<TR1Type, TR1Level> CreatePacker()
+    protected override TRTexturePacker<TR1Type, TR1Level> CreatePacker()
     {
         return new TR1TexturePacker(_level)
         {
             PaletteManager = PaletteManager
         };
     }
 
-    protected override void ProcessRemovals(AbstractTexturePacker<TR1Type, TR1Level> packer)
+    protected override void ProcessRemovals(TRTexturePacker<TR1Type, TR1Level> packer)
     {
         List<TR1Type> removals = new();
         if (_clearUnusedSprites)
@@ -48,7 +48,7 @@ protected override void ProcessRemovals(AbstractTexturePacker<TR1Type, TR1Level>
         }
     }
 
-    private void RemoveUnusedSprites(AbstractTexturePacker<TR1Type, TR1Level> packer)
+    private void RemoveUnusedSprites(TRTexturePacker<TR1Type, TR1Level> packer)
     {
         List<TR1Type> unusedItems = new()
         {

diff --git a/TRDataControl/Handlers/Textures/TR2/TR2TextureExportHandler.cs b/TRDataControl/Handlers/Textures/TR2/TR2TextureExportHandler.cs
@@ -6,7 +6,7 @@ namespace TRModelTransporter.Handlers;
 
 public class TR2TextureExportHandler : AbstractTextureExportHandler<TR2Type, TR2Level, TR2Blob>
 {
-    protected override AbstractTexturePacker<TR2Type, TR2Level> CreatePacker()
+    protected override TRTexturePacker<TR2Type, TR2Level> CreatePacker()
     {
         return new TR2TexturePacker(_level, _classifier);
     }

diff --git a/TRDataControl/Handlers/Textures/TR2/TR2TextureImportHandler.cs b/TRDataControl/Handlers/Textures/TR2/TR2TextureImportHandler.cs
@@ -12,12 +12,12 @@ protected override TRDictionary<TR2Type, TRSpriteSequence> GetExistingSpriteSequ
         return _level.Sprites;
     }
 
-    protected override AbstractTexturePacker<TR2Type, TR2Level> CreatePacker()
+    protected override TRTexturePacker<TR2Type, TR2Level> CreatePacker()
     {
         return new TR2TexturePacker(_level);
     }
 
-    protected override void ProcessRemovals(AbstractTexturePacker<TR2Type, TR2Level> packer)
+    protected override void ProcessRemovals(TRTexturePacker<TR2Type, TR2Level> packer)
     {
         List<TR2Type> removals = new();
         if (_clearUnusedSprites)
@@ -74,7 +74,7 @@ private void ApplyFlamePatch()
         }
     }
 
-    private void RemoveUnusedSprites(AbstractTexturePacker<TR2Type, TR2Level> packer)
+    private void RemoveUnusedSprites(TRTexturePacker<TR2Type, TR2Level> packer)
     {
         List<TR2Type> unusedItems = new()
         {

diff --git a/TRDataControl/Handlers/Textures/TR3/TR3TextureExportHandler.cs b/TRDataControl/Handlers/Textures/TR3/TR3TextureExportHandler.cs
@@ -6,7 +6,7 @@ namespace TRModelTransporter.Handlers;
 
 public class TR3TextureExportHandler : AbstractTextureExportHandler<TR3Type, TR3Level, TR3Blob>
 {
-    protected override AbstractTexturePacker<TR3Type, TR3Level> CreatePacker()
+    protected override TRTexturePacker<TR3Type, TR3Level> CreatePacker()
     {
         return new TR3TexturePacker(_level, _classifier);
     }

diff --git a/TRDataControl/Handlers/Textures/TR3/TR3TextureImportHandler.cs b/TRDataControl/Handlers/Textures/TR3/TR3TextureImportHandler.cs
@@ -12,12 +12,12 @@ protected override TRDictionary<TR3Type, TRSpriteSequence> GetExistingSpriteSequ
         return _level.Sprites;
     }
 
-    protected override AbstractTexturePacker<TR3Type, TR3Level> CreatePacker()
+    protected override TRTexturePacker<TR3Type, TR3Level> CreatePacker()
     {
         return new TR3TexturePacker(_level);
     }
 
-    protected override void ProcessRemovals(AbstractTexturePacker<TR3Type, TR3Level> packer)
+    protected override void ProcessRemovals(TRTexturePacker<TR3Type, TR3Level> packer)
     {
         List<TR3Type> removals = new();
         if (_clearUnusedSprites)
@@ -37,7 +37,7 @@ protected override void ProcessRemovals(AbstractTexturePacker<TR3Type, TR3Level>
         }
     }
 
-    private void RemoveUnusedSprites(AbstractTexturePacker<TR3Type, TR3Level> packer)
+    private void RemoveUnusedSprites(TRTexturePacker<TR3Type, TR3Level> packer)
     {
         List<TR3Type> unusedItems = new()
         {

diff --git a/TRDataControl/Utilities/AbstractMassTRTextureDeduplicator.cs b/TRDataControl/Utilities/AbstractMassTRTextureDeduplicator.cs
@@ -62,7 +62,7 @@ public void Export()
 
     private void ExportDuplicateLevelTextures(string lvlPath)
     {
-        using AbstractTexturePacker<E, L> levelPacker = CreatePacker(ReadLevel(lvlPath));
+        using TRTexturePacker<E, L> levelPacker = CreatePacker(ReadLevel(lvlPath));
         Dictionary<TexturedTile, List<TexturedTileSegment>> allTextures = new();
         foreach (TexturedTile tile in levelPacker.Tiles)
         {
@@ -136,7 +136,7 @@ private void SegmentRepositioned(object sender, TRTextureRemapEventArgs e)
     }
 
     protected abstract AbstractTextureRemapGroup<E, L> CreateRemapGroup();
-    protected abstract AbstractTexturePacker<E, L> CreatePacker(L level);
+    protected abstract TRTexturePacker<E, L> CreatePacker(L level);
     protected abstract AbstractTRLevelTextureDeduplicator<E, L> CreateDeduplicator();
     protected abstract L ReadLevel(string path);
     protected abstract void WriteLevel(L level, string path);

diff --git a/TRDataControl/Utilities/AbstractTRLevelTextureDeduplicator.cs b/TRDataControl/Utilities/AbstractTRLevelTextureDeduplicator.cs
@@ -20,7 +20,7 @@ public AbstractTRLevelTextureDeduplicator()
 
     public void Deduplicate(string remappingPath)
     {
-        using AbstractTexturePacker<E, L> levelPacker = CreatePacker(Level);
+        using TRTexturePacker<E, L> levelPacker = CreatePacker(Level);
         Dictionary<TexturedTile, List<TexturedTileSegment>> allTextures = new();
         foreach (TexturedTile tile in levelPacker.Tiles)
         {
@@ -51,7 +51,7 @@ public void Deduplicate(string remappingPath)
         ReindexTextures(indexMap);
     }
 
-    protected abstract AbstractTexturePacker<E, L> CreatePacker(L level);
+    protected abstract TRTexturePacker<E, L> CreatePacker(L level);
     protected abstract AbstractTextureRemapGroup<E, L> GetRemapGroup(string path);
     protected abstract void ReindexTextures(Dictionary<int, int> indexMap);
 

diff --git a/TRDataControl/Utilities/Deduplication/MassTR2TextureDeduplicator.cs b/TRDataControl/Utilities/Deduplication/MassTR2TextureDeduplicator.cs
@@ -16,7 +16,7 @@ public MassTR2TextureDeduplicator()
         _control = new();
     }
 
-    protected override AbstractTexturePacker<TR2Type, TR2Level> CreatePacker(TR2Level level)
+    protected override TRTexturePacker<TR2Type, TR2Level> CreatePacker(TR2Level level)
     {
         return new TR2TexturePacker(level);
     }

diff --git a/TRDataControl/Utilities/Deduplication/TR2LevelTextureDeduplicator.cs b/TRDataControl/Utilities/Deduplication/TR2LevelTextureDeduplicator.cs
@@ -7,7 +7,7 @@ namespace TRModelTransporter.Utilities;
 
 public class TR2LevelTextureDeduplicator : AbstractTRLevelTextureDeduplicator<TR2Type, TR2Level>
 {
-    protected override AbstractTexturePacker<TR2Type, TR2Level> CreatePacker(TR2Level level)
+    protected override TRTexturePacker<TR2Type, TR2Level> CreatePacker(TR2Level level)
     {
         return new TR2TexturePacker(level);
     }

diff --git a/...eControl/Packing/AbstractTexturePacker.cs → TRImageControl/Packing/TRTexturePacker.cs b/...eControl/Packing/AbstractTexturePacker.cs → TRImageControl/Packing/TRTexturePacker.cs
@@ -9,7 +9,7 @@
 
 namespace TRImageControl.Packing;
 
-public abstract class AbstractTexturePacker<E, L> : AbstractPacker<TexturedTile, TexturedTileSegment>, IDisposable
+public abstract class TRTexturePacker<E, L> : AbstractPacker<TexturedTile, TexturedTileSegment>, IDisposable
     where E : Enum
     where L : class
 {
@@ -22,10 +22,10 @@ public abstract class AbstractTexturePacker<E, L> : AbstractPacker<TexturedTile,
 
     private readonly List<AbstractIndexedTRTexture> _allTextures;
 
-    public AbstractTexturePacker()
+    public TRTexturePacker()
         : this(default) { }
 
-    public AbstractTexturePacker(L level, int maximumTiles = 16, ITextureClassifier classifier = null)
+    public TRTexturePacker(L level, int maximumTiles = 16, ITextureClassifier classifier = null)
     {
         TileWidth = TRConsts.TPageWidth;
         TileHeight = TRConsts.TPageHeight;

diff --git a/TRImageControl/Packing/Textures/AbstractTextureRemapGroup.cs b/TRImageControl/Packing/Textures/AbstractTextureRemapGroup.cs
@@ -17,7 +17,7 @@ public AbstractTextureRemapGroup()
 
     public void CalculateDependencies(L level, E entity)
     {
-        using AbstractTexturePacker<E, L> packer = CreatePacker(level);
+        using TRTexturePacker<E, L> packer = CreatePacker(level);
         Dictionary<TexturedTile, List<TexturedTileSegment>> entitySegments = packer.GetModelSegments(entity);
         foreach (E otherEntity in GetModelTypes(level))
         {
@@ -53,7 +53,7 @@ public void CalculateDependencies(L level, E entity)
         }
     }
 
-    protected abstract AbstractTexturePacker<E, L> CreatePacker(L level);
+    protected abstract TRTexturePacker<E, L> CreatePacker(L level);
     protected abstract IEnumerable<E> GetModelTypes(L level);
 
     public TextureDependency<E> GetDependency(int tileIndex, Rectangle rectangle)

diff --git a/TRImageControl/Packing/Textures/RemapTypes/TR1TextureRemapGroup.cs b/TRImageControl/Packing/Textures/RemapTypes/TR1TextureRemapGroup.cs
@@ -9,7 +9,7 @@ protected override IEnumerable<TR1Type> GetModelTypes(TR1Level level)
         return level.Models.Keys.ToList();
     }
 
-    protected override AbstractTexturePacker<TR1Type, TR1Level> CreatePacker(TR1Level level)
+    protected override TRTexturePacker<TR1Type, TR1Level> CreatePacker(TR1Level level)
     {
         return new TR1TexturePacker(level);
     }

diff --git a/TRImageControl/Packing/Textures/RemapTypes/TR2TextureRemapGroup.cs b/TRImageControl/Packing/Textures/RemapTypes/TR2TextureRemapGroup.cs
@@ -9,7 +9,7 @@ protected override IEnumerable<TR2Type> GetModelTypes(TR2Level level)
         return level.Models.Keys.ToList();
     }
 
-    protected override AbstractTexturePacker<TR2Type, TR2Level> CreatePacker(TR2Level level)
+    protected override TRTexturePacker<TR2Type, TR2Level> CreatePacker(TR2Level level)
     {
         return new TR2TexturePacker(level);
     }

diff --git a/TRImageControl/Packing/Textures/RemapTypes/TR3TextureRemapGroup.cs b/TRImageControl/Packing/Textures/RemapTypes/TR3TextureRemapGroup.cs
@@ -9,7 +9,7 @@ protected override IEnumerable<TR3Type> GetModelTypes(TR3Level level)
         return level.Models.Keys.ToList();
     }
 
-    protected override AbstractTexturePacker<TR3Type, TR3Level> CreatePacker(TR3Level level)
+    protected override TRTexturePacker<TR3Type, TR3Level> CreatePacker(TR3Level level)
     {
         return new TR3TexturePacker(level);
     }

diff --git a/...geControl/Packing/DefaultTexturePacker.cs → ...rol/Packing/Types/DefaultTexturePacker.cs b/...geControl/Packing/DefaultTexturePacker.cs → ...rol/Packing/Types/DefaultTexturePacker.cs
diff --git a/TRImageControl/Packing/Types/TR1TexturePacker.cs b/TRImageControl/Packing/Types/TR1TexturePacker.cs
@@ -5,7 +5,7 @@
 
 namespace TRImageControl.Packing;
 
-public class TR1TexturePacker : AbstractTexturePacker<TR1Type, TR1Level>
+public class TR1TexturePacker : TRTexturePacker<TR1Type, TR1Level>
 {
     private const int _maximumTiles = 16;
 

diff --git a/TRImageControl/Packing/Types/TR2TexturePacker.cs b/TRImageControl/Packing/Types/TR2TexturePacker.cs
@@ -4,7 +4,7 @@
 
 namespace TRImageControl.Packing;
 
-public class TR2TexturePacker : AbstractTexturePacker<TR2Type, TR2Level>
+public class TR2TexturePacker : TRTexturePacker<TR2Type, TR2Level>
 {
     private const int _maximumTiles = 16;
 

diff --git a/TRImageControl/Packing/Types/TR3TexturePacker.cs b/TRImageControl/Packing/Types/TR3TexturePacker.cs
@@ -4,7 +4,7 @@
 
 namespace TRImageControl.Packing;
 
-public class TR3TexturePacker : AbstractTexturePacker<TR3Type, TR3Level>
+public class TR3TexturePacker : TRTexturePacker<TR3Type, TR3Level>
 {
     private const int _maximumTiles = 32;
 

diff --git a/TRRandomizerCore/Textures/Landmarks/AbstractLandmarkImporter.cs b/TRRandomizerCore/Textures/Landmarks/AbstractLandmarkImporter.cs
@@ -16,7 +16,7 @@ public abstract class AbstractLandmarkImporter<E, L>
 
     protected abstract int MaxTextures { get; }
 
-    protected abstract AbstractTexturePacker<E, L> CreatePacker(L level);
+    protected abstract TRTexturePacker<E, L> CreatePacker(L level);
     protected abstract List<TRObjectTexture> GetObjectTextures(L level);
     protected abstract void SetRoomTexture(L level, int roomIndex, int rectangleIndex, ushort textureIndex);
     protected abstract short? GetRoomFromPortal(L level, PortalSector portalSector, bool isLevelMirrored);
@@ -33,7 +33,7 @@ public bool Import(L level, AbstractTextureMapping<E, L> mapping, bool isLevelMi
             return false;
         }
 
-        using AbstractTexturePacker<E, L> packer = CreatePacker(level);
+        using TRTexturePacker<E, L> packer = CreatePacker(level);
         Dictionary<LandmarkTextureTarget, TexturedTileSegment> targetSegmentMap = new();
 
         foreach (StaticTextureSource<E> source in mapping.LandmarkMapping.Keys)

diff --git a/TRRandomizerCore/Textures/Landmarks/TR1LandmarkImporter.cs b/TRRandomizerCore/Textures/Landmarks/TR1LandmarkImporter.cs
@@ -8,7 +8,7 @@ public class TR1LandmarkImporter : AbstractLandmarkImporter<TR1Type, TR1Level>
 {
     protected override int MaxTextures => IsCommunityPatch ? 8192 : 2048;
 
-    protected override AbstractTexturePacker<TR1Type, TR1Level> CreatePacker(TR1Level level)
+    protected override TRTexturePacker<TR1Type, TR1Level> CreatePacker(TR1Level level)
     {
         return new TR1TexturePacker(level);
     }

diff --git a/TRRandomizerCore/Textures/Landmarks/TR2LandmarkImporter.cs b/TRRandomizerCore/Textures/Landmarks/TR2LandmarkImporter.cs
@@ -8,7 +8,7 @@ public class TR2LandmarkImporter : AbstractLandmarkImporter<TR2Type, TR2Level>
 {
     protected override int MaxTextures => 2048;
 
-    protected override AbstractTexturePacker<TR2Type, TR2Level> CreatePacker(TR2Level level)
+    protected override TRTexturePacker<TR2Type, TR2Level> CreatePacker(TR2Level level)
     {
         return new TR2TexturePacker(level);
     }

diff --git a/TRRandomizerCore/Textures/Landmarks/TR3LandmarkImporter.cs b/TRRandomizerCore/Textures/Landmarks/TR3LandmarkImporter.cs
@@ -8,7 +8,7 @@ public class TR3LandmarkImporter : AbstractLandmarkImporter<TR3Type, TR3Level>
 {
     protected override int MaxTextures => 4096;
 
-    protected override AbstractTexturePacker<TR3Type, TR3Level> CreatePacker(TR3Level level)
+    protected override TRTexturePacker<TR3Type, TR3Level> CreatePacker(TR3Level level)
     {
         return new TR3TexturePacker(level);
     }