epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check HVA files validity at load time

Browse Source
This commit is contained in:
Pavel Penev
2015-10-19 19:33:23 +03:00
parent 06ba175fde
commit 84db36d3e8
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenRA.Game/FileFormats/HvaReader.cs
View File

@@ -9,7 +9,10 @@
#endregion #endregion
using System;
using System.IO; using System.IO;
using System.Linq;
using OpenRA.Graphics;
namespace OpenRA.FileFormats namespace OpenRA.FileFormats
{ {
@@ -19,7 +22,7 @@ namespace OpenRA.FileFormats
public readonly uint LimbCount; public readonly uint LimbCount;
public readonly float[] Transforms; public readonly float[] Transforms;
public HvaReader(Stream s) public HvaReader(Stream s, string fileName)
{ {
// Index swaps for transposing a matrix // Index swaps for transposing a matrix
var ids = new byte[] { 0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14 }; var ids = new byte[] { 0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14 };
@@ -31,6 +34,8 @@ namespace OpenRA.FileFormats
// Skip limb names // Skip limb names
s.Seek(16 * LimbCount, SeekOrigin.Current); s.Seek(16 * LimbCount, SeekOrigin.Current);
Transforms = new float[16 * FrameCount * LimbCount]; Transforms = new float[16 * FrameCount * LimbCount];
var testMatrix = new float[16];
for (var j = 0; j < FrameCount; j++) for (var j = 0; j < FrameCount; j++)
for (var i = 0; i < LimbCount; i++) for (var i = 0; i < LimbCount; i++)
{ {
@@ -43,13 +48,19 @@ namespace OpenRA.FileFormats
for (var k = 0; k < 12; k++) for (var k = 0; k < 12; k++)
Transforms[c + ids[k]] = s.ReadFloat(); Transforms[c + ids[k]] = s.ReadFloat();
Array.Copy(Transforms, 16 * (LimbCount * j + i), testMatrix, 0, 16);
if (Util.MatrixInverse(testMatrix) == null)
throw new InvalidDataException(
"The transformation matrix for HVA file `{0}` section {1} frame {2} is invalid because it is not invertible!"
.F(fileName, i, j));
} }
} }
public static HvaReader Load(string filename) public static HvaReader Load(string filename)
{ {
using (var s = File.OpenRead(filename)) using (var s = File.OpenRead(filename))
return new HvaReader(s); return new HvaReader(s, Path.GetFileName(filename));
} }
} }
} }

2
OpenRA.Game/Graphics/VoxelLoader.cs
View File

@@ -220,7 +220,7 @@ namespace OpenRA.Graphics
using (var s = GlobalFileSystem.Open(files.First + ".vxl")) using (var s = GlobalFileSystem.Open(files.First + ".vxl"))
vxl = new VxlReader(s); vxl = new VxlReader(s);
using (var s = GlobalFileSystem.Open(files.Second + ".hva")) using (var s = GlobalFileSystem.Open(files.Second + ".hva"))
hva = new HvaReader(s); hva = new HvaReader(s, files.Second + ".hva");
return new Voxel(this, vxl, hva); return new Voxel(this, vxl, hva);
} }