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

clean up code

Browse Source
This commit is contained in:
Perfare
2017-11-13 17:04:29 +08:00
parent 96c7aaabb0
commit 682ef4552e
16 changed files with 146 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Unity Studio/Unity Classes/AudioClip.cs
View File

@ -88,7 +88,8 @@ namespace Unity_Studio
m_3D = m_Legacy3D;
m_Source = a_Stream.ReadAlignedString(a_Stream.ReadInt32());
m_Source = Path.Combine(Path.GetDirectoryName(sourceFile.filePath), m_Source.Replace("archive:/", ""));
if (m_Source != "")
m_Source = Path.Combine(Path.GetDirectoryName(sourceFile.filePath), m_Source.Replace("archive:/", ""));
m_Offset = a_Stream.ReadInt64();
m_Size = a_Stream.ReadInt64();
m_CompressionFormat = a_Stream.ReadInt32();
@ -96,9 +97,10 @@ namespace Unity_Studio
if (readSwitch)
{
if (m_Source == null)
if (string.IsNullOrEmpty(m_Source))
{
m_AudioData = a_Stream.ReadBytes((int)m_Size);
if (m_Size > 0)
m_AudioData = a_Stream.ReadBytes((int)m_Size);
}
else if (File.Exists(m_Source) ||
File.Exists(m_Source = Path.Combine(Path.GetDirectoryName(sourceFile.filePath), Path.GetFileName(m_Source))))
@ -181,11 +183,9 @@ namespace Unity_Studio
}
preloadData.InfoText += "\n3D: " + m_3D;
if (m_Name != "") { preloadData.Text = m_Name; }
else { preloadData.Text = preloadData.TypeString + " #" + preloadData.uniqueID; }
preloadData.Text = m_Name;
if (m_Source != null)
preloadData.fullSize = preloadData.Size + (int)m_Size;
preloadData.SubItems.AddRange(new[] { preloadData.TypeString, preloadData.fullSize.ToString() });
}
}
}

10
Unity Studio/Unity Classes/Font.cs
View File

@ -71,8 +71,7 @@ namespace Unity_Studio
int m_FontData_size = a_Stream.ReadInt32();
if (m_FontData_size > 0)
{
m_FontData = new byte[m_FontData_size];
a_Stream.Read(m_FontData, 0, m_FontData_size);
m_FontData = a_Stream.ReadBytes(m_FontData_size);
if (m_FontData[0] == 79 && m_FontData[1] == 84 && m_FontData[2] == 84 && m_FontData[3] == 79)
{ preloadData.extension = ".otf"; }
@ -153,8 +152,7 @@ namespace Unity_Studio
int m_FontData_size = a_Stream.ReadInt32();
if (m_FontData_size > 0)
{
m_FontData = new byte[m_FontData_size];
a_Stream.Read(m_FontData, 0, m_FontData_size);
m_FontData = a_Stream.ReadBytes(m_FontData_size);
if (m_FontData[0] == 79 && m_FontData[1] == 84 && m_FontData[2] == 84 && m_FontData[3] == 79)
{ preloadData.extension = ".otf"; }
@ -186,9 +184,7 @@ namespace Unity_Studio
}
else
{
if (m_Name != "") { preloadData.Text = m_Name; }
else { preloadData.Text = preloadData.TypeString + " #" + preloadData.uniqueID; }
preloadData.SubItems.AddRange(new[] { preloadData.TypeString, preloadData.Size.ToString() });
preloadData.Text = m_Name;
}
}
}

3
Unity Studio/Unity Classes/GameObject.cs
View File

@ -52,8 +52,7 @@ namespace Unity_Studio
}
m_Layer = a_Stream.ReadInt32();
int namesize = a_Stream.ReadInt32();
m_Name = a_Stream.ReadAlignedString(namesize);
m_Name = a_Stream.ReadAlignedString(a_Stream.ReadInt32());
if (m_Name == "") { m_Name = "GameObject #" + uniqueID; }
m_Tag = a_Stream.ReadUInt16();
m_IsActive = a_Stream.ReadBoolean();

6
Unity Studio/Unity Classes/Mesh.cs
View File

@ -333,7 +333,6 @@ namespace Unity_Studio
var version = MeshPD.sourceFile.version;
a_Stream = MeshPD.sourceFile.a_Stream;
a_Stream.Position = MeshPD.Offset;
MeshPD.extension = ".obj";
bool m_Use16BitIndices = true; //3.5.0 and newer always uses 16bit indices
uint m_MeshCompression = 0;
@ -1226,9 +1225,8 @@ namespace Unity_Studio
}
else
{
if (m_Name != "") { MeshPD.Text = m_Name; }
else { MeshPD.Text = MeshPD.TypeString + " #" + MeshPD.uniqueID; }
MeshPD.SubItems.AddRange(new[] { MeshPD.TypeString, MeshPD.Size.ToString() });
MeshPD.extension = ".obj";
MeshPD.Text = m_Name;
}
}
}

12
Unity Studio/Unity Classes/MonoBehaviour.cs
View File

@ -22,7 +22,6 @@ namespace Unity_Studio
var m_Name = a_Stream.ReadAlignedString(a_Stream.ReadInt32());
if (readSwitch)
{
preloadData.extension = ".txt";
if ((serializedText = preloadData.ViewStruct()) == null)
{
var str = "PPtr<GameObject> m_GameObject\r\n";
@ -38,15 +37,8 @@ namespace Unity_Studio
}
else
{
if (m_Name != "")
{
preloadData.Text = m_Name;
}
else
{
preloadData.Text = preloadData.TypeString + " #" + preloadData.uniqueID;
}
preloadData.SubItems.AddRange(new[] { preloadData.TypeString, preloadData.Size.ToString() });
preloadData.extension = ".txt";
preloadData.Text = m_Name;
}
}
}

6
Unity Studio/Unity Classes/Shader.cs
View File

@ -18,7 +18,6 @@ namespace Unity_Studio
var sourceFile = preloadData.sourceFile;
var a_Stream = preloadData.sourceFile.a_Stream;
a_Stream.Position = preloadData.Offset;
preloadData.extension = ".txt";
if (sourceFile.platform == -2)
{
@ -74,9 +73,8 @@ namespace Unity_Studio
}
else
{
if (m_Name != "") { preloadData.Text = m_Name; }
else { preloadData.Text = preloadData.TypeString + " #" + preloadData.uniqueID; }
preloadData.SubItems.AddRange(new[] { preloadData.TypeString, preloadData.Size.ToString() });
preloadData.extension = ".txt";
preloadData.Text = m_Name;
}
}

6
Unity Studio/Unity Classes/TextAsset.cs
View File

@ -16,7 +16,6 @@ namespace Unity_Studio
var sourceFile = preloadData.sourceFile;
var a_Stream = preloadData.sourceFile.a_Stream;
a_Stream.Position = preloadData.Offset;
preloadData.extension = ".txt";
if (sourceFile.platform == -2)
{
@ -33,9 +32,8 @@ namespace Unity_Studio
}
else
{
if (m_Name != "") { preloadData.Text = m_Name; }
else { preloadData.Text = preloadData.TypeString + " #" + preloadData.uniqueID; }
preloadData.SubItems.AddRange(new[] { preloadData.TypeString, preloadData.Size.ToString() });
preloadData.extension = ".txt";
preloadData.Text = m_Name;
}
}
}

4
Unity Studio/Unity Classes/Texture2D.cs
View File

@ -756,11 +756,9 @@ namespace Unity_Studio
case 1: preloadData.InfoText += "\nWrap mode: Clamp"; break;
}
if (m_Name != "") { preloadData.Text = m_Name; }
else { preloadData.Text = preloadData.TypeString + " #" + preloadData.uniqueID; }
preloadData.Text = m_Name;
if (!string.IsNullOrEmpty(path))
preloadData.fullSize = preloadData.Size + (int)size;
preloadData.SubItems.AddRange(new[] { preloadData.TypeString, preloadData.fullSize.ToString() });
}
}

19
Unity Studio/Unity Classes/VideoClip.cs
View File

@ -24,8 +24,11 @@ namespace Unity_Studio
var m_ProxyHeight = a_Stream.ReadUInt32();
var Width = a_Stream.ReadUInt32();
var Height = a_Stream.ReadUInt32();
var m_PixelAspecRatioNum = a_Stream.ReadUInt32();
var m_PixelAspecRatioDen = a_Stream.ReadUInt32();
if (sourceFile.version[0] == 2017)//2017.x
{
var m_PixelAspecRatioNum = a_Stream.ReadUInt32();
var m_PixelAspecRatioDen = a_Stream.ReadUInt32();
}
var m_FrameRate = a_Stream.ReadDouble();
var m_FrameCount = a_Stream.ReadUInt64();
var m_Format = a_Stream.ReadInt32();
@ -44,16 +47,18 @@ namespace Unity_Studio
}
//StreamedResource m_ExternalResources
var m_Source = a_Stream.ReadAlignedString(a_Stream.ReadInt32());
m_Source = Path.Combine(Path.GetDirectoryName(sourceFile.filePath), m_Source.Replace("archive:/", ""));
if (m_Source != "")
m_Source = Path.Combine(Path.GetDirectoryName(sourceFile.filePath), m_Source.Replace("archive:/", ""));
var m_Offset = a_Stream.ReadUInt64();
var m_Size = a_Stream.ReadUInt64();
var m_HasSplitAlpha = a_Stream.ReadBoolean();
if (readSwitch)
{
if (m_Source == null)
if (string.IsNullOrEmpty(m_Source))
{
m_VideoData = a_Stream.ReadBytes((int)m_Size);
if (m_Size > 0)
m_VideoData = a_Stream.ReadBytes((int)m_Size);
}
else if (File.Exists(m_Source) || File.Exists(m_Source = Path.Combine(Path.GetDirectoryName(sourceFile.filePath), Path.GetFileName(m_Source))))
{
@ -79,11 +84,9 @@ namespace Unity_Studio
else
{
preloadData.extension = Path.GetExtension(m_OriginalPath);
if (m_Name != "") { preloadData.Text = m_Name; }
else { preloadData.Text = preloadData.TypeString + " #" + preloadData.uniqueID; }
preloadData.Text = m_Name;
if (m_Source != null)
preloadData.fullSize = preloadData.Size + (int)m_Size;
preloadData.SubItems.AddRange(new[] { preloadData.TypeString, preloadData.fullSize.ToString() });
}
}
}