Cool_Tools/Switch-Toolbox
1
0
Fork 0
mirror of synced 2025-01-19 01:14:08 +01:00
Code Releases Wiki Activity

Fix bone transforms and names from parent skeleton generated by blender

Browse Source
This commit is contained in:
KillzXGaming 2019-03-31 17:43:19 -04:00
parent 0984066b13
commit 0c5d53ae61
8 changed files with 16 additions and 9 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.

BIN
.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide
View File

Binary file not shown.

BIN
.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal
View File

Binary file not shown.

2
Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FMDL.cs
View File

@ -867,8 +867,6 @@ namespace Bfres.Structs
shape.vertexAttributes = settings.CreateNewAttributes();
shape.BoneIndex = obj.BoneIndex;
MessageBox.Show(shape.vertexAttributes.Count.ToString());
if (UseMats)
shape.MaterialIndex = obj.MaterialIndex + MatStartIndex;
else

BIN
Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.dll
View File

Binary file not shown.

BIN
Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.pdb
View File

Binary file not shown.

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

Binary file not shown.

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

@ -225,12 +225,12 @@ namespace Switch_Toolbox.Library
Matrix4x4 world = trafo * rootTransform;
Matrix4 worldTK = AssimpHelper.TKMatrix(world);
bool IsBone = boneNames.Contains(node.Name) && !boneNames.Contains(node.Parent.Name) ||
node.Name == "Skl_Root" || node.Name == "nw4f_root";
node.Name.Contains("Skl_Root") || node.Name.Contains("nw4f_root");
Console.WriteLine("node list " + node.Name + " " + IsBone);
string ParentArmatureName = "";
if (node.Parent != null)
ParentArmatureName = node.Parent.Name;
short SmoothIndex = 0;
short RigidIndex = -1;
@ -238,9 +238,11 @@ namespace Switch_Toolbox.Library
//Loop through all the bones. If the parent is not in the bone list, then it's Parent is the root
if (IsBone)
{
Console.WriteLine("ParentArmatureName " + ParentArmatureName);
var idenity = Matrix4x4.Identity;
var Root = node.Parent;
CreateByNode(node, skeleton, SmoothIndex, RigidIndex, true, ref idenity);
CreateByNode(node, skeleton, ParentArmatureName, SmoothIndex, RigidIndex, true, ref idenity);
}
else
{
@ -252,7 +254,8 @@ namespace Switch_Toolbox.Library
public const int BoneRotation = 0;
private List<Node> tempBoneNodes = new List<Node>();
private void CreateByNode(Node node, STSkeleton skeleton, short SmoothIndex, short RigidIndex, bool IsRoot, ref Assimp.Matrix4x4 rootTransform)
private void CreateByNode(Node node, STSkeleton skeleton, string ParentArmatureName,
short SmoothIndex, short RigidIndex, bool IsRoot, ref Assimp.Matrix4x4 rootTransform)
{
Matrix4x4 trafo = node.Transform;
Matrix4x4 world = trafo * rootTransform;
@ -269,6 +272,12 @@ namespace Switch_Toolbox.Library
skeleton.bones.Add(bone);
bone.Text = node.Name;
if (node.Name.Contains($"{ParentArmatureName}"))
{
bone.Text = node.Name.Replace($"{ParentArmatureName}_", "");
}
bone.SmoothMatrixIndex = (short)skeleton.bones.IndexOf(bone);
bone.RigidMatrixIndex = -1; //Todo calculate these
@ -307,7 +316,7 @@ namespace Switch_Toolbox.Library
}
foreach (Node child in node.Children)
CreateByNode(child, skeleton, SmoothIndex, RigidIndex, false, ref rootTransform);
CreateByNode(child, skeleton, ParentArmatureName, SmoothIndex, RigidIndex, false, ref rootTransform);
}
public STGenericObject CreateGenericObject(Mesh msh, int Index, Matrix4 transform)
{