Refactor mesh, texture and SFX collections (LostArtefacts#618)

Part of LostArtefacts#468.
lahm86 · Apr 16, 2024 · 216a218 · 216a218
1 parent 4e109d6
commit 216a218
Show file tree

Hide file tree

Showing 84 changed files with 725 additions and 1,629 deletions.
diff --git a/Deps/TRGE.Coord.dll b/Deps/TRGE.Coord.dll
diff --git a/SFXExport/Program.cs b/SFXExport/Program.cs
@@ -79,19 +79,19 @@ private static void ExtractFromSFX(string file, TRGameVersion version, bool rema
     private static void ExtractFromPHD(string file, TRGameVersion version)
     {
         TR1Level level = new TR1LevelControl().Read(file);
-        for (int i = 0; i < level.NumSampleIndices; i++)
+        for (int i = 0; i < level.SampleIndices.Count; i++)
         {
             uint sampleStart = level.SampleIndices[i];
-            uint sampleEnd = i < level.NumSampleIndices - 1 ? level.SampleIndices[i + 1] : (uint)level.Samples.Length;
-            if (sampleEnd > level.Samples.Length)
+            uint sampleEnd = i < level.SampleIndices.Count - 1 ? level.SampleIndices[i + 1] : (uint)level.Samples.Count;
+            if (sampleEnd > level.Samples.Count)
             {
-                sampleEnd = (uint)level.Samples.Length;
+                sampleEnd = (uint)level.Samples.Count;
             }
 
             using BinaryWriter writer = new(File.Create(Path.Combine(version.ToString(), i + ".wav")));
             for (uint j = sampleStart; j < sampleEnd; j++)
             {
-                writer.Write(level.Samples[j]);
+                writer.Write(level.Samples[(int)j]);
             }
         }
     }

diff --git a/TREnvironmentEditor/Model/Types/Mirroring/EMMirrorFunction.cs b/TREnvironmentEditor/Model/Types/Mirroring/EMMirrorFunction.cs
@@ -1080,7 +1080,7 @@ private static void MirrorTextures(TR1Level level)
         // Include all animated texture references too
         foreach (TRAnimatedTexture anim in level.AnimatedTextures)
         {
-            for (int i = 0; i < anim.Textures.Length; i++)
+            for (int i = 0; i < anim.Textures.Count; i++)
             {
                 textureReferences.Add(anim.Textures[i]);
             }
@@ -1161,7 +1161,7 @@ private static void MirrorTextures(TR2Level level)
         // Include all animated texture references too
         foreach (TRAnimatedTexture anim in level.AnimatedTextures)
         {
-            for (int i = 0; i < anim.Textures.Length; i++)
+            for (int i = 0; i < anim.Textures.Count; i++)
             {
                 textureReferences.Add(anim.Textures[i]);
             }
@@ -1232,7 +1232,7 @@ private static void MirrorTextures(TR3Level level)
 
         foreach (TRAnimatedTexture anim in level.AnimatedTextures)
         {
-            for (int i = 0; i < anim.Textures.Length; i++)
+            for (int i = 0; i < anim.Textures.Count; i++)
             {
                 textureReferences.Add(anim.Textures[i]);
             }
@@ -1241,7 +1241,7 @@ private static void MirrorTextures(TR3Level level)
         MirrorObjectTextures(textureReferences, level.ObjectTextures);
     }
 
-    private static void MirrorObjectTextures(ISet<ushort> textureReferences, TRObjectTexture[] objectTextures)
+    private static void MirrorObjectTextures(ISet<ushort> textureReferences, List<TRObjectTexture> objectTextures)
     {
         // Flip the object texture vertices in the same way as done for faces
         foreach (ushort textureRef in textureReferences)
@@ -1263,11 +1263,11 @@ private static void MirrorObjectTextures(ISet<ushort> textureReferences, TRObjec
         }
     }
 
-    private static void MirrorDependentFaces(IEnumerable<TRModel> models, ISet<ushort> textureReferences, Func<uint, TRMesh[]> meshAction)
+    private static void MirrorDependentFaces(IEnumerable<TRModel> models, ISet<ushort> textureReferences, Func<uint, List<TRMesh>> meshAction)
     {
         foreach (TRModel model in models)
         {
-            TRMesh[] meshes = meshAction.Invoke(model.ID);
+            List<TRMesh> meshes = meshAction.Invoke(model.ID);
             if (meshes == null)
             {
                 continue;

diff --git a/TREnvironmentEditor/Model/Types/Mirroring/EMMirrorModelFunction.cs b/TREnvironmentEditor/Model/Types/Mirroring/EMMirrorModelFunction.cs
@@ -13,8 +13,8 @@ public override void ApplyToLevel(TR1Level level)
         List<TRMesh> meshes = new();
         foreach (uint modelID in ModelIDs)
         {
-            TRMesh[] modelMeshes = TRMeshUtilities.GetModelMeshes(level, (TR1Type)modelID);
-            if (modelMeshes == null || modelMeshes.Length > 1)
+            List<TRMesh> modelMeshes = TRMeshUtilities.GetModelMeshes(level, (TR1Type)modelID);
+            if (modelMeshes == null || modelMeshes.Count > 1)
             {
                 throw new NotSupportedException("Only models with single meshes can be mirrored.");
             }
@@ -30,8 +30,8 @@ public override void ApplyToLevel(TR2Level level)
         List<TRMesh> meshes = new();
         foreach (uint modelID in ModelIDs)
         {
-            TRMesh[] modelMeshes = TRMeshUtilities.GetModelMeshes(level, (TR2Type)modelID);
-            if (modelMeshes == null || modelMeshes.Length > 1)
+            List<TRMesh> modelMeshes = TRMeshUtilities.GetModelMeshes(level, (TR2Type)modelID);
+            if (modelMeshes == null || modelMeshes.Count > 1)
             {
                 throw new NotSupportedException("Only models with single meshes can be mirrored.");
             }
@@ -47,8 +47,8 @@ public override void ApplyToLevel(TR3Level level)
         List<TRMesh> meshes = new();
         foreach (uint modelID in ModelIDs)
         {
-            TRMesh[] modelMeshes = TRMeshUtilities.GetModelMeshes(level, (TR3Type)modelID);
-            if (modelMeshes == null || modelMeshes.Length > 1)
+            List<TRMesh> modelMeshes = TRMeshUtilities.GetModelMeshes(level, (TR3Type)modelID);
+            if (modelMeshes == null || modelMeshes.Count> 1)
             {
                 throw new NotSupportedException("Only models with single meshes can be mirrored.");
             }
@@ -106,7 +106,7 @@ private static ISet<ushort> MirrorMeshes(List<TRMesh> meshes)
         return textureReferences;
     }
 
-    private static void MirrorObjectTextures(ISet<ushort> textureReferences, TRObjectTexture[] objectTextures)
+    private static void MirrorObjectTextures(ISet<ushort> textureReferences, List<TRObjectTexture> objectTextures)
     {
         foreach (ushort textureRef in textureReferences)
         {

diff --git a/TREnvironmentEditor/Model/Types/Mirroring/EMMirrorObjectTexture.cs b/TREnvironmentEditor/Model/Types/Mirroring/EMMirrorObjectTexture.cs
@@ -22,7 +22,7 @@ public override void ApplyToLevel(TR3Level level)
         MirrorObjectTextures(level.ObjectTextures);
     }
 
-    private void MirrorObjectTextures(TRObjectTexture[] levelTextures)
+    private void MirrorObjectTextures(List<TRObjectTexture> levelTextures)
     {
         foreach (ushort textureRef in Textures)
         {

diff --git a/TREnvironmentEditor/Model/Types/Models/EMConvertSpriteSequenceFunction.cs b/TREnvironmentEditor/Model/Types/Models/EMConvertSpriteSequenceFunction.cs
@@ -25,11 +25,11 @@ public override void ApplyToLevel(TR3Level level)
         UpdateSpriteEntities(level.Entities);
     }
 
-    private void ConvertSpriteSequence(TRSpriteSequence[] sequences)
+    private void ConvertSpriteSequence(List<TRSpriteSequence> sequences)
     {
-        if (Array.Find(sequences, s => s.SpriteID == NewSpriteID) == null)
+        if (sequences.Find(s => s.SpriteID == NewSpriteID) == null)
         {
-            TRSpriteSequence oldSequence = Array.Find(sequences, s => s.SpriteID == OldSpriteID);
+            TRSpriteSequence oldSequence = sequences.Find(s => s.SpriteID == OldSpriteID);
             if (oldSequence != null)
             {
                 oldSequence.SpriteID = NewSpriteID;

diff --git a/TREnvironmentEditor/Model/Types/Models/EMCopySpriteSequenceFunction.cs b/TREnvironmentEditor/Model/Types/Models/EMCopySpriteSequenceFunction.cs
@@ -9,26 +9,17 @@ public class EMCopySpriteSequenceFunction : BaseEMFunction
 
     public override void ApplyToLevel(TR1Level level)
     {
-        List<TRSpriteSequence> sequences = level.SpriteSequences.ToList();
-        CopySpriteSequence(sequences);
-        level.SpriteSequences = sequences.ToArray();
-        level.NumSpriteSequences = (uint)sequences.Count;
+        CopySpriteSequence(level.SpriteSequences);
     }
 
     public override void ApplyToLevel(TR2Level level)
     {
-        List<TRSpriteSequence> sequences = level.SpriteSequences.ToList();
-        CopySpriteSequence(sequences);
-        level.SpriteSequences = sequences.ToArray();
-        level.NumSpriteSequences = (uint)sequences.Count;
+        CopySpriteSequence(level.SpriteSequences);
     }
 
     public override void ApplyToLevel(TR3Level level)
     {
-        List<TRSpriteSequence> sequences = level.SpriteSequences.ToList();
-        CopySpriteSequence(sequences);
-        level.SpriteSequences = sequences.ToArray();
-        level.NumSpriteSequences = (uint)sequences.Count;
+        CopySpriteSequence(level.SpriteSequences);
     }
 
     private void CopySpriteSequence(List<TRSpriteSequence> sequences)

diff --git a/TREnvironmentEditor/Model/Types/Models/EMImportNonGraphicsModelFunction.cs b/TREnvironmentEditor/Model/Types/Models/EMImportNonGraphicsModelFunction.cs
@@ -27,7 +27,7 @@ public override void ApplyToLevel(TR1Level level)
         };
         importer.Import();
 
-        RemapFaces(data, level.NumObjectTextures - 1, modelID => TRMeshUtilities.GetModelMeshes(level, (TR1Type)modelID));
+        RemapFaces(data, level.ObjectTextures.Count - 1, modelID => TRMeshUtilities.GetModelMeshes(level, (TR1Type)modelID));
     }
 
     public override void ApplyToLevel(TR2Level level)
@@ -48,7 +48,7 @@ public override void ApplyToLevel(TR2Level level)
         };
         importer.Import();
 
-        RemapFaces(data, level.NumObjectTextures - 1, modelID => TRMeshUtilities.GetModelMeshes(level, (TR2Type)modelID));
+        RemapFaces(data, level.ObjectTextures.Count - 1, modelID => TRMeshUtilities.GetModelMeshes(level, (TR2Type)modelID));
     }
 
     public override void ApplyToLevel(TR3Level level)
@@ -69,7 +69,7 @@ public override void ApplyToLevel(TR3Level level)
         };
         importer.Import();
 
-        RemapFaces(data, level.NumObjectTextures - 1, modelID => TRMeshUtilities.GetModelMeshes(level, (TR3Type)modelID));
+        RemapFaces(data, level.ObjectTextures.Count - 1, modelID => TRMeshUtilities.GetModelMeshes(level, (TR3Type)modelID));
     }
 
     private List<EMMeshTextureData> PrepareImportData(List<TRModel> existingModels)
@@ -85,11 +85,11 @@ private List<EMMeshTextureData> PrepareImportData(List<TRModel> existingModels)
         return importData;
     }
 
-    private static void RemapFaces(List<EMMeshTextureData> data, uint maximumTexture, Func<short, TRMesh[]> meshAction)
+    private static void RemapFaces(List<EMMeshTextureData> data, int maximumTexture, Func<short, List<TRMesh>> meshAction)
     {
         foreach (EMMeshTextureData textureData in data)
         {
-            TRMesh[] meshes = meshAction.Invoke(textureData.ModelID);
+            List<TRMesh> meshes = meshAction.Invoke(textureData.ModelID);
             foreach (TRMesh mesh in meshes)
             {
                 foreach (TRFace3 face in mesh.ColouredTriangles)
@@ -112,7 +112,7 @@ private static void RemapFaces(List<EMMeshTextureData> data, uint maximumTexture
         }
     }
 
-    private static ushort SelectReplacementTexture(EMMeshTextureData data, ushort currentTexture, int defaultTexture, uint maximumTexture)
+    private static ushort SelectReplacementTexture(EMMeshTextureData data, ushort currentTexture, int defaultTexture, int maximumTexture)
     {
         if (data.TextureMap != null && data.TextureMap.ContainsKey(currentTexture))
         {

diff --git a/TREnvironmentEditor/Model/Types/Textures/EMCreateTextureFunction.cs b/TREnvironmentEditor/Model/Types/Textures/EMCreateTextureFunction.cs
@@ -16,10 +16,7 @@ public override void ApplyToLevel(TR1Level level)
         TR1TexturePacker packer = new(level);
         List<TRObjectTexture> textures = new(level.ObjectTextures);
 
-        List<EMTextureMap> mapping = BuildAndPackTextures(packer, textures);
-        level.ObjectTextures = textures.ToArray();
-        level.NumObjectTextures = (uint)textures.Count;
-
+        List<EMTextureMap> mapping = BuildAndPackTextures(packer, level.ObjectTextures);
         mapping.ForEach(m => new EMRefaceFunction
         {
             TextureMap = m
@@ -31,10 +28,7 @@ public override void ApplyToLevel(TR2Level level)
         TR2TexturePacker packer = new(level);
         List<TRObjectTexture> textures = new(level.ObjectTextures);
 
-        List<EMTextureMap> mapping = BuildAndPackTextures(packer, textures);
-        level.ObjectTextures = textures.ToArray();
-        level.NumObjectTextures = (uint)textures.Count;
-
+        List<EMTextureMap> mapping = BuildAndPackTextures(packer, level.ObjectTextures);
         mapping.ForEach(m => new EMRefaceFunction
         {
             TextureMap = m
@@ -46,10 +40,7 @@ public override void ApplyToLevel(TR3Level level)
         TR3TexturePacker packer = new(level);
         List<TRObjectTexture> textures = new(level.ObjectTextures);
 
-        List<EMTextureMap> mapping = BuildAndPackTextures(packer, textures);
-        level.ObjectTextures = textures.ToArray();
-        level.NumObjectTextures = (uint)textures.Count;
-
+        List<EMTextureMap> mapping = BuildAndPackTextures(packer, level.ObjectTextures);
         mapping.ForEach(m => new EMRefaceFunction
         {
             TextureMap = m