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

Merge pull request #134 from LockeExile/csv

Browse source 
Fix issues with bones that use both rigid and smooth skinning
This commit is contained in:
KillzXGaming 2019-10-11 16:12:04 -04:00 committed by GitHub
commit c70bd883ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 44 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -964,22 +964,6 @@ namespace Bfres.Structs
}
public void CreateBoneList(STGenericObject ob, FMDL mdl, bool ForceSkinCount, int ForcedSkinAmount = 4)
{
if (mdl.Skeleton.Node_Array == null)
mdl.Skeleton.Node_Array = new int[0];
string[] nodeArrStrings = new string[mdl.Skeleton.Node_Array.Length];
short[] nodeRigidIndex = new short[mdl.Skeleton.Node_Array.Length];
int CurNode = 0;
foreach (int thing in mdl.Skeleton.Node_Array)
{
nodeArrStrings[CurNode] = mdl.Skeleton.bones[thing].Text;
nodeRigidIndex[CurNode] = mdl.Skeleton.bones[thing].RigidMatrixIndex;
CurNode++;
}
List<string> BonesNotMatched = new List<string>();
if (ForceSkinCount && !ob.HasIndices && VertexSkinCount != 0)
{
var attributeIndex = new FSHP.VertexAttribute();
@ -1009,47 +993,66 @@ namespace Bfres.Structs
bool UseRigidSkinning = ob.VertexSkinCount == 1;
int vtxIndex = 0;
var bones = new Dictionary<string, STBone>();
foreach (var bone in mdl.Skeleton.bones)
{
if (bones.ContainsKey(bone.Text))
{
STConsole.WriteLine($"There are multiple bones named {bone.Text}. Using the first one.", System.Drawing.Color.Red);
}
else
{
bones.Add(bone.Text, bone);
}
}
List<string> BonesNotMatched = new List<string>();
foreach (Vertex v in ob.vertices)
{
List<int> RigidIds = new List<int>();
foreach (string bn in v.boneNames)
{
bool HasMatch = false;
//Generate a list of smooth indicies from the node array
int i = 0;
foreach (var defBn in nodeArrStrings.Select((Value, Index) => new { Value, Index }))
STBone bone;
bool hasMatch = bones.TryGetValue(bn, out bone);
if (hasMatch)
{
if (bn == defBn.Value)
if (!UseRigidSkinning && bone.SmoothMatrixIndex != -1)
{
HasMatch = true;
//Add these after smooth matrices
if (nodeRigidIndex[i] != -1)
if (v.boneIds.Count < ForcedSkinAmount)
{
if (UseRigidSkinning)
RigidIds.Add(nodeRigidIndex[i]);
else
RigidIds.Add(defBn.Index);
STConsole.WriteLine(bone.SmoothMatrixIndex + " mesh " + Text + " bone " + bn);
v.boneIds.Add(bone.SmoothMatrixIndex);
}
}
else if (bone.RigidMatrixIndex != -1)
{
RigidIds.Add(bone.RigidMatrixIndex);
}
else if (bone.SmoothMatrixIndex != -1)
{
STConsole.WriteLine(bone.SmoothMatrixIndex + " mesh " + Text + " bone " + bn);
v.boneIds.Add(bone.SmoothMatrixIndex);
}
else
{
if (v.boneIds.Count < 4)
// last-ditch effort if no rigid or smooth index
var index = Array.FindIndex(mdl.Skeleton.Node_Array, boneIndex => mdl.Skeleton.bones[boneIndex].Text == bn);
if (index != -1)
{
STConsole.WriteLine(defBn.Index + " mesh " + Text + " bone " + bn);
v.boneIds.Add(defBn.Index);
v.boneIds.Add(index);
}
else
{
BonesNotMatched.Add(bn);
STConsole.WriteLine($"Bone {bn} is not skinnable. Vertices will remain unmapped for this bone!", System.Drawing.Color.Red);
}
}
}
i++;
}
if (!HasMatch && !BonesNotMatched.Contains(bn))
else if (!BonesNotMatched.Contains(bn))
{
BonesNotMatched.Add(bn);
STConsole.WriteLine($"No bone matches {bn}. Vertices will remain unmapped for this bone!", System.Drawing.Color.Red);
}
} // else bone not matched but already generated warning for it
}
//Sort smooth bones
@ -1104,15 +1107,9 @@ namespace Bfres.Structs
}
}
}
vtxIndex++;
}
}
nodeArrStrings.Clone();
nodeRigidIndex.Clone();
BonesNotMatched.Clear();
}
public void CreateNewBoundingBoxes()
{
boundingBoxes.Clear();