mirror/AssetStudio
1
0
Fork 0
mirror of https://github.com/aelurum/AssetStudio.git synced 2025-07-18 03:24:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

change math library

Browse Source 
fixed bug
This commit is contained in:
Perfare
2019-01-03 08:55:43 +08:00
parent 33461e068f
commit e6ed312de2
28 changed files with 2011 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
AssetStudio/Extensions/BinaryReaderExtensions.cs
View File

@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.IO;
using System.Text;
using SharpDX;
namespace AssetStudio
{
@ -78,22 +77,14 @@ namespace AssetStudio
return new System.Drawing.RectangleF(reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle());
}
public static Color4 ReadColor4(this BinaryReader reader)
public static Color ReadColor4(this BinaryReader reader)
{
return new Color4(reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle());
return new Color(reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle());
}
public static Matrix ReadMatrix(this BinaryReader reader)
public static Matrix4x4 ReadMatrix(this BinaryReader reader)
{
var m = new Matrix();
for (int i = 0; i < 4; i++)
{
for (int j = 0; j < 4; j++)
{
m[i, j] = reader.ReadSingle();
}
}
return m;
return new Matrix4x4(reader.ReadSingleArray(16));
}
private static T[] ReadArray<T>(Func<T> del, int length)
@ -161,7 +152,7 @@ namespace AssetStudio
return ReadArray(reader.ReadVector4, reader.ReadInt32());
}
public static Matrix[] ReadMatrixArray(this BinaryReader reader)
public static Matrix4x4[] ReadMatrixArray(this BinaryReader reader)
{
return ReadArray(reader.ReadMatrix, reader.ReadInt32());
}