From 7e7397ab7e829691711a8ab81260263c5270e5ef Mon Sep 17 00:00:00 2001 From: Perfare Date: Tue, 31 Jan 2017 17:13:33 +0800 Subject: [PATCH] Remove exportSize --- Unity Studio/AssetPreloadData.cs | 1 - Unity Studio/AssetsFile.cs | 1 - Unity Studio/Unity Classes/AudioClip.cs | 3 +-- Unity Studio/Unity Classes/Font.cs | 2 +- Unity Studio/Unity Classes/Shader.cs | 11 ++--------- Unity Studio/Unity Classes/TextAsset.cs | 9 +-------- Unity Studio/Unity Classes/Texture2D.cs | 11 +++++------ Unity Studio/UnityStudioForm.cs | 10 +++++----- 8 files changed, 15 insertions(+), 33 deletions(-) diff --git a/Unity Studio/AssetPreloadData.cs b/Unity Studio/AssetPreloadData.cs index 9acdeee..4bd58f1 100644 --- a/Unity Studio/AssetPreloadData.cs +++ b/Unity Studio/AssetPreloadData.cs @@ -15,7 +15,6 @@ namespace Unity_Studio public ushort Type2; public string TypeString; - public int exportSize; public string InfoText; public string extension; diff --git a/Unity Studio/AssetsFile.cs b/Unity Studio/AssetsFile.cs index 72f856c..e54c0ce 100644 --- a/Unity Studio/AssetsFile.cs +++ b/Unity Studio/AssetsFile.cs @@ -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); diff --git a/Unity Studio/Unity Classes/AudioClip.cs b/Unity Studio/Unity Classes/AudioClip.cs index 4f2bff2..dabb4b6 100644 --- a/Unity Studio/Unity Classes/AudioClip.cs +++ b/Unity Studio/Unity Classes/AudioClip.cs @@ -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() }); } } } diff --git a/Unity Studio/Unity Classes/Font.cs b/Unity Studio/Unity Classes/Font.cs index cb6d954..ac69fdf 100644 --- a/Unity Studio/Unity Classes/Font.cs +++ b/Unity Studio/Unity Classes/Font.cs @@ -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() }); } } } diff --git a/Unity Studio/Unity Classes/Shader.cs b/Unity Studio/Unity Classes/Shader.cs index a273241..41af1ef 100644 --- a/Unity Studio/Unity Classes/Shader.cs +++ b/Unity Studio/Unity Classes/Shader.cs @@ -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()); diff --git a/Unity Studio/Unity Classes/TextAsset.cs b/Unity Studio/Unity Classes/TextAsset.cs index 950506e..efcaddc 100644 --- a/Unity Studio/Unity Classes/TextAsset.cs +++ b/Unity Studio/Unity Classes/TextAsset.cs @@ -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); diff --git a/Unity Studio/Unity Classes/Texture2D.cs b/Unity Studio/Unity Classes/Texture2D.cs index 47cc201..3f6677c 100644 --- a/Unity Studio/Unity Classes/Texture2D.cs +++ b/Unity Studio/Unity Classes/Texture2D.cs @@ -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() }); } } } diff --git a/Unity Studio/UnityStudioForm.cs b/Unity Studio/UnityStudioForm.cs index 116ea37..8e86524 100644 --- a/Unity Studio/UnityStudioForm.cs +++ b/Unity Studio/UnityStudioForm.cs @@ -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); });