Add sprite texture position mapping

On data import, object texture positions are mapped so texture monitoring can reference the positions, but sprite textures were missed in this logic. This meant that such sprites couldn't be targeted for texture randomization in levels such as Venice where they don't already exist.

Resolves LostArtefacts#844.

Author: lahm86

CHANGELOG.md

@@ -23,6 +23,7 @@
 - fixed uncontrolled SFX in TR2 and TR3 causing an error message during randomization (#827)
 - fixed cloned enemies in TR1X being left behind if a room is flooded and the original enemy is moved on land (#842)
 - fixed Lara potentially starting beyond initial enemy triggers in The Great Wall if the first area is flooded
+- fixed flame sprites in some TR2 levels not being targeted for texture randomization (#844)
 
 ## [V1.10.2](https://github.com/LostArtefacts/TR-Rando/compare/V1.10.1...V1.10.2) - 2024-12-06
 - added support for TR1X 4.6 (#796)

TRDataControl/Transport/TRDataImporter.cs

@@ -408,62 +408,90 @@ protected void ImportTextures(List<B> blobs)
             }
         }
 
-        Dictionary<T, List<PositionedTexture>> texturePositions = new();
-
+        var texturePositions = new Dictionary<T, List<PositionedTexture>>();
         foreach (B blob in blobs)
         {
             if (blob.IsDependencyOnly)
-                continue;
-
-            Dictionary<int, int> remap = new();
-            foreach (TRTextileRegion region in blob.Textures)
             {
-                foreach (int oldIndex in globalRemap[region.ID].Keys)
-                {
-                    remap[oldIndex] = globalRemap[region.ID][oldIndex];
-                }
+                continue;
             }
 
-            List<TRMesh> meshes = new();
-            if (blob.Model != null)
+            if (blob.Type == TRBlobType.Sprite)
             {
-                meshes.AddRange(blob.Model.Meshes);
+                MapSpriteTextures(blob, texturePositions);
             }
-            if (blob.StaticMesh != null)
+            else
             {
-                meshes.Add(blob.StaticMesh.Mesh);
+                MapObjectTextures(blob, globalRemap, texturePositions);
             }
+        }
 
-            IEnumerable<TRMeshFace> faces = meshes
-                .Where(m => m != null)
-                .SelectMany(m => m.TexturedFaces);
-            foreach (TRMeshFace face in faces)
-            {
-                face.Texture = (ushort)remap[face.Texture];
-            }
+        TextureMonitor?.OnTexturesPositioned(texturePositions);
+    }
 
-            faces = meshes
-                .Where(m => m != null)
-                .SelectMany(m => m.ColouredFaces);
-            foreach (TRMeshFace face in faces)
+    private static void MapSpriteTextures(B blob, Dictionary<T, List<PositionedTexture>> texturePositions)
+    {
+        texturePositions[blob.Alias] = [];
+        foreach (var segment in blob.Textures.SelectMany(t => t.Segments))
+        {
+            texturePositions[blob.Alias].Add(new()
             {
-                face.Texture = ImportColour(blob, face.Texture);
-            }
+                OriginalIndex = segment.Index,
+                TileIndex = segment.Atlas,
+                Position = segment.Position,
+            });
+        }
+    }
 
-            texturePositions[blob.Alias] = new();
-            foreach (var (oldIndex, newIndex) in remap)
+    private void MapObjectTextures(B blob,Dictionary<string, Dictionary<int, int>> globalRemap,
+        Dictionary<T, List<PositionedTexture>> texturePositions)
+    {
+        var remap = new Dictionary<int, int>();
+        foreach (var region in blob.Textures)
+        {
+            foreach (int oldIndex in globalRemap[region.ID].Keys)
             {
-                TRObjectTexture texture = Level.ObjectTextures[newIndex];
-                texturePositions[blob.Alias].Add(new()
-                {
-                    OriginalIndex = oldIndex,
-                    TileIndex = texture.Atlas,
-                    Position = texture.Position
-                });
+                remap[oldIndex] = globalRemap[region.ID][oldIndex];
             }
         }
 
-        TextureMonitor?.OnTexturesPositioned(texturePositions);
+        var meshes = new List<TRMesh>();
+        if (blob.Model != null)
+        {
+            meshes.AddRange(blob.Model.Meshes);
+        }
+        if (blob.StaticMesh != null)
+        {
+            meshes.Add(blob.StaticMesh.Mesh);
+        }
+
+        var faces = meshes
+            .Where(m => m != null)
+            .SelectMany(m => m.TexturedFaces);
+        foreach (var face in faces)
+        {
+            face.Texture = (ushort)remap[face.Texture];
+        }
+
+        faces = meshes
+            .Where(m => m != null)
+            .SelectMany(m => m.ColouredFaces);
+        foreach (var face in faces)
+        {
+            face.Texture = ImportColour(blob, face.Texture);
+        }
+
+        texturePositions[blob.Alias] = [];
+        foreach (var (oldIndex, newIndex) in remap)
+        {
+            var texture = Level.ObjectTextures[newIndex];
+            texturePositions[blob.Alias].Add(new()
+            {
+                OriginalIndex = oldIndex,
+                TileIndex = texture.Atlas,
+                Position = texture.Position,
+            });
+        }
     }
 
     protected void ImportData(List<B> blobs, TRMesh oldDummyMesh)