Cool_Tools/Switch-Toolbox
1
0
Fork 0
mirror of synced 2024-11-27 17:00:50 +01:00
Code Releases Wiki Activity

Fix GFBMDL rigging issues with weights

Browse Source
This commit is contained in:
KillzXGaming 2019-12-15 10:56:08 -05:00
parent 8097845a1b
commit f9127ebc04
3 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
File_Format_Library/FileFormats/Pokemon/GFLX/GFBMDL/GFBMDL.cs
View File

@ -384,7 +384,7 @@ namespace FirstPlugin
{
//Reset bone as rigid
var node = (GFLXBone)Model.Skeleton.bones[i];
node.Bone.RigidCheck = new BoneRigidData() { Unknown1 = 0 };
/* node.Bone.RigidCheck = new BoneRigidData() { Unknown1 = 0 };
if (node.Bone.BoneType == 1)
node.Bone.BoneType = 0;
@ -396,7 +396,7 @@ namespace FirstPlugin
node.Bone.BoneType = 1;
node.Bone.RigidCheck = null;
}
}
}*/
if (Model.GenericMeshes.Any(x => x.Text == node.Text))
{
@ -464,20 +464,19 @@ namespace FirstPlugin
if (importer.Settings.OptmizeZeroWeights)
{
float MaxWeight = 1;
float[] weightsA = new float[4];
int MaxWeight = 255;
for (int j = 0; j < 4; j++)
{
if (mesh.vertices[i].boneWeights.Count <= j)
continue;
if (mesh.vertices[i].boneIds.Count < j + 1)
if (mesh.vertices[i].boneWeights.Count < j + 1)
{
mesh.vertices[i].boneWeights[j] = 0;
weightsA[j] = 0;
MaxWeight = 0;
}
else
{
float weight = mesh.vertices[i].boneWeights[j];
int weight = (int)(mesh.vertices[i].boneWeights[j] * 255);
if (mesh.vertices[i].boneWeights.Count == j + 1)
weight = MaxWeight;
@ -489,9 +488,11 @@ namespace FirstPlugin
else
MaxWeight -= weight;
mesh.vertices[i].boneWeights[j] = weight;
weightsA[j] = weight / 255f;
}
}
mesh.vertices[i].boneWeights = weightsA.ToList();
}
for (int j = 0; j < mesh.vertices[i].boneNames?.Count; j++)
@ -528,7 +529,7 @@ namespace FirstPlugin
bone.Translation = new GFMDLStructs.Vector3(0,0,0);
bone.RadiusStart = new GFMDLStructs.Vector3(0, 0, 0);
bone.RadiusEnd = new GFMDLStructs.Vector3(0, 0, 0);
bone.RigidCheck = new BoneRigidData();
// bone.RigidCheck = new BoneRigidData();
Model.Model.Bones.Add(bone);
int NodeIndex = Model.Model.Bones.IndexOf(bone);

12
File_Format_Library/FileFormats/Pokemon/GFLX/GFBMDL/GFLXMeshBufferHelper.cs
View File

@ -236,24 +236,20 @@ namespace FirstPlugin
var pos = ParseBuffer(reader, attribute.BufferFormat, attribute.VertexType, attribute.ElementCount);
vertex.pos = new OpenTK.Vector3(pos.X, pos.Y, pos.Z);
vertex.pos = OpenTK.Vector3.TransformPosition(vertex.pos, transform);
Console.WriteLine($"pos {pos}");
break;
case VertexType.Normal:
var normal = ParseBuffer(reader, attribute.BufferFormat, attribute.VertexType, attribute.ElementCount);
vertex.nrm = new OpenTK.Vector3(normal.X, normal.Y, normal.Z);
vertex.normalW = normal.W;
vertex.nrm = OpenTK.Vector3.TransformNormal(vertex.nrm, transform);
Console.WriteLine($"nrm {normal}");
break;
case VertexType.UV1:
var texcoord1 = ParseBuffer(reader, attribute.BufferFormat, attribute.VertexType, attribute.ElementCount);
vertex.uv0 = new OpenTK.Vector2(texcoord1.X, texcoord1.Y);
Console.WriteLine($"uv0 {texcoord1}");
break;
case VertexType.UV2:
var texcoord2 = ParseBuffer(reader, attribute.BufferFormat, attribute.VertexType, attribute.ElementCount);
vertex.uv1 = new OpenTK.Vector2(texcoord2.X, texcoord2.Y);
Console.WriteLine($"uv1 {texcoord2}");
break;
case VertexType.UV3:
var texcoord3 = ParseBuffer(reader, attribute.BufferFormat, attribute.VertexType, attribute.ElementCount);
@ -289,8 +285,6 @@ namespace FirstPlugin
colors1 = ParseBuffer(reader, attribute.BufferFormat, attribute.VertexType, attribute.ElementCount);
vertex.col = colors1 / 255f;
Console.WriteLine($"colors1 {colors1}");
break;
case VertexType.Color2:
OpenTK.Vector4 colors2 = new OpenTK.Vector4(1, 1, 1, 1);
@ -298,20 +292,14 @@ namespace FirstPlugin
colors2 = ParseBuffer(reader, attribute.BufferFormat, attribute.VertexType, attribute.ElementCount);
vertex.col2 = colors2 / 255f;
Console.WriteLine($"colors2 {colors2}");
break;
case VertexType.Bitangent:
var bitans = ParseBuffer(reader, attribute.BufferFormat, attribute.VertexType, attribute.ElementCount);
vertex.bitan = new OpenTK.Vector4(bitans.X, bitans.Y, bitans.Z, bitans.W);
Console.WriteLine($"bitans {bitans}");
break;
case VertexType.Tangents:
var tans = ParseBuffer(reader, attribute.BufferFormat, attribute.VertexType, attribute.ElementCount);
vertex.tan = new OpenTK.Vector4(tans.X, tans.Y, tans.Z, tans.W);
Console.WriteLine($"tans {tans}");
break;
default:
var values = ParseBuffer(reader, attribute.BufferFormat, attribute.VertexType, attribute.ElementCount);

2
File_Format_Library/FileFormats/Pokemon/GFLX/GFBMDL/GfbmdlImportSettings.cs
View File

@ -9,7 +9,7 @@ namespace FirstPlugin
{
public class GfbmdlImportSettings
{
public bool OptmizeZeroWeights { get; set; } = false;
public bool OptmizeZeroWeights { get; set; } = true;
public List<MeshSetting> MeshSettings = new List<MeshSetting>();