mirror/AssetStudio
1
0
Fork 0
mirror of https://github.com/aelurum/AssetStudio.git synced 2025-05-25 05:40:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #962

Browse Source
This commit is contained in:
Perfare 2022-06-01 15:33:01 +08:00 committed by VaDiM
parent 8ae3df6197
commit ded2dcd54e
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
AssetStudio/IImported.cs
View File

@ -73,6 +73,28 @@ namespace AssetStudio
return null;
}
public ImportedFrame FindRelativeFrameWithPath(string path)
{
var subs = path.Split(new[] { '/' }, 2);
foreach (var child in children)
{
if (child.Name == subs[0])
{
if (subs.Length == 1)
{
return child;
}
else
{
var result = child.FindRelativeFrameWithPath(subs[1]);
if (result != null)
return result;
}
}
}
return null;
}
public ImportedFrame FindFrame(string name)
{
if (Name == name)

11
AssetStudioUtility/ModelConverter.cs
View File

@ -1063,26 +1063,21 @@ namespace AssetStudio
else
{
transformName = strs.Last();
var parentFrameName = strs[strs.Length - 2];
parentFrame = RootFrame.FindChild(parentFrameName);
//var parentFramePath = path.Substring(0, path.LastIndexOf('/'));
//parentFrame = RootFrame.FindFrameByPath(parentFramePath);
var parentFramePath = path.Substring(0, path.LastIndexOf('/'));
parentFrame = RootFrame.FindRelativeFrameWithPath(parentFramePath);
}
var skeletonPose = avatar.m_Avatar.m_DefaultPose;
var xform = skeletonPose.m_X[i];
var frame = RootFrame.FindChild(transformName);
if (frame != null)
{
SetFrame(frame, xform.t, xform.q, xform.s);
parentFrame.AddChild(frame);
}
else
{
frame = CreateFrame(transformName, xform.t, xform.q, xform.s);
parentFrame.AddChild(frame);
}
parentFrame.AddChild(frame);
}
}