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

Remove exportSize

This commit is contained in:
Perfare 2017-01-31 17:13:33 +08:00
parent 86e30c5dc0
commit 7e7397ab7e
8 changed files with 15 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Unity Studio/AssetPreloadData.cs
View File

@ -15,7 +15,6 @@ namespace Unity_Studio
public ushort Type2;
public string TypeString;
public int exportSize;
public string InfoText;
public string extension;

1
Unity Studio/AssetsFile.cs
View File

@ -200,7 +200,6 @@ namespace Unity_Studio
asset.uniqueID = i.ToString(assetIDfmt);
asset.exportSize = asset.Size;
asset.sourceFile = this;
preloadTable.Add(asset.m_PathID, asset);

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

@ -179,8 +179,7 @@ namespace Unity_Studio
if (m_Name != "") { preloadData.Text = m_Name; }
else { preloadData.Text = preloadData.TypeString + " #" + preloadData.uniqueID; }
preloadData.exportSize = (int)m_Size;
preloadData.SubItems.AddRange(new string[] { preloadData.TypeString, m_Size.ToString() });
preloadData.SubItems.AddRange(new string[] { preloadData.TypeString, preloadData.Size.ToString() });
}
}
}

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

@ -188,7 +188,7 @@ namespace Unity_Studio
{
if (m_Name != "") { preloadData.Text = m_Name; }
else { preloadData.Text = preloadData.TypeString + " #" + preloadData.uniqueID; }
preloadData.SubItems.AddRange(new string[] { preloadData.TypeString, preloadData.exportSize.ToString() });
preloadData.SubItems.AddRange(new string[] { preloadData.TypeString, preloadData.Size.ToString() });
}
}
}

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

@ -33,7 +33,7 @@ namespace Unity_Studio
{
if (m_Name != "") { preloadData.Text = m_Name; }
else { preloadData.Text = preloadData.TypeString + " #" + preloadData.uniqueID; }
preloadData.SubItems.AddRange(new string[] { preloadData.TypeString, preloadData.exportSize.ToString() });
preloadData.SubItems.AddRange(new string[] { preloadData.TypeString, preloadData.Size.ToString() });
}
}
else
@ -51,19 +51,12 @@ namespace Unity_Studio
else
{
byte lzmaTest = a_Stream.ReadByte();
if (lzmaTest == 93)
{
a_Stream.Position += 4;
preloadData.exportSize = a_Stream.ReadInt32(); //actualy int64
a_Stream.Position -= 8;
}
else { preloadData.exportSize = m_Script_size; }
a_Stream.Position += m_Script_size - 1;
if (m_Name != "") { preloadData.Text = m_Name; }
else { preloadData.Text = preloadData.TypeString + " #" + preloadData.uniqueID; }
preloadData.SubItems.AddRange(new string[] { preloadData.TypeString, preloadData.exportSize.ToString() });
preloadData.SubItems.AddRange(new string[] { preloadData.TypeString, preloadData.Size.ToString() });
}
a_Stream.AlignStream(4);
m_PathName = a_Stream.ReadAlignedString(a_Stream.ReadInt32());

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

@ -40,19 +40,12 @@ namespace Unity_Studio
else
{
byte lzmaTest = a_Stream.ReadByte();
if (lzmaTest == 93)
{
a_Stream.Position += 4;
preloadData.exportSize = a_Stream.ReadInt32(); //actualy int64
a_Stream.Position -= 8;
}
else { preloadData.exportSize = m_Script_size; }
a_Stream.Position += m_Script_size - 1;
if (m_Name != "") { preloadData.Text = m_Name; }
else { preloadData.Text = preloadData.TypeString + " #" + preloadData.uniqueID; }
preloadData.SubItems.AddRange(new string[] { preloadData.TypeString, preloadData.exportSize.ToString() });
preloadData.SubItems.AddRange(new string[] { preloadData.TypeString, preloadData.Size.ToString() });
}
a_Stream.AlignStream(4);

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

@ -570,7 +570,6 @@ namespace Unity_Studio
else
{
preloadData.InfoText = "Width: " + m_Width.ToString() + "\nHeight: " + m_Height.ToString() + "\nFormat: ";
preloadData.exportSize = image_data_size;
string type = m_TextureFormat.ToString();
preloadData.InfoText += type;
@ -587,7 +586,7 @@ namespace Unity_Studio
case TextureFormat.DXT5:
case TextureFormat.RGBA4444:
case TextureFormat.BGRA32:
preloadData.extension = ".dds"; preloadData.exportSize += 128; break;
preloadData.extension = ".dds"; break;
case TextureFormat.DXT1Crunched:
case TextureFormat.DXT5Crunched:
preloadData.extension = ".crn"; break;
@ -600,7 +599,7 @@ namespace Unity_Studio
case TextureFormat.ETC2_RGB:
case TextureFormat.ETC2_RGBA1:
case TextureFormat.ETC2_RGBA8:
preloadData.extension = ".pvr"; preloadData.exportSize += 52; break;
preloadData.extension = ".pvr"; break;
case TextureFormat.RHalf:
case TextureFormat.RGHalf:
case TextureFormat.RGBAHalf:
@ -617,7 +616,7 @@ namespace Unity_Studio
case TextureFormat.EAC_R_SIGNED:
case TextureFormat.EAC_RG:
case TextureFormat.EAC_RG_SIGNED:
preloadData.extension = ".ktx"; preloadData.exportSize += 68; break;
preloadData.extension = ".ktx"; break;
case TextureFormat.ASTC_RGB_4x4:
case TextureFormat.ASTC_RGB_5x5:
case TextureFormat.ASTC_RGB_6x6:
@ -630,7 +629,7 @@ namespace Unity_Studio
case TextureFormat.ASTC_RGBA_8x8:
case TextureFormat.ASTC_RGBA_10x10:
case TextureFormat.ASTC_RGBA_12x12:
preloadData.extension = ".astc"; preloadData.exportSize += 10; break;
preloadData.extension = ".astc"; break;
default:
preloadData.extension = "_" + type + ".tex"; break;
}
@ -653,7 +652,7 @@ namespace Unity_Studio
if (m_Name != "") { preloadData.Text = m_Name; }
else { preloadData.Text = preloadData.TypeString + " #" + preloadData.uniqueID; }
preloadData.SubItems.AddRange(new string[] { preloadData.TypeString, preloadData.exportSize.ToString() });
preloadData.SubItems.AddRange(new string[] { preloadData.TypeString, preloadData.Size.ToString() });
}
}
}

10
Unity Studio/UnityStudioForm.cs
View File

@ -797,8 +797,8 @@ namespace Unity_Studio
//progressBar1.Value = 0;
//progressBar1.Maximum = totalTreeNodes;
SetProgressBarValue(0);
SetProgressBarMaximum(assetsfileList.Sum(x => x.GameObjectList.Values.Count));
SetProgressBarValue(1);
SetProgressBarMaximum(assetsfileList.Sum(x => x.GameObjectList.Values.Count) + 1);
foreach (var assetsFile in assetsfileList)
{
StatusStripUpdate("Building tree structure from " + Path.GetFileName(assetsFile.filePath));
@ -1115,7 +1115,7 @@ namespace Unity_Studio
{
int xdiff = reverseSort ? b.Text.CompareTo(a.Text) : a.Text.CompareTo(b.Text);
if (xdiff != 0) return xdiff;
else return secondSortColumn == 1 ? a.TypeString.CompareTo(b.TypeString) : a.exportSize.CompareTo(b.exportSize);
else return secondSortColumn == 1 ? a.TypeString.CompareTo(b.TypeString) : a.Size.CompareTo(b.Size);
});
break;
case 1:
@ -1123,13 +1123,13 @@ namespace Unity_Studio
{
int xdiff = reverseSort ? b.TypeString.CompareTo(a.TypeString) : a.TypeString.CompareTo(b.TypeString);
if (xdiff != 0) return xdiff;
else return secondSortColumn == 2 ? a.exportSize.CompareTo(b.exportSize) : a.Text.CompareTo(b.Text);
else return secondSortColumn == 2 ? a.Size.CompareTo(b.Size) : a.Text.CompareTo(b.Text);
});
break;
case 2:
visibleAssets.Sort(delegate (AssetPreloadData a, AssetPreloadData b)
{
int xdiff = reverseSort ? b.exportSize.CompareTo(a.exportSize) : a.exportSize.CompareTo(b.exportSize);
int xdiff = reverseSort ? b.Size.CompareTo(a.Size) : a.Size.CompareTo(b.Size);
if (xdiff != 0) return xdiff;
else return secondSortColumn == 1 ? a.TypeString.CompareTo(b.TypeString) : a.Text.CompareTo(b.Text);
});