mirror of
https://mirror.ghproxy.com/https://github.com/dexyfex/CodeWalker
synced 2024-11-29 18:32:55 +08:00
Fix for incorrect ordering of ChildIndices in skeletons after XML import
This commit is contained in:
parent
bee7eb22f7
commit
fc0d84d9dd
@ -1136,18 +1136,65 @@ namespace CodeWalker.GameFiles
|
||||
var childs = new List<short>();
|
||||
if (Bones?.Items != null)
|
||||
{
|
||||
Bone lastbone = null;
|
||||
for (int i = 0; i < Bones.Items.Length; i++)
|
||||
|
||||
//crazy breadth-wise limited to 4 algorithm for generating the ChildIndices
|
||||
|
||||
var tbones = Bones.Items.ToList();
|
||||
var rootbones = tbones.Where(b => (b.ParentIndex < 0)).ToList();
|
||||
for (int i = 0; i < tbones.Count; i++)
|
||||
{
|
||||
var bone = Bones.Items[i];
|
||||
var pind = bone.ParentIndex;
|
||||
parents.Add(pind);
|
||||
if (pind >= 0)
|
||||
{
|
||||
childs.Add(bone.Index);
|
||||
childs.Add(pind);
|
||||
lastbone = bone;
|
||||
}
|
||||
|
||||
List<Bone> getChildren(Bone b)
|
||||
{
|
||||
var r = new List<Bone>();
|
||||
if (b == null) return r;
|
||||
for (int i = 0; i < tbones.Count; i++)
|
||||
{
|
||||
var tb = tbones[i];
|
||||
if (tb.ParentIndex == b.Index)
|
||||
{
|
||||
r.Add(tb);
|
||||
}
|
||||
}
|
||||
return r;
|
||||
}
|
||||
List<Bone> getAllChildren(List<Bone> bones)
|
||||
{
|
||||
var l = new List<Bone>();
|
||||
foreach (var b in bones)
|
||||
{
|
||||
var children = getChildren(b);
|
||||
l.AddRange(children);
|
||||
}
|
||||
return l;
|
||||
}
|
||||
|
||||
var layers = new List<List<Bone>>();
|
||||
var layer = getAllChildren(rootbones);
|
||||
while (layer.Count > 0)
|
||||
{
|
||||
var numbones = Math.Min(layer.Count, 4);
|
||||
var inslayer = layer.GetRange(0, numbones);
|
||||
var extlayer = getAllChildren(inslayer);
|
||||
layers.Add(inslayer);
|
||||
layer.RemoveRange(0, numbones);
|
||||
layer.InsertRange(0, extlayer);
|
||||
}
|
||||
|
||||
|
||||
|
||||
foreach (var l in layers)
|
||||
{
|
||||
Bone lastbone = null;
|
||||
foreach (var b in l)
|
||||
{
|
||||
childs.Add(b.Index);
|
||||
childs.Add(b.ParentIndex);
|
||||
lastbone = b;
|
||||
}
|
||||
if (lastbone != null)
|
||||
{
|
||||
@ -1161,23 +1208,55 @@ namespace CodeWalker.GameFiles
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
////just testing - not really working properly - how to generate these arrays identical to originals? seem to have weird repeats? (not just end padding)
|
||||
|
||||
|
||||
//////just testing
|
||||
//var numchilds = ChildIndices?.Length ?? 0;
|
||||
//if (numchilds < childs.Count)
|
||||
//{ }
|
||||
//else
|
||||
//int diffstart = -1;
|
||||
//int diffend = -1;
|
||||
//int ndiff = Math.Abs(numchilds - childs.Count);
|
||||
//int maxchilds = Math.Min(numchilds, childs.Count);
|
||||
//for (int i = 0; i < maxchilds; i++)
|
||||
//{
|
||||
// for (int i = 0; i < numchilds; i++)
|
||||
// {
|
||||
// var oc = ChildIndices[i];
|
||||
// var nc = childs[i];
|
||||
// if (nc != oc)
|
||||
// { }
|
||||
// {
|
||||
// if (diffstart < 0) diffstart = i;
|
||||
// diffend = i;
|
||||
// ndiff++;
|
||||
// }
|
||||
//}
|
||||
//if (ndiff > 0)
|
||||
//{
|
||||
// var difffrac = ((float)ndiff) / ((float)numchilds);
|
||||
//}
|
||||
//if (numchilds != childs.Count)
|
||||
//{ }
|
||||
|
||||
|
||||
|
||||
|
||||
//var numbones = Bones.Items.Length;
|
||||
//var numchilds = ChildIndices?.Length ?? 0;
|
||||
//for (int i = 0; i < numchilds; i += 2)
|
||||
//{
|
||||
// var bind = ChildIndices[i];
|
||||
// var pind = ChildIndices[i + 1];
|
||||
// if (bind > numbones)
|
||||
// { continue; }//shouldn't happen
|
||||
// var bone = Bones.Items[bind];
|
||||
// if (bone == null)
|
||||
// { continue; }//shouldn't happen
|
||||
// if (pind != bone.ParentIndex)
|
||||
// { }//shouldn't happen?
|
||||
//}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user