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

Fixed #121

Browse Source 
clean up code
This commit is contained in:
Perfare
2018-01-17 06:20:06 +08:00
parent db92daedf0
commit 647ce56f81
12 changed files with 1150 additions and 1235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,8 +112,7 @@ namespace Unity_Studio
}
else
{
EndianBinaryReader estream;
if (UnityStudio.assetsfileandstream.TryGetValue(Path.GetFileName(m_Source), out estream))
if (UnityStudio.assetsfileandstream.TryGetValue(Path.GetFileName(m_Source), out var estream))
{
estream.Position = m_Offset;
m_AudioData = estream.ReadBytes((int)m_Size);

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

@ -42,7 +42,7 @@ namespace Unity_Studio
}
else if (sourceFile.version[0] >= 5)//5.0 and up
{
m_ShaderKeywords = new string[1] { a_Stream.ReadAlignedString(a_Stream.ReadInt32()) };
m_ShaderKeywords = new[] { a_Stream.ReadAlignedString(a_Stream.ReadInt32()) };
uint m_LightmapFlags = a_Stream.ReadUInt32();
if (sourceFile.version[0] == 5 && sourceFile.version[1] >= 6 || sourceFile.version[0] > 5)//5.6.0 and up
{
@ -59,7 +59,7 @@ namespace Unity_Studio
string[][] stringTagMap = new string[a_Stream.ReadInt32()][];
for (int i = 0; i < stringTagMap.Length; i++)
{
stringTagMap[i] = new string[2] { a_Stream.ReadAlignedString(a_Stream.ReadInt32()), a_Stream.ReadAlignedString(a_Stream.ReadInt32()) };
stringTagMap[i] = new[] { a_Stream.ReadAlignedString(a_Stream.ReadInt32()), a_Stream.ReadAlignedString(a_Stream.ReadInt32()) };
}
}
//disabledShaderPasses
@ -79,8 +79,8 @@ namespace Unity_Studio
{
name = a_Stream.ReadAlignedString(a_Stream.ReadInt32()),
m_Texture = sourceFile.ReadPPtr(),
m_Scale = new float[2] { a_Stream.ReadSingle(), a_Stream.ReadSingle() },
m_Offset = new float[2] { a_Stream.ReadSingle(), a_Stream.ReadSingle() }
m_Scale = new[] { a_Stream.ReadSingle(), a_Stream.ReadSingle() },
m_Offset = new[] { a_Stream.ReadSingle(), a_Stream.ReadSingle() }
};
m_TexEnvs[i] = m_TexEnv;
}
@ -102,7 +102,7 @@ namespace Unity_Studio
strColorPair m_Color = new strColorPair()
{
first = a_Stream.ReadAlignedString(a_Stream.ReadInt32()),
second = new float[4] { a_Stream.ReadSingle(), a_Stream.ReadSingle(), a_Stream.ReadSingle(), a_Stream.ReadSingle() }
second = new[] { a_Stream.ReadSingle(), a_Stream.ReadSingle(), a_Stream.ReadSingle(), a_Stream.ReadSingle() }
};
m_Colors[i] = m_Color;
}

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

File diff suppressed because it is too large Load Diff

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

@ -186,8 +186,7 @@ namespace Unity_Studio
}
else
{
EndianBinaryReader estream;
if (UnityStudio.assetsfileandstream.TryGetValue(Path.GetFileName(path), out estream))
if (UnityStudio.assetsfileandstream.TryGetValue(Path.GetFileName(path), out var estream))
{
estream.Position = offset;
image_data = estream.ReadBytes(image_data_size);

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

@ -85,8 +85,7 @@ namespace Unity_Studio
{
preloadData.extension = Path.GetExtension(m_OriginalPath);
preloadData.Text = m_Name;
if (m_Source != null)
preloadData.fullSize = preloadData.Size + (int)m_Size;
preloadData.fullSize = preloadData.Size + (int)m_Size;
}
}
}