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

Fixed #272

Browse Source
This commit is contained in:
Perfare 2018-10-23 01:18:19 +08:00
parent 2c58fae804
commit 22b2d472bc
3 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
AssetStudio/StudioClasses/ModelConverter.cs
View File

@ -382,23 +382,13 @@ namespace AssetStudio
iMesh.SubmeshList.Add(iSubmesh); iMesh.SubmeshList.Add(iSubmesh);
} }
if (meshR is SkinnedMeshRenderer sMesh)
{
//Bone //Bone
iMesh.BoneList = new List<ImportedBone>(sMesh.m_Bones.Length); iMesh.BoneList = new List<ImportedBone>();
for (int i = 0; i < sMesh.m_Bones.Length; i++) if (mesh.m_BindPose?.Length > 0 && mesh.m_BoneNameHashes?.Length > 0 && mesh.m_BindPose.Length == mesh.m_BoneNameHashes.Length)
{
for (int i = 0; i < mesh.m_BindPose.Length; i++)
{ {
var bone = new ImportedBone(); var bone = new ImportedBone();
if (sMesh.m_Bones[i].TryGetTransform(out var m_Transform))
{
if (m_Transform.m_GameObject.TryGetGameObject(out var m_GameObject))
{
bone.Name = m_GameObject.m_Name;
}
}
//No first use m_BoneNameHashes, because it may be wrong
if (string.IsNullOrEmpty(bone.Name))
{
var boneHash = mesh.m_BoneNameHashes[i]; var boneHash = mesh.m_BoneNameHashes[i];
bone.Name = GetNameFromBonePathHashes(boneHash); bone.Name = GetNameFromBonePathHashes(boneHash);
if (string.IsNullOrEmpty(bone.Name)) if (string.IsNullOrEmpty(bone.Name))
@ -410,7 +400,6 @@ namespace AssetStudio
//throw new Exception("A Bone could neither be found by hash in Avatar nor by index in SkinnedMeshRenderer."); //throw new Exception("A Bone could neither be found by hash in Avatar nor by index in SkinnedMeshRenderer.");
continue; continue;
} }
}
var om = new float[4, 4]; var om = new float[4, 4];
var m = mesh.m_BindPose[i]; var m = mesh.m_BindPose[i];
om[0, 0] = m[0, 0]; om[0, 0] = m[0, 0];
@ -432,14 +421,25 @@ namespace AssetStudio
bone.Matrix = om; bone.Matrix = om;
iMesh.BoneList.Add(bone); iMesh.BoneList.Add(bone);
} }
}
//hierarchy has been optimized if (meshR is SkinnedMeshRenderer sMesh)
if (sMesh.m_Bones.Length == 0 && mesh.m_BindPose?.Length > 0 && mesh.m_BoneNameHashes?.Length > 0)
{ {
//TODO Repeat code with above //Bone for 4.3 down and other
for (int i = 0; i < mesh.m_BindPose.Length; i++) if (iMesh.BoneList.Count == 0)
{
for (int i = 0; i < sMesh.m_Bones.Length; i++)
{ {
var bone = new ImportedBone(); var bone = new ImportedBone();
if (sMesh.m_Bones[i].TryGetTransform(out var m_Transform))
{
if (m_Transform.m_GameObject.TryGetGameObject(out var m_GameObject))
{
bone.Name = m_GameObject.m_Name;
}
}
if (string.IsNullOrEmpty(bone.Name))
{
var boneHash = mesh.m_BoneNameHashes[i]; var boneHash = mesh.m_BoneNameHashes[i];
bone.Name = GetNameFromBonePathHashes(boneHash); bone.Name = GetNameFromBonePathHashes(boneHash);
if (string.IsNullOrEmpty(bone.Name)) if (string.IsNullOrEmpty(bone.Name))
@ -451,6 +451,7 @@ namespace AssetStudio
//throw new Exception("A Bone could neither be found by hash in Avatar nor by index in SkinnedMeshRenderer."); //throw new Exception("A Bone could neither be found by hash in Avatar nor by index in SkinnedMeshRenderer.");
continue; continue;
} }
}
var om = new float[4, 4]; var om = new float[4, 4];
var m = mesh.m_BindPose[i]; var m = mesh.m_BindPose[i];
om[0, 0] = m[0, 0]; om[0, 0] = m[0, 0];

1
AssetStudio/StudioClasses/Studio.cs
View File

@ -659,6 +659,7 @@ namespace AssetStudio
StatusStripUpdate($"Finished exporting {filename}.fbx"); StatusStripUpdate($"Finished exporting {filename}.fbx");
} }
} }
StatusStripUpdate("Finished");
}); });
} }

3
AssetStudioFBX/AssetStudioFBXExporter.cpp
View File

@ -574,6 +574,7 @@ namespace AssetStudio
if (hasBones) if (hasBones)
{ {
FbxSkin* pSkin = FbxSkin::Create(pScene, ""); FbxSkin* pSkin = FbxSkin::Create(pScene, "");
FbxAMatrix lMeshMatrix = pMeshNode->EvaluateGlobalTransform();
for (int j = 0; j < boneList->Count; j++) for (int j = 0; j < boneList->Count; j++)
{ {
FbxCluster* pCluster = pClusterArray->GetAt(j); FbxCluster* pCluster = pClusterArray->GetAt(j);
@ -589,8 +590,6 @@ namespace AssetStudio
} }
} }
FbxAMatrix lMeshMatrix = pMeshNode->EvaluateGlobalTransform();
pCluster->SetTransformMatrix(lMeshMatrix); pCluster->SetTransformMatrix(lMeshMatrix);
pCluster->SetTransformLinkMatrix(lMeshMatrix * lBoneMatrix.Inverse()); pCluster->SetTransformLinkMatrix(lMeshMatrix * lBoneMatrix.Inverse());