fixed Mirage\Anim string reading

Ashrindy · Oct 24, 2024 · 84ce4df · 84ce4df
1 parent 60bc3d2
commit 84ce4df
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 19 deletions.
diff --git a/AshDumpLib/ExtendedBinaryReader.cs b/AshDumpLib/ExtendedBinaryReader.cs
@@ -45,10 +45,10 @@ public virtual void Jump(long offset, SeekOrigin origin)
         Seek(offset + genericOffset, origin);
     }
 
-    public virtual string ReadStringTableEntry(bool useGenOffset = false)
+    public virtual string ReadStringTableEntry(bool useGenOffset = false, bool dontCheckForZeroes = false)
     {
         long pointer = Read<int>();
-        if (pointer > 0)
+        if (pointer > 0 || dontCheckForZeroes)
         {
             if (useGenOffset)
                 pointer += genericOffset;

diff --git a/AshDumpLib/HedgehogEngine/Archives/PAC.cs b/AshDumpLib/HedgehogEngine/Archives/PAC.cs
@@ -944,7 +944,7 @@ void ReadV3(ExtendedBinaryReader reader)
             rootChunk.uncompressedData = uncompressedRootData.ToArray();
         }
         reader.Seek(prePos1, SeekOrigin.Begin);
-        File.WriteAllBytes(FilePath + "_og.root", rootChunk.uncompressedData);
+        //File.WriteAllBytes(FilePath + "_og.root", rootChunk.uncompressedData);
         PAC rootPac = new();
         rootPac.Open(FileName + ".root", rootChunk.uncompressedData, parseFiles);
         foreach (var x in rootPac.Files)
@@ -968,7 +968,7 @@ void ReadV3(ExtendedBinaryReader reader)
                 }
                 rootPac.dependencies[i].main.uncompressedData = uncompressedData.ToArray();
             }
-            File.WriteAllBytes(FilePath + "_og." + i, rootPac.dependencies[i].main.uncompressedData);
+            //File.WriteAllBytes(FilePath + "_og." + i, rootPac.dependencies[i].main.uncompressedData);
             PAC tempPac = new();
             tempPac.Open(rootPac.dependencies[i].name, rootPac.dependencies[i].main.uncompressedData, parseFiles);
             foreach (var x in tempPac.Files)
@@ -1025,7 +1025,7 @@ void WriteV3(ExtendedBinaryWriter writer)
             dep.chunks = ddChunks;
             deps.Add(dep);
             depPacs.Add(depPac);
-            File.WriteAllBytes($"{FilePath}.{index}", dmemStream.ToArray());
+            //File.WriteAllBytes($"{FilePath}.{index}", dmemStream.ToArray());
             index++;
         }
         PAC rootPac = new();
@@ -1190,7 +1190,7 @@ void WriteV3(ExtendedBinaryWriter writer)
 
         writer.Align(16);
 
-        File.WriteAllBytes(FilePath + ".root", rootChunk.uncompressedData);
+        //File.WriteAllBytes(FilePath + ".root", rootChunk.uncompressedData);
     }
 
     public struct PACVersion

diff --git a/AshDumpLib/HedgehogEngine/BINA/BINAReader.cs b/AshDumpLib/HedgehogEngine/BINA/BINAReader.cs
@@ -77,7 +77,7 @@ public void ReadHeader()
         this.Skip(RelativeDataOffset);
     }
 
-    public override string ReadStringTableEntry(bool useGenOffset = false)
+    public override string ReadStringTableEntry(bool useGenOffset = false, bool dontCheckForZeroes = false)
     {
         //Reads the string table pointer
         long pointer = Read<long>();

diff --git a/AshDumpLib/HedgehogEngine/Mirage/Anim/CameraAnimation.cs b/AshDumpLib/HedgehogEngine/Mirage/Anim/CameraAnimation.cs
@@ -122,7 +122,7 @@ public void Read(ExtendedBinaryReader reader, List<Keyframe> keyframes)
         var prePos = reader.Position;
         reader.Jump(pointer, SeekOrigin.Begin);
 
-        Name = reader.ReadStringTableEntry();
+        Name = reader.ReadStringTableEntry(dontCheckForZeroes: true);
         RotationOrAim = reader.Read<byte>() == 1;
         reader.Skip(3);
         FPS = reader.Read<float>();

diff --git a/AshDumpLib/HedgehogEngine/Mirage/Anim/MaterialAnimation.cs b/AshDumpLib/HedgehogEngine/Mirage/Anim/MaterialAnimation.cs
@@ -113,7 +113,7 @@ public void Read(ExtendedBinaryReader reader, List<Keyframe> keyframes)
         var pointer = reader.Read<uint>();
         var prePos = reader.Position;
         reader.Jump(pointer, SeekOrigin.Begin);
-        Name = reader.ReadStringTableEntry();
+        Name = reader.ReadStringTableEntry(dontCheckForZeroes: true);
         FPS = reader.Read<float>();
         FrameStart = reader.Read<float>();
         FrameEnd = reader.Read<float>();

diff --git a/AshDumpLib/HedgehogEngine/Mirage/Anim/UVAnimation.cs b/AshDumpLib/HedgehogEngine/Mirage/Anim/UVAnimation.cs
@@ -43,8 +43,8 @@ public override void Read(ExtendedBinaryReader reader)
         }
 
         reader.Jump(uvsPointer, SeekOrigin.Begin);
-        MaterialName = reader.ReadStringTableEntry();
-        TextureName = reader.ReadStringTableEntry();
+        MaterialName = reader.ReadStringTableEntry(dontCheckForZeroes: true);
+        TextureName = reader.ReadStringTableEntry(dontCheckForZeroes: true);
         var uvCount = reader.Read<int>();
         for (int i = 0; i < uvCount; i++)
         {
@@ -120,7 +120,7 @@ public void Read(ExtendedBinaryReader reader, List<Keyframe> keyframes)
         var pointer = reader.Read<uint>();
         var prePos = reader.Position;
         reader.Jump(pointer, SeekOrigin.Begin);
-        Name = reader.ReadStringTableEntry();
+        Name = reader.ReadStringTableEntry(dontCheckForZeroes: true);
         FPS = reader.Read<float>();
         FrameStart = reader.Read<float>();
         FrameEnd = reader.Read<float>();

diff --git a/AshDumpLib/HedgehogEngine/Mirage/Anim/VisibilityAnimation.cs b/AshDumpLib/HedgehogEngine/Mirage/Anim/VisibilityAnimation.cs
@@ -40,8 +40,8 @@ public override void Read(ExtendedBinaryReader reader)
         }
 
         reader.Jump(vissPointer, SeekOrigin.Begin);
-        SkeletonName = reader.ReadStringTableEntry();
-        InputName = reader.ReadStringTableEntry();
+        SkeletonName = reader.ReadStringTableEntry(dontCheckForZeroes: true);
+        InputName = reader.ReadStringTableEntry(dontCheckForZeroes: true);
         var visCount = reader.Read<int>();
         for (int i = 0; i < visCount; i++)
         {
@@ -117,7 +117,7 @@ public void Read(ExtendedBinaryReader reader, List<Keyframe> keyframes)
         var pointer = reader.Read<uint>();
         var prePos = reader.Position;
         reader.Jump(pointer, SeekOrigin.Begin);
-        Name = reader.ReadStringTableEntry();
+        Name = reader.ReadStringTableEntry(dontCheckForZeroes: true);
         FPS = reader.Read<float>();
         FrameStart = reader.Read<float>();
         FrameEnd = reader.Read<float>();

diff --git a/AshDumpLibTest/Program.cs b/AshDumpLibTest/Program.cs
@@ -53,10 +53,22 @@
 //NeedleShader needleShader = new(filepath);
 //Animator asm = new(filepath);
 //asm.SaveToFile(filepath + "1");
-PAC pAC = new();
-pAC.parseFiles = false;
-pAC.Open(filepath);
-pAC.SaveToFile(filepath+".pac");
+foreach(var i in Directory.GetFiles(filepath))
+{
+    PAC pAC = new();
+    pAC.parseFiles = false;
+    pAC.Open(i);
+    if(pAC.Files.Where(x => x.Extension == "cam-anim").Count() > 0)
+        foreach(var l in pAC.Files.Where(x => x.Extension == "cam-anim"))
+        {
+            CameraAnimation camanim = new();
+            camanim.Open(l.FileName, l.Data);
+            foreach(var m in camanim.Cameras)
+                if(m.AspectRatio > 1.79 || m.AspectRatio < 1.76)
+                    Console.WriteLine($"{i}\\{l.FileName}: {m.Name} - bad aspect ratio");
+        }
+}
+
 //pAC.parseFiles = false;
 //pAC.SaveToFile(filepath + "test.pac");
 //PointCloud pcmodel = new(filepath);