ZeroDream/CodeWalker
2
0
Fork 0
mirror of https://mirror.ghproxy.com/https://github.com/dexyfex/CodeWalker synced 2024-07-07 18:31:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added InvertTexcoordV option to FbxConverter class

Browse Source
This commit is contained in:
dexy 2019-03-21 14:02:59 +11:00
parent d1cdc5a3d9
commit 8324e1ecda
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
CodeWalker.Core/Utils/FbxConverter.cs
View File

@ -12,7 +12,7 @@ namespace CodeWalker
{ {
public class FbxConverter public class FbxConverter
{ {
public bool InvertTexcoordV { get; set; } = true;
public YdrFile ConvertToYdr(string name, byte[] fbxdata) public YdrFile ConvertToYdr(string name, byte[] fbxdata)
@ -26,10 +26,7 @@ namespace CodeWalker
YdrFile ydr = new YdrFile(); YdrFile ydr = new YdrFile();
ydr.Drawable = dwbl; ydr.Drawable = dwbl;
ydr.Name = name;
//byte[] ddata = ydr.Save();
//File.WriteAllBytes("C:\\Dump\\TestFbx\\" + name + ".ydr", ddata);
return ydr; return ydr;
} }
@ -402,7 +399,8 @@ namespace CodeWalker
foreach (var fVert in fPoly.Vertices) foreach (var fVert in fPoly.Vertices)
{ {
var ai = indexed ? aiTexcs[j] : j; var ai = indexed ? aiTexcs[j] : j;
fVert.Texcoords[i] = GetVector2FromDoubleArray(arTexcs, ai); var tc = GetVector2FromDoubleArray(arTexcs, ai);
fVert.Texcoords[i] = InvertTexcoordV ? new Vector2(tc.X, -tc.Y) : tc;//whyyyy
j++; j++;
} }
} }
@ -532,7 +530,7 @@ namespace CodeWalker
var dShader = TryConvertMaterial(matNode); var dShader = TryConvertMaterial(matNode);
var dVertDecl = GetVertexDeclaration(dShader); var dVertDecl = GetVertexDeclaration(dShader);
var vDict = new Dictionary<FbxVertex, ushort>();//TODO:use final vertex data instead of FbxVertex!!! var vDict = new Dictionary<FbxVertex, ushort>();
var vList = new List<FbxVertex>(); var vList = new List<FbxVertex>();
var iList = new List<ushort>(); var iList = new List<ushort>();
@ -986,23 +984,11 @@ namespace CodeWalker
{ {
return (other != null) return (other != null)
&& ((Bytes == null) ? (other.Bytes == null) : Bytes.SequenceEqual(other.Bytes)); && ((Bytes == null) ? (other.Bytes == null) : Bytes.SequenceEqual(other.Bytes));
//&& Position.Equals(other.Position)
//&& ((Normals == null) ? (other.Normals == null) : Normals.SequenceEqual(other.Normals))
//&& ((Binormals == null) ? (other.Binormals == null) : Binormals.SequenceEqual(other.Binormals))
//&& ((Tangents == null) ? (other.Tangents == null) : Tangents.SequenceEqual(other.Tangents))
//&& ((Texcoords == null) ? (other.Texcoords == null) : Texcoords.SequenceEqual(other.Texcoords))
//&& ((Colours == null) ? (other.Colours == null) : Colours.SequenceEqual(other.Colours));
} }
public override int GetHashCode() public override int GetHashCode()
{ {
var hashCode = -907793594; var hashCode = -907793594;
if (Bytes != null) hashCode = hashCode * -1521134295 + ((IStructuralEquatable)Bytes).GetHashCode(EqualityComparer<byte>.Default); if (Bytes != null) hashCode = hashCode * -1521134295 + ((IStructuralEquatable)Bytes).GetHashCode(EqualityComparer<byte>.Default);
//hashCode = hashCode * -1521134295 + Position.GetHashCode();
//if (Normals != null) hashCode = hashCode * -1521134295 + ((IStructuralEquatable)Normals).GetHashCode(EqualityComparer<Vector3>.Default);
//if (Binormals != null) hashCode = hashCode * -1521134295 + ((IStructuralEquatable)Binormals).GetHashCode(EqualityComparer<Vector3>.Default);
//if (Tangents != null) hashCode = hashCode * -1521134295 + ((IStructuralEquatable)Tangents).GetHashCode(EqualityComparer<Vector3>.Default);
//if (Texcoords != null) hashCode = hashCode * -1521134295 + ((IStructuralEquatable)Texcoords).GetHashCode(EqualityComparer<Vector2>.Default);
//if (Colours != null) hashCode = hashCode * -1521134295 + ((IStructuralEquatable)Colours).GetHashCode(EqualityComparer<Vector4>.Default);
return hashCode; return hashCode;
} }
} }