Mirrors/Switch-Toolbox
2
0
Fork 0
mirror of https://github.com/KillzXGaming/Switch-Toolbox synced 2024-11-24 21:43:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

BFRES : Fix long lasting bug where tangents load/create wrong from 1 skin count or less.

Browse source
This commit is contained in:
KillzXGaming 2023-10-26 20:20:58 -04:00
parent 3b24eb253b
commit d50379879f
3 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
File_Format_Library/FileFormats/BFRES/Bfres Structs/SubFiles/FMDL/FSHP.cs
View file

@ -290,6 +290,8 @@ namespace Bfres.Structs
{ {
vertices[v].pos = Vector3.TransformPosition(vertices[v].pos, SingleBind); vertices[v].pos = Vector3.TransformPosition(vertices[v].pos, SingleBind);
vertices[v].nrm = Vector3.TransformNormal(vertices[v].nrm, SingleBind); vertices[v].nrm = Vector3.TransformNormal(vertices[v].nrm, SingleBind);
vertices[v].tan.Xyz = Vector3.TransformNormal(vertices[v].tan.Xyz, SingleBind);
vertices[v].bitan.Xyz = Vector3.TransformNormal(vertices[v].bitan.Xyz, SingleBind);
} }
else if (VertexSkinCount == 1) else if (VertexSkinCount == 1)
{ {
@ -301,6 +303,8 @@ namespace Bfres.Structs
vertices[v].pos = Vector3.TransformPosition(vertices[v].pos, SingleBindLocal); vertices[v].pos = Vector3.TransformPosition(vertices[v].pos, SingleBindLocal);
vertices[v].nrm = Vector3.TransformNormal(vertices[v].nrm, SingleBindLocal); vertices[v].nrm = Vector3.TransformNormal(vertices[v].nrm, SingleBindLocal);
vertices[v].tan.Xyz = Vector3.TransformNormal(vertices[v].tan.Xyz, SingleBindLocal);
vertices[v].bitan.Xyz = Vector3.TransformNormal(vertices[v].bitan.Xyz, SingleBindLocal);
} }
} }
@ -2076,6 +2080,8 @@ namespace Bfres.Structs
vtx.pos = TransformLocal(vtx.pos, boneId, VertexSkinCount == 1); vtx.pos = TransformLocal(vtx.pos, boneId, VertexSkinCount == 1);
vtx.nrm = TransformLocal(vtx.nrm, boneId, VertexSkinCount == 1, false); vtx.nrm = TransformLocal(vtx.nrm, boneId, VertexSkinCount == 1, false);
vtx.tan.Xyz = TransformLocal(vtx.tan.Xyz, boneId, VertexSkinCount == 1, false);
vtx.bitan.Xyz = TransformLocal(vtx.bitan.Xyz, boneId, VertexSkinCount == 1, false);
} }
verts.Add(new Syroot.Maths.Vector4F(vtx.pos.X, vtx.pos.Y, vtx.pos.Z, 1.0f)); verts.Add(new Syroot.Maths.Vector4F(vtx.pos.X, vtx.pos.Y, vtx.pos.Z, 1.0f));

4
File_Format_Library/FileFormats/BFRES/BfresSwitch.cs
View file

@ -394,6 +394,8 @@ namespace FirstPlugin
Matrix4 sb = model.Skeleton.bones[boneIndex].Transform; Matrix4 sb = model.Skeleton.bones[boneIndex].Transform;
v.pos = Vector3.TransformPosition(v.pos, sb); v.pos = Vector3.TransformPosition(v.pos, sb);
v.nrm = Vector3.TransformNormal(v.nrm, sb); v.nrm = Vector3.TransformNormal(v.nrm, sb);
v.tan.Xyz = Vector3.TransformNormal(v.tan.Xyz, sb);
v.bitan.Xyz = Vector3.TransformNormal(v.bitan.Xyz, sb);
} }
} }
if (fshp.VertexSkinCount == 0) if (fshp.VertexSkinCount == 0)
@ -403,6 +405,8 @@ namespace FirstPlugin
Matrix4 NoBindFix = model.Skeleton.bones[boneIndex].Transform; Matrix4 NoBindFix = model.Skeleton.bones[boneIndex].Transform;
v.pos = Vector3.TransformPosition(v.pos, NoBindFix); v.pos = Vector3.TransformPosition(v.pos, NoBindFix);
v.nrm = Vector3.TransformNormal(v.nrm, NoBindFix); v.nrm = Vector3.TransformNormal(v.nrm, NoBindFix);
v.tan.Xyz = Vector3.TransformNormal(v.tan.Xyz, NoBindFix);
v.bitan.Xyz = Vector3.TransformNormal(v.bitan.Xyz, NoBindFix);
} }
fshp.vertices.Add(v); fshp.vertices.Add(v);
} }

5
File_Format_Library/FileFormats/BFRES/BfresWiiU.cs
View file

@ -307,7 +307,10 @@ namespace FirstPlugin
Matrix4 sb = model.Skeleton.bones[boneIndex].Transform; Matrix4 sb = model.Skeleton.bones[boneIndex].Transform;
v.pos = Vector3.TransformPosition(v.pos, sb); v.pos = Vector3.TransformPosition(v.pos, sb);
v.nrm = Vector3.TransformNormal(v.nrm, sb); v.nrm = Vector3.TransformNormal(v.nrm, sb);
v.tan.Xyz = Vector3.TransformNormal(v.tan.Xyz, sb);
v.bitan.Xyz = Vector3.TransformNormal(v.bitan.Xyz, sb);
} }
} }
if (fshp.VertexSkinCount == 0) if (fshp.VertexSkinCount == 0)
{ {
@ -319,6 +322,8 @@ namespace FirstPlugin
Matrix4 NoBindFix = model.Skeleton.bones[boneIndex].Transform; Matrix4 NoBindFix = model.Skeleton.bones[boneIndex].Transform;
v.pos = Vector3.TransformPosition(v.pos, NoBindFix); v.pos = Vector3.TransformPosition(v.pos, NoBindFix);
v.nrm = Vector3.TransformNormal(v.nrm, NoBindFix); v.nrm = Vector3.TransformNormal(v.nrm, NoBindFix);
v.tan.Xyz = Vector3.TransformNormal(v.tan.Xyz, NoBindFix);
v.bitan.Xyz = Vector3.TransformNormal(v.bitan.Xyz, NoBindFix);
} }
} }
catch //Matrix failed. Print the coordinate data of the bone catch //Matrix failed. Print the coordinate data of the bone