mirror/AssetStudio
1
0
Fork 0
mirror of https://github.com/aelurum/AssetStudio.git synced 2025-06-03 00:58:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug

Browse Source
This commit is contained in:
Perfare 2018-11-01 19:15:15 +08:00
parent 1f897cf431
commit b04cdbf12b
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
AssetStudio/Classes/Mesh.cs
View File

@ -571,7 +571,6 @@ namespace AssetStudio
#region 2018 and up #region 2018 and up
if (version[0] >= 2018) if (version[0] >= 2018)
{ {
InitMSkin();
foreach (var m_Channel in m_Channels) foreach (var m_Channel in m_Channels)
{ {
if (m_Channel.dimension > 0) if (m_Channel.dimension > 0)
@ -639,8 +638,16 @@ namespace AssetStudio
case 7: //kShaderChannelTexCoord3 case 7: //kShaderChannelTexCoord3
m_UV4 = componentsFloatArray; m_UV4 = componentsFloatArray;
break; break;
//kShaderChannelTexCoord4 8
//kShaderChannelTexCoord5 9
//kShaderChannelTexCoord6 10
//kShaderChannelTexCoord7 11
//2018.2 and up //2018.2 and up
case 12: case 12: //kShaderChannelBlendWeight
if (m_Skin == null)
{
InitMSkin();
}
for (int i = 0; i < m_VertexCount; i++) for (int i = 0; i < m_VertexCount; i++)
{ {
for (int j = 0; j < 4; j++) for (int j = 0; j < 4; j++)
@ -649,7 +656,11 @@ namespace AssetStudio
} }
} }
break; break;
case 13: case 13: //kShaderChannelBlendIndices
if (m_Skin == null)
{
InitMSkin();
}
for (int i = 0; i < m_VertexCount; i++) for (int i = 0; i < m_VertexCount; i++)
{ {
for (int j = 0; j < 4; j++) for (int j = 0; j < 4; j++)

2
AssetStudio/StudioClasses/ModelConverter.cs
View File

@ -353,7 +353,7 @@ namespace AssetStudio
iVertex.Tangent = new Vector4(-mesh.m_Tangents[j * 4], mesh.m_Tangents[j * 4 + 1], mesh.m_Tangents[j * 4 + 2], mesh.m_Tangents[j * 4 + 3]); iVertex.Tangent = new Vector4(-mesh.m_Tangents[j * 4], mesh.m_Tangents[j * 4 + 1], mesh.m_Tangents[j * 4 + 2], mesh.m_Tangents[j * 4 + 3]);
} }
//BoneInfluence //BoneInfluence
if (mesh.m_Skin.Length > 0) if (mesh.m_Skin?.Length > 0)
{ {
var inf = mesh.m_Skin[j]; var inf = mesh.m_Skin[j];
iVertex.BoneIndices = new byte[inf.Count]; iVertex.BoneIndices = new byte[inf.Count];