Fix TR4R tests

Adjusts TR4 object texture reading to observe UV values as some in TR4R patch 1 onwards differ from auto-generated values on output compared with original versions.

Author: lahm86

TRLevelControl/Build/TRTextureBuilder.cs

@@ -147,13 +147,11 @@ private TRObjectTexture Read(TRLevelReader reader, int index, bool remastered)
 
         if (_version >= TRGameVersion.TR4)
         {
-            uint originalU = reader.ReadUInt32();
-            uint originalV = reader.ReadUInt32();
-            _observer?.OnOrignalUVRead(index, new(originalU, originalV));
-
-            // Width-1 and Height-1
-            reader.ReadUInt32();
-            reader.ReadUInt32();
+            // These values are U,V,W-1 and H-1 but are seemingly discarded in-game as altering has no effect.
+            // Width and height generally match actual tex size in all but a couple of cases in TR4R.
+            // Just observe for tests.
+            var uv = reader.ReadUInt32s(4);
+            _observer?.OnOriginalUVRead(index, uv);
 
             if (_version == TRGameVersion.TR5 && !remastered)
             {
@@ -206,16 +204,16 @@ private void Write(TRLevelWriter writer, TRObjectTexture texture, int index, boo
 
         if (_version >= TRGameVersion.TR4)
         {
-            // Discarded in game, so only written back as OG for tests.
-            Tuple<uint, uint> originalUV = _observer?.GetOrignalUV(index) ?? new(0, 0);
-            writer.Write(originalUV.Item1);
-            writer.Write(originalUV.Item2);
-
             Size size = texture.Size;
+            var uv = _observer?.GetOriginalUV(index)
+                ?? [0, 0, (uint)size.Width - 1, (uint)size.Height - 1];
+            writer.Write(uv[0]);
+            writer.Write(uv[1]);
+            
             if (_version == TRGameVersion.TR4 || remastered)
             {
-                writer.Write((uint)(size.Width - 1));
-                writer.Write((uint)(size.Height - 1));
+                writer.Write(uv[2]);
+                writer.Write(uv[3]);
             }
             else
             {

TRLevelControl/ITRLevelObserver.cs

@@ -30,8 +30,8 @@ public interface ITRLevelObserver
     List<short> GetFramePadding(int animIndex, int frameIndex);
     void OnBadOverlapRead(ushort value);
     ushort? GetBadOverlap();
-    void OnOrignalUVRead(int index, Tuple<uint, uint> uv);
-    Tuple<uint, uint> GetOrignalUV(int index);
+    void OnOriginalUVRead(int index, uint[] uv);
+    uint[] GetOriginalUV(int index);
     void OnFlybyIndexRead(byte flybySequence, byte cameraIndex);
     List<byte> GetFlybyIndices(byte flybySequence);
     void OnSampleIndicesRead(uint[] sampleIndices);

TRLevelControlTests/Base/Observers/ObserverBase.cs

@@ -85,10 +85,10 @@ public virtual void OnBadOverlapRead(ushort value)
     public virtual ushort? GetBadOverlap()
         => null;
 
-    public virtual void OnOrignalUVRead(int index, Tuple<uint, uint> uv)
+    public virtual void OnOriginalUVRead(int index, uint[] uv)
     { }
 
-    public virtual Tuple<uint, uint> GetOrignalUV(int index)
+    public virtual uint[] GetOriginalUV(int index)
         => null;
 
     public virtual void OnSampleIndicesRead(uint[] sampleIndices)

TRLevelControlTests/Base/Observers/TR4Observer.cs

@@ -11,7 +11,7 @@ public class TR4Observer : TR3Observer
     private readonly Dictionary<uint, List<byte>> _meshPadding = new();
     private readonly Dictionary<int, ushort> _badAnimCmdCounts = new();
     private readonly Dictionary<int, byte> _emptyAnimFrameSizes = new();
-    private readonly Dictionary<int, Tuple<uint, uint>> _originalUV = new();
+    private readonly Dictionary<int, uint[]> _originalUV = new();
     private readonly Dictionary<byte, List<byte>> _flybyIndices = new();
 
     private uint[] _sampleIndices;
@@ -127,12 +127,12 @@ public override List<byte> GetFlybyIndices(byte flybySequence)
         return _flybyIndices.ContainsKey(flybySequence) ? _flybyIndices[flybySequence] : null;
     }
 
-    public override void OnOrignalUVRead(int index, Tuple<uint, uint> uv)
+    public override void OnOriginalUVRead(int index, uint[] uv)
     {
         _originalUV[index] = uv;
     }
 
-    public override Tuple<uint, uint> GetOrignalUV(int index)
+    public override uint[] GetOriginalUV(int index)
     {
         return _originalUV.ContainsKey(index) ? _originalUV[index] : null;
     }