Cool_Tools/Switch-Toolbox
1
0
Fork 0
mirror of synced 2024-11-28 09:20:57 +01:00
Code Releases Wiki Activity

Automatically search for a proper skl root bone if possible

Browse Source
This commit is contained in:
KillzXGaming 2019-07-05 18:21:47 -04:00
parent f6a21ee01f
commit d6e67ac6e6
5 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/Switch_Toolbox/v15/.suo
View File

Binary file not shown.

2
Switch_FileFormatsMain/FileFormats/Archives/SARC_OLD.cs
View File

@ -217,7 +217,7 @@ namespace FirstPlugin
else else
{ {
sarcData.Files.Add(SetSarcPath(node, this), sarcData.Files.Add(SetSarcPath(node, this),
STLibraryCompression.CompressFile(OpenedFiles[node.FullPath], fileFormat)); OpenedFiles[node.FullPath]);
} }
} }
} }

BIN
Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache
View File

Binary file not shown.

BIN
Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache
View File

Binary file not shown.

39
Switch_Toolbox_Library/FileFormats/Assimp/Assimp.cs
View File

@ -417,6 +417,33 @@ namespace Switch_Toolbox.Library
return 0; return 0;
} }
} }
private Node GetSklRoot(Node node, List<string> boneNames)
{
string Name = node.Name;
if (DaeHelper.IDMapToName.ContainsKey(node.Name))
Name = DaeHelper.IDMapToName[node.Name];
string ParentArmatureName = node.Parent != null ? node.Parent.Name : "";
if (ParentArmatureName != string.Empty && DaeHelper.IDMapToName.ContainsKey(ParentArmatureName))
ParentArmatureName = DaeHelper.IDMapToName[ParentArmatureName];
bool IsBone = boneNames.Contains(Name) && !boneNames.Contains(ParentArmatureName) ||
Name.Contains("Skl_Root") || Name.Contains("nw4f_root") ||
Name.Contains("skl_root");
if (IsBone)
return node;
if (node.HasChildren)
{
foreach (Node child in node.Children)
GetSklRoot(child, boneNames);
}
return null;
}
private void BuildSkeletonNodes(Node node, List<string> boneNames, STSkeleton skeleton, ref Matrix4x4 rootTransform) private void BuildSkeletonNodes(Node node, List<string> boneNames, STSkeleton skeleton, ref Matrix4x4 rootTransform)
{ {
Matrix4x4 trafo = node.Transform; Matrix4x4 trafo = node.Transform;
@ -454,8 +481,16 @@ namespace Switch_Toolbox.Library
{ {
if (node.HasChildren) if (node.HasChildren)
{ {
foreach (Node child in node.Children) var SklRoot = GetSklRoot(node, boneNames);
BuildSkeletonNodes(child, boneNames, skeleton, ref world); if (SklRoot != null)
{
BuildSkeletonNodes(SklRoot, boneNames, skeleton, ref world);
}
else
{
foreach (Node child in node.Children)
BuildSkeletonNodes(child, boneNames, skeleton, ref world);
}
} }
} }
} }