mirror of
https://github.com/aelurum/AssetStudio.git
synced 2026-11-15 19:28:48 -05:00
Improve support for legacy Unity versions (WIP). Close #103
This commit is contained in:
@@ -37,10 +37,14 @@ namespace AssetStudio
|
||||
CollectAnimationClip(m_GameObject.m_Animator);
|
||||
}
|
||||
}
|
||||
else
|
||||
else if (m_GameObject.m_Transform != null)
|
||||
{
|
||||
InitWithGameObject(m_GameObject);
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new NotSupportedException("Unable to export model from this object");
|
||||
}
|
||||
if (animationList != null && animationList.Count > 0)
|
||||
{
|
||||
Logger.Debug($"Selected AnimationClip(s):\n\"{string.Join("\"\n\"", animationList.Select(x => x.m_Name))}\"");
|
||||
@@ -656,7 +660,7 @@ namespace AssetStudio
|
||||
return iMat;
|
||||
}
|
||||
iMat = new ImportedMaterial();
|
||||
iMat.Name = mat.m_Name;
|
||||
iMat.Name = mat.m_Name ?? $"material {mat.m_PathID}";
|
||||
//default values
|
||||
iMat.Diffuse = new Color(0.8f, 0.8f, 0.8f, 1);
|
||||
iMat.Ambient = new Color(0.2f, 0.2f, 0.2f, 1);
|
||||
|
||||
@@ -17,7 +17,7 @@ namespace AssetStudio
|
||||
{
|
||||
var decompressedBytes = new byte[shader.decompressedSize];
|
||||
LZ4Codec.Decode(shader.m_SubProgramBlob, decompressedBytes);
|
||||
using (var blobReader = new BinaryReader(new MemoryStream(decompressedBytes)))
|
||||
using (var blobReader = new EndianBinaryReader(new MemoryStream(decompressedBytes), EndianType.LittleEndian))
|
||||
{
|
||||
var program = new ShaderProgram(blobReader, shader.version);
|
||||
program.Read(blobReader, 0);
|
||||
@@ -46,7 +46,7 @@ namespace AssetStudio
|
||||
var decompressedLength = shader.decompressedLengths[i][j];
|
||||
var decompressedBytes = new byte[decompressedLength];
|
||||
LZ4Codec.Decode(shader.compressedBlob, (int)offset, (int)compressedLength, decompressedBytes, 0, (int)decompressedLength);
|
||||
using (var blobReader = new BinaryReader(new MemoryStream(decompressedBytes)))
|
||||
using (var blobReader = new EndianBinaryReader(new MemoryStream(decompressedBytes), EndianType.LittleEndian))
|
||||
{
|
||||
if (j == 0)
|
||||
{
|
||||
@@ -872,7 +872,7 @@ namespace AssetStudio
|
||||
public int Length;
|
||||
public int Segment;
|
||||
|
||||
public ShaderSubProgramEntry(BinaryReader reader, UnityVersion version)
|
||||
public ShaderSubProgramEntry(EndianBinaryReader reader, UnityVersion version)
|
||||
{
|
||||
Offset = reader.ReadInt32();
|
||||
Length = reader.ReadInt32();
|
||||
@@ -888,7 +888,7 @@ namespace AssetStudio
|
||||
public ShaderSubProgramEntry[] entries;
|
||||
public ShaderSubProgram[] m_SubPrograms;
|
||||
|
||||
public ShaderProgram(BinaryReader reader, UnityVersion version)
|
||||
public ShaderProgram(EndianBinaryReader reader, UnityVersion version)
|
||||
{
|
||||
var subProgramsCapacity = reader.ReadInt32();
|
||||
entries = new ShaderSubProgramEntry[subProgramsCapacity];
|
||||
@@ -899,7 +899,7 @@ namespace AssetStudio
|
||||
m_SubPrograms = new ShaderSubProgram[subProgramsCapacity];
|
||||
}
|
||||
|
||||
public void Read(BinaryReader reader, int segment)
|
||||
public void Read(EndianBinaryReader reader, int segment)
|
||||
{
|
||||
for (int i = 0; i < entries.Length; i++)
|
||||
{
|
||||
@@ -932,7 +932,7 @@ namespace AssetStudio
|
||||
public string[] m_LocalKeywords;
|
||||
public byte[] m_ProgramCode;
|
||||
|
||||
public ShaderSubProgram(BinaryReader reader)
|
||||
public ShaderSubProgram(EndianBinaryReader reader)
|
||||
{
|
||||
//LoadGpuProgramFromData
|
||||
//201509030 - Unity 5.3
|
||||
@@ -1043,7 +1043,7 @@ namespace AssetStudio
|
||||
}
|
||||
case ShaderGpuProgramType.MetalVS:
|
||||
case ShaderGpuProgramType.MetalFS:
|
||||
using (var reader = new BinaryReader(new MemoryStream(m_ProgramCode)))
|
||||
using (var reader = new EndianBinaryReader(new MemoryStream(m_ProgramCode), EndianType.LittleEndian))
|
||||
{
|
||||
var fourCC = reader.ReadUInt32();
|
||||
if (fourCC == 0xf00dcafe)
|
||||
|
||||
@@ -260,9 +260,9 @@ namespace AssetStudio
|
||||
var m_VertexData = m_RD.m_VertexData;
|
||||
var m_Channel = m_VertexData.m_Channels[0]; //kShaderChannelVertex
|
||||
var m_Stream = m_VertexData.m_Streams[m_Channel.stream];
|
||||
using (var vertexReader = new BinaryReader(new MemoryStream(m_VertexData.m_DataSize)))
|
||||
using (var vertexReader = new EndianBinaryReader(new MemoryStream(m_VertexData.m_DataSize), EndianType.LittleEndian))
|
||||
{
|
||||
using (var indexReader = new BinaryReader(new MemoryStream(m_RD.m_IndexBuffer)))
|
||||
using (var indexReader = new EndianBinaryReader(new MemoryStream(m_RD.m_IndexBuffer), EndianType.LittleEndian))
|
||||
{
|
||||
foreach (var subMesh in m_RD.m_SubMeshes)
|
||||
{
|
||||
|
||||
@@ -30,7 +30,7 @@ namespace AssetStudio
|
||||
m_Width = m_Texture2D.m_Width;
|
||||
m_Height = m_Texture2D.m_Height;
|
||||
texDataSize = m_Texture2D.image_data.Size;
|
||||
if (texDataSize == 0 || m_Width == 0 || m_Height == 0)
|
||||
if (texDataSize <= 0 || m_Width <= 0 || m_Width > 16384 || m_Height <= 0 || m_Height > 16384)
|
||||
return;
|
||||
|
||||
m_TextureFormat = m_Texture2D.m_TextureFormat;
|
||||
@@ -83,7 +83,7 @@ namespace AssetStudio
|
||||
if (!DecodeTexture2D(dataSpan))
|
||||
return false;
|
||||
|
||||
if (flip)
|
||||
if (flip && m_TextureFormat != TextureFormat.DXT3)
|
||||
{
|
||||
var stride = m_Width * 4;
|
||||
Span<byte> tmp = new byte[stride];
|
||||
@@ -116,7 +116,7 @@ namespace AssetStudio
|
||||
|
||||
image = Image.LoadPixelData<Bgra32>(imageBuffSpan, m_Width, m_Height);
|
||||
|
||||
if (flip)
|
||||
if (flip && m_TextureFormat != TextureFormat.DXT3)
|
||||
{
|
||||
image.Mutate(x => x.Flip(FlipMode.Vertical));
|
||||
}
|
||||
@@ -134,6 +134,7 @@ namespace AssetStudio
|
||||
return false;
|
||||
|
||||
var flag = false;
|
||||
var forceSwap = m_Texture2D.image_data.Endian == EndianType.BigEndian; //PowerPC(PPC) builds
|
||||
var buff = BigArrayPool<byte>.Shared.Rent(texDataSize);
|
||||
try
|
||||
{
|
||||
@@ -152,7 +153,7 @@ namespace AssetStudio
|
||||
flag = DecodeAlpha8(buff, destSpan);
|
||||
break;
|
||||
case TextureFormat.ARGB4444: //test pass
|
||||
SwapBytesForXbox(buff);
|
||||
SwapBytesForXbox(buff, forceSwap);
|
||||
flag = DecodeARGB4444(buff, destSpan);
|
||||
break;
|
||||
case TextureFormat.RGB24: //test pass
|
||||
@@ -165,7 +166,7 @@ namespace AssetStudio
|
||||
flag = DecodeARGB32(buff, destSpan);
|
||||
break;
|
||||
case TextureFormat.RGB565: //test pass
|
||||
SwapBytesForXbox(buff);
|
||||
SwapBytesForXbox(buff, forceSwap);
|
||||
flag = DecodeRGB565(buff, destSpan);
|
||||
break;
|
||||
case TextureFormat.R16: //test pass
|
||||
@@ -175,7 +176,8 @@ namespace AssetStudio
|
||||
SwapBytesForXbox(buff);
|
||||
flag = DecodeDXT1(buff, destSpan);
|
||||
break;
|
||||
case TextureFormat.DXT3:
|
||||
case TextureFormat.DXT3: //TODO
|
||||
flag = DecodeDXT3(buff, destSpan);
|
||||
break;
|
||||
case TextureFormat.DXT5: //test pass
|
||||
SwapBytesForXbox(buff);
|
||||
@@ -330,13 +332,13 @@ namespace AssetStudio
|
||||
return flag;
|
||||
}
|
||||
|
||||
private void SwapBytesForXbox(Span<byte> buff)
|
||||
private void SwapBytesForXbox(Span<byte> buff, bool force = false)
|
||||
{
|
||||
if (m_Texture2D.platform == BuildTarget.XBOX360)
|
||||
if (m_Texture2D.platform == BuildTarget.XBOX360 || force)
|
||||
{
|
||||
for (var i = 0; i < texDataSize / 2; i++)
|
||||
for (var i = 0; i < texDataSize; i += 2)
|
||||
{
|
||||
buff.Slice(i * 2, 2).Reverse();
|
||||
buff.Slice(i, 2).Reverse();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -439,6 +441,35 @@ namespace AssetStudio
|
||||
return TextureDecoder.DecodeDXT1(buff, m_Width, m_Height, destSpan);
|
||||
}
|
||||
|
||||
private bool DecodeDXT3(ReadOnlySpan<byte> buff, Span<byte> destSpan)
|
||||
{
|
||||
if (!TextureDecoder.DecodeDXT5(buff, m_Width, m_Height, destSpan))
|
||||
return false;
|
||||
|
||||
//decode dxt3 alpha
|
||||
var numBlocksX = (m_Width + 3) / 4;
|
||||
var numBlocksY = (m_Height + 3) / 4;
|
||||
var offset = 0;
|
||||
for (var by = 0; by < numBlocksY; by++)
|
||||
{
|
||||
for (var bx = 0; bx < numBlocksX; bx++, offset += 16)
|
||||
{
|
||||
var alphaPackedVal = BinaryPrimitives.ReadUInt64LittleEndian(buff.Slice(offset));
|
||||
var alphaIndex = 0;
|
||||
for (var y = 0; y < 4; y++)
|
||||
{
|
||||
for (var x = 0; x < 4; x++, alphaIndex++)
|
||||
{
|
||||
var destOffset = (by * 4 + y) * m_Width * 4 + (bx * 4 + x) * 4;
|
||||
var alphaValue = ((alphaPackedVal >> (4 * alphaIndex)) & 0x0F) * 0x11;
|
||||
destSpan[destOffset + 3] = (byte)alphaValue; //A
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
private bool DecodeDXT5(ReadOnlySpan<byte> buff, Span<byte> destSpan)
|
||||
{
|
||||
return TextureDecoder.DecodeDXT5(buff, m_Width, m_Height, destSpan);
|
||||
|
||||
Reference in New Issue
Block a user