lucidiot
/
AssetStudio
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

FIxed #351

This commit is contained in:
Perfare 2019-01-24 00:35:42 +08:00
parent be091ecebb
commit fa91820016
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
AssetStudio/Classes/Mesh.cs
View File

@ -637,14 +637,27 @@ namespace AssetStudio
private void ProcessData()
{
//Fix normal channel in 2018.3 and up
if (version[0] > 2018 || (version[0] == 2018 && version[1] >= 3))
{
if (m_VertexData.m_Channels[1].dimension > 4)
{
for (int i = 2; i < m_VertexData.m_Channels.Length; i++)
{
if (m_VertexData.m_Channels[i].dimension > 0)
{
var offset = m_VertexData.m_Channels[i].offset - m_VertexData.m_Channels[1].offset;
m_VertexData.m_Channels[1].dimension = (byte)(offset / MeshHelper.GetChannelFormatSize(m_VertexData.m_Channels[1].format));
m_VertexData.GetStreams();
break;
}
}
}
}
if (!string.IsNullOrEmpty(m_StreamData?.path))
{
if (m_VertexData.m_VertexCount > 0)
{
//Fix Normal Channel
m_VertexData.m_Channels[1].dimension = 4;
m_VertexData.GetStreams();
var resourceReader = new ResourceReader(m_StreamData.path, assetsFile, m_StreamData.offset, (int)m_StreamData.size);
m_VertexData.m_DataSize = resourceReader.GetData();
}

2
AssetStudioUtility/SpriteHelper.cs
View File

@ -148,7 +148,7 @@ namespace AssetStudio
var vertices = new Vector2[subMesh.vertexCount];
for (int v = 0; v < subMesh.vertexCount; v++)
{
vertices[v] = (Vector2)vertexReader.ReadVector3();
vertices[v] = vertexReader.ReadVector3();
vertexReader.BaseStream.Position += m_Stream.stride - 12;
}