Mirrors/Switch-Toolbox
2
0
Fork 0
mirror of https://github.com/KillzXGaming/Switch-Toolbox synced 2024-11-22 20:43:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

BFRES : Fix a skinning count issue for model importing.

Browse source
This commit is contained in:
KillzXGaming 2020-10-05 18:21:46 -04:00
parent 604f7b3d36
commit a22557b18c
1 changed files with 3 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
Switch_Toolbox_Library/FileFormats/Assimp/Assimp.cs
View file

@ -629,7 +629,7 @@ namespace Toolbox.Library
obj.HasUv1 = msh.HasTextureCoords(1); obj.HasUv1 = msh.HasTextureCoords(1);
obj.HasUv2 = msh.HasTextureCoords(2); obj.HasUv2 = msh.HasTextureCoords(2);
obj.HasIndices = msh.HasBones; obj.HasIndices = msh.HasBones;
if (msh.HasBones && msh.BoneCount > 1) if (msh.HasBones)
obj.HasWeights = msh.Bones[0].HasVertexWeights; obj.HasWeights = msh.Bones[0].HasVertexWeights;
obj.HasTans = msh.HasTangentBasis; obj.HasTans = msh.HasTangentBasis;
@ -642,8 +642,6 @@ namespace Toolbox.Library
obj.ObjectName = parentNode.Name; obj.ObjectName = parentNode.Name;
obj.boneList = GetBoneList(msh); obj.boneList = GetBoneList(msh);
obj.VertexSkinCount = (byte)GetVertexSkinCount(msh);
STGenericObject.LOD_Mesh lod = new STGenericObject.LOD_Mesh(); STGenericObject.LOD_Mesh lod = new STGenericObject.LOD_Mesh();
lod.faces = GetFaces(msh); lod.faces = GetFaces(msh);
@ -653,6 +651,7 @@ namespace Toolbox.Library
obj.lodMeshes.Add(lod); obj.lodMeshes.Add(lod);
obj.vertices = GetVertices(msh, transform, obj); obj.vertices = GetVertices(msh, transform, obj);
obj.VertexBufferIndex = Index; obj.VertexBufferIndex = Index;
obj.VertexSkinCount = (byte)obj.vertices.Max(x => x.boneNames.Count);
return obj; return obj;
} }
@ -688,36 +687,7 @@ namespace Toolbox.Library
} }
return bones; return bones;
} }
public int GetVertexSkinCount(Mesh msh)
{
List<int> indciesTotal = new List<int>();
var blendIndexes = new List<List<int>>();
var blendWeights = new List<List<float>>();
int i;
for (i = 0; i < msh.VertexCount; i++)
{
blendIndexes.Add(new List<int>());
blendWeights.Add(new List<float>());
}
foreach (var bone in msh.Bones)
{
var bi = msh.Bones.IndexOf(bone);
foreach (var vw in bone.VertexWeights)
{
blendIndexes[vw.VertexID].Add(bi);
blendWeights[vw.VertexID].Add(vw.Weight);
}
}
if (msh.HasBones)
return msh.Bones.Max(b => b.VertexWeightCount);
return 0;
}
public List<Vertex> GetVertices(Mesh msh, Matrix4 transform, STGenericObject STobj) public List<Vertex> GetVertices(Mesh msh, Matrix4 transform, STGenericObject STobj)
{ {
Matrix4 NormalsTransform = Matrix4.CreateFromQuaternion(transform.ExtractRotation()); Matrix4 NormalsTransform = Matrix4.CreateFromQuaternion(transform.ExtractRotation());
@ -746,10 +716,8 @@ namespace Toolbox.Library
if (msh.HasTangentBasis) if (msh.HasTangentBasis)
vert.bitan = new Vector4(msh.BiTangents[v].X, msh.BiTangents[v].Y, msh.BiTangents[v].Z, 1); vert.bitan = new Vector4(msh.BiTangents[v].X, msh.BiTangents[v].Y, msh.BiTangents[v].Z, 1);
vertices.Add(vert); vertices.Add(vert);
Console.WriteLine($"{msh.Name} COLOR { vert.col}");
} }
if (msh.HasBones && msh.BoneCount > 1) if (msh.HasBones)
{ {
for (int i = 0; i < msh.BoneCount; i++) for (int i = 0; i < msh.BoneCount; i++)
{ {