mirror/AssetStudio
1
0
Fork 0
mirror of https://github.com/aelurum/AssetStudio.git synced 2025-07-18 03:24:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

2018.3.0b support

Browse Source 
Refactor mesh read
Fixed bug
This commit is contained in:
Perfare
2018-12-05 22:35:05 +08:00
parent 98c9eea58a
commit eb13585174
13 changed files with 1006 additions and 1220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
AssetStudioUtility/ModelConverter.cs
View File

@ -263,7 +263,7 @@ namespace AssetStudio
combine = true;
}
int firstFace = 0;
for (int i = 0; i < mesh.m_SubMeshes.Count; i++)
for (int i = 0; i < mesh.m_SubMeshes.Length; i++)
{
int numFaces = (int)mesh.m_SubMeshes[i].indexCount / 3;
if (subHashSet.Count > 0 && !subHashSet.Contains(i))
@ -338,12 +338,12 @@ namespace AssetStudio
if (mesh.m_Skin?.Length > 0)
{
var inf = mesh.m_Skin[j];
iVertex.BoneIndices = new byte[inf.Count];
iVertex.Weights = new float[inf.Count];
for (var k = 0; k < inf.Count; k++)
iVertex.BoneIndices = new int[4];
iVertex.Weights = new float[4];
for (var k = 0; k < 4; k++)
{
iVertex.BoneIndices[k] = (byte)inf[k].boneIndex;
iVertex.Weights[k] = inf[k].weight;
iVertex.BoneIndices[k] = inf.boneIndex[k];
iVertex.Weights[k] = inf.weight[k];
}
}
iSubmesh.VertexList.Add(iVertex);
@ -490,7 +490,7 @@ namespace AssetStudio
int shapeIdx = mesh.m_Shapes.channels[i].frameIndex + frameIdx;
keyframe.VertexList = new List<ImportedVertex>((int)mesh.m_Shapes.shapes[shapeIdx].vertexCount);
keyframe.MorphedVertexIndices = new List<ushort>((int)mesh.m_Shapes.shapes[shapeIdx].vertexCount);
keyframe.Weight = shapeIdx < mesh.m_Shapes.fullWeights.Count ? mesh.m_Shapes.fullWeights[shapeIdx] : 100f;
keyframe.Weight = shapeIdx < mesh.m_Shapes.fullWeights.Length ? mesh.m_Shapes.fullWeights[shapeIdx] : 100f;
int lastVertIndex = (int)(mesh.m_Shapes.shapes[shapeIdx].firstVertex + mesh.m_Shapes.shapes[shapeIdx].vertexCount);
for (int j = (int)mesh.m_Shapes.shapes[shapeIdx].firstVertex; j < lastVertIndex; j++)
{

58
AssetStudioUtility/SpriteHelper.cs
View File

@ -138,7 +138,6 @@ namespace AssetStudio
private static Vector2[][] GetTriangles(VertexData m_VertexData, SubMesh[] m_SubMeshes, byte[] m_IndexBuffer)
{
var triangles = new List<Vector2[]>();
GetStreams(m_VertexData);
var m_Channel = m_VertexData.m_Channels[0]; //kShaderChannelVertex
var m_Stream = m_VertexData.m_Streams[m_Channel.stream];
using (BinaryReader vertexReader = new BinaryReader(new MemoryStream(m_VertexData.m_DataSize)),
@ -170,62 +169,5 @@ namespace AssetStudio
}
return triangles.ToArray();
}
private static void GetStreams(VertexData vertexData)
{
var m_Channels = vertexData.m_Channels;
var streamCount = m_Channels.Max(x => x.stream) + 1;
var m_Streams = new StreamInfo[streamCount];
uint offset = 0;
for (int s = 0; s < streamCount; s++)
{
uint chnMask = 0;
uint stride = 0;
for (int chn = 0; chn < m_Channels.Length; chn++)
{
var m_Channel = m_Channels[chn];
if (m_Channel.stream == s)
{
if (m_Channel.dimension > 0)
{
chnMask |= 1u << chn;
stride += m_Channel.dimension * GetChannelFormatSize(m_Channel.format);
}
}
}
m_Streams[s] = new StreamInfo
{
channelMask = chnMask,
offset = offset,
stride = stride,
dividerOp = 0,
frequency = 0
};
offset += vertexData.m_VertexCount * stride;
//static size_t AlignStreamSize (size_t size) { return (size + (kVertexStreamAlign-1)) & ~(kVertexStreamAlign-1); }
offset = (offset + (16u - 1u)) & ~(16u - 1u);
}
vertexData.m_Streams = m_Streams;
}
private static uint GetChannelFormatSize(int format)
{
switch (format)
{
case 0: //kChannelFormatFloat
return 4u;
case 1: //kChannelFormatFloat16
return 2u;
case 2: //kChannelFormatColor, in 4.x is size 4
return 1u;
case 3: //kChannelFormatByte
return 1u;
case 11: //kChannelFormatInt32
return 4u;
default:
return 0;
}
}
}
}

6
AssetStudioUtility/Texture2DConverter.cs
View File

@ -86,8 +86,10 @@ namespace AssetStudio
public Texture2DConverter(Texture2D m_Texture2D)
{
image_data_size = m_Texture2D.image_data_size;
image_data = m_Texture2D.image_data.Value;
var image_data_value = m_Texture2D.image_data.Value;
image_data_size = image_data_value.Length;
image_data = new byte[image_data_size];
Buffer.BlockCopy(image_data_value, 0, image_data, 0, image_data_size);
m_Width = m_Texture2D.m_Width;
m_Height = m_Texture2D.m_Height;
m_TextureFormat = m_Texture2D.m_TextureFormat;