From 674c634c2cbf0c7f42b1358ac3ea80c8ee4bc425 Mon Sep 17 00:00:00 2001 From: Perfare Date: Sat, 21 Apr 2018 09:36:10 +0800 Subject: [PATCH] Some improvements --- AssetStudio/Classes/AnimationClip.cs | 14 +-- AssetStudio/Classes/AudioClip.cs | 7 -- AssetStudio/Classes/Font.cs | 7 -- AssetStudio/Classes/GameObject.cs | 7 -- AssetStudio/Classes/Material.cs | 7 -- AssetStudio/Classes/MeshFilter.cs | 7 -- AssetStudio/Classes/MeshRenderer.cs | 7 -- AssetStudio/Classes/Shader.cs | 7 -- AssetStudio/Classes/SkinnedMeshRenderer.cs | 7 -- AssetStudio/Classes/TextAsset.cs | 7 -- AssetStudio/Classes/Texture2D.cs | 7 -- AssetStudio/Classes/Transform.cs | 7 -- AssetStudio/StudioClasses/FBXExporter.cs | 4 +- AssetStudio/StudioClasses/ModelConverter.cs | 6 +- AssetStudio/StudioClasses/Studio.cs | 6 +- AssetStudioUtility/Imported.cs | 4 - AssetStudioUtility/ObjChildren.cs | 98 ++++++++++----------- 17 files changed, 53 insertions(+), 156 deletions(-) diff --git a/AssetStudio/Classes/AnimationClip.cs b/AssetStudio/Classes/AnimationClip.cs index c9815a5..bf218da 100644 --- a/AssetStudio/Classes/AnimationClip.cs +++ b/AssetStudio/Classes/AnimationClip.cs @@ -621,9 +621,8 @@ namespace AssetStudio public GenericBinding FindBinding(int index) { int curves = 0; - for (int i = 0; i < genericBindings.Count; i++) + foreach (var b in genericBindings) { - GenericBinding b = genericBindings[i]; curves += b.attribute == 2 ? 4 : b.attribute <= 4 ? 3 : 1; if (curves > index) { @@ -633,17 +632,6 @@ namespace AssetStudio return null; } - - public GenericBinding FindBinding(uint path, uint attribute) - { - return genericBindings.Find - ( - delegate (GenericBinding b) - { - return b.path == path && b.attribute == attribute; - } - ); - } } public class AnimationClip diff --git a/AssetStudio/Classes/AudioClip.cs b/AssetStudio/Classes/AudioClip.cs index 9a4a7b2..fd9d893 100644 --- a/AssetStudio/Classes/AudioClip.cs +++ b/AssetStudio/Classes/AudioClip.cs @@ -40,13 +40,6 @@ namespace AssetStudio var sourceFile = preloadData.sourceFile; var reader = preloadData.InitReader(); - if (sourceFile.platform == -2) - { - uint m_ObjectHideFlags = reader.ReadUInt32(); - PPtr m_PrefabParentObject = sourceFile.ReadPPtr(); - PPtr m_PrefabInternal = sourceFile.ReadPPtr(); - } - m_Name = reader.ReadAlignedString(); version5 = sourceFile.version[0] >= 5; if (sourceFile.version[0] < 5) diff --git a/AssetStudio/Classes/Font.cs b/AssetStudio/Classes/Font.cs index c35f997..fe37e97 100644 --- a/AssetStudio/Classes/Font.cs +++ b/AssetStudio/Classes/Font.cs @@ -15,13 +15,6 @@ namespace AssetStudio var sourceFile = preloadData.sourceFile; var reader = preloadData.InitReader(); - if (sourceFile.platform == -2) - { - uint m_ObjectHideFlags = reader.ReadUInt32(); - PPtr m_PrefabParentObject = sourceFile.ReadPPtr(); - PPtr m_PrefabInternal = sourceFile.ReadPPtr(); - } - m_Name = reader.ReadAlignedString(); if (readSwitch) diff --git a/AssetStudio/Classes/GameObject.cs b/AssetStudio/Classes/GameObject.cs index 6c5d5c5..fd2e4ba 100644 --- a/AssetStudio/Classes/GameObject.cs +++ b/AssetStudio/Classes/GameObject.cs @@ -33,13 +33,6 @@ namespace AssetStudio uniqueID = preloadData.uniqueID; - if (sourceFile.platform == -2) - { - uint m_ObjectHideFlags = reader.ReadUInt32(); - PPtr m_PrefabParentObject = sourceFile.ReadPPtr(); - PPtr m_PrefabInternal = sourceFile.ReadPPtr(); - } - int m_Component_size = reader.ReadInt32(); for (int j = 0; j < m_Component_size; j++) { diff --git a/AssetStudio/Classes/Material.cs b/AssetStudio/Classes/Material.cs index d6d999c..5c28e92 100644 --- a/AssetStudio/Classes/Material.cs +++ b/AssetStudio/Classes/Material.cs @@ -40,13 +40,6 @@ namespace AssetStudio var sourceFile = preloadData.sourceFile; var reader = preloadData.InitReader(); - if (sourceFile.platform == -2) - { - uint m_ObjectHideFlags = reader.ReadUInt32(); - PPtr m_PrefabParentObject = sourceFile.ReadPPtr(); - PPtr m_PrefabInternal = sourceFile.ReadPPtr(); - } - m_Name = reader.ReadAlignedString(); m_Shader = sourceFile.ReadPPtr(); diff --git a/AssetStudio/Classes/MeshFilter.cs b/AssetStudio/Classes/MeshFilter.cs index aafa0d9..04d1469 100644 --- a/AssetStudio/Classes/MeshFilter.cs +++ b/AssetStudio/Classes/MeshFilter.cs @@ -16,13 +16,6 @@ namespace AssetStudio var sourceFile = preloadData.sourceFile; var reader = preloadData.InitReader(); - if (sourceFile.platform == -2) - { - uint m_ObjectHideFlags = reader.ReadUInt32(); - PPtr m_PrefabParentObject = sourceFile.ReadPPtr(); - PPtr m_PrefabInternal = sourceFile.ReadPPtr(); - } - m_GameObject = sourceFile.ReadPPtr(); m_Mesh = sourceFile.ReadPPtr(); } diff --git a/AssetStudio/Classes/MeshRenderer.cs b/AssetStudio/Classes/MeshRenderer.cs index 1490760..cea7f61 100644 --- a/AssetStudio/Classes/MeshRenderer.cs +++ b/AssetStudio/Classes/MeshRenderer.cs @@ -22,13 +22,6 @@ namespace AssetStudio var sourceFile = preloadData.sourceFile; var reader = preloadData.InitReader(); - if (sourceFile.platform == -2) - { - uint m_ObjectHideFlags = reader.ReadUInt32(); - PPtr m_PrefabParentObject = sourceFile.ReadPPtr(); - PPtr m_PrefabInternal = sourceFile.ReadPPtr(); - } - m_GameObject = sourceFile.ReadPPtr(); if (sourceFile.version[0] < 5) diff --git a/AssetStudio/Classes/Shader.cs b/AssetStudio/Classes/Shader.cs index 48e85b3..a7f804f 100644 --- a/AssetStudio/Classes/Shader.cs +++ b/AssetStudio/Classes/Shader.cs @@ -18,13 +18,6 @@ namespace AssetStudio var sourceFile = preloadData.sourceFile; var reader = preloadData.InitReader(); - if (sourceFile.platform == -2) - { - uint m_ObjectHideFlags = reader.ReadUInt32(); - PPtr m_PrefabParentObject = sourceFile.ReadPPtr(); - PPtr m_PrefabInternal = sourceFile.ReadPPtr(); - } - m_Name = reader.ReadAlignedString(); if (readSwitch) diff --git a/AssetStudio/Classes/SkinnedMeshRenderer.cs b/AssetStudio/Classes/SkinnedMeshRenderer.cs index f95d000..1683096 100644 --- a/AssetStudio/Classes/SkinnedMeshRenderer.cs +++ b/AssetStudio/Classes/SkinnedMeshRenderer.cs @@ -17,13 +17,6 @@ namespace AssetStudio var version = preloadData.sourceFile.version; var reader = preloadData.InitReader(); - if (sourceFile.platform == -2) - { - uint m_ObjectHideFlags = reader.ReadUInt32(); - PPtr m_PrefabParentObject = sourceFile.ReadPPtr(); - PPtr m_PrefabInternal = sourceFile.ReadPPtr(); - } - m_GameObject = sourceFile.ReadPPtr(); if (sourceFile.version[0] < 5) { diff --git a/AssetStudio/Classes/TextAsset.cs b/AssetStudio/Classes/TextAsset.cs index 89fabfe..fdbde6a 100644 --- a/AssetStudio/Classes/TextAsset.cs +++ b/AssetStudio/Classes/TextAsset.cs @@ -16,13 +16,6 @@ namespace AssetStudio var sourceFile = preloadData.sourceFile; var reader = preloadData.InitReader(); - if (sourceFile.platform == -2) - { - uint m_ObjectHideFlags = reader.ReadUInt32(); - PPtr m_PrefabParentObject = sourceFile.ReadPPtr(); - PPtr m_PrefabInternal = sourceFile.ReadPPtr(); - } - m_Name = reader.ReadAlignedString(); if (readSwitch) diff --git a/AssetStudio/Classes/Texture2D.cs b/AssetStudio/Classes/Texture2D.cs index b165f18..950b234 100644 --- a/AssetStudio/Classes/Texture2D.cs +++ b/AssetStudio/Classes/Texture2D.cs @@ -45,13 +45,6 @@ namespace AssetStudio var reader = preloadData.InitReader(); var version = sourceFile.version; - if (sourceFile.platform == -2) - { - uint m_ObjectHideFlags = reader.ReadUInt32(); - PPtr m_PrefabParentObject = sourceFile.ReadPPtr(); - PPtr m_PrefabInternal = sourceFile.ReadPPtr(); - } - m_Name = reader.ReadAlignedString(); if (version[0] > 2017 || (version[0] == 2017 && version[1] >= 3))//2017.3 and up { diff --git a/AssetStudio/Classes/Transform.cs b/AssetStudio/Classes/Transform.cs index 41cb3fd..1b83db7 100644 --- a/AssetStudio/Classes/Transform.cs +++ b/AssetStudio/Classes/Transform.cs @@ -19,13 +19,6 @@ namespace AssetStudio var sourceFile = preloadData.sourceFile; var reader = preloadData.InitReader(); - if (sourceFile.platform == -2) - { - uint m_ObjectHideFlags = reader.ReadUInt32(); - PPtr m_PrefabParentObject = sourceFile.ReadPPtr(); - PPtr m_PrefabInternal = sourceFile.ReadPPtr(); - } - m_GameObject = sourceFile.ReadPPtr(); m_LocalRotation = new[] { reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle() }; m_LocalPosition = new[] { reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle() }; diff --git a/AssetStudio/StudioClasses/FBXExporter.cs b/AssetStudio/StudioClasses/FBXExporter.cs index 9659c73..66677b2 100644 --- a/AssetStudio/StudioClasses/FBXExporter.cs +++ b/AssetStudio/StudioClasses/FBXExporter.cs @@ -967,9 +967,9 @@ namespace AssetStudio else { lineSplit = ob.Length; - for (int i = 0; i < m_Mesh.m_materialIDs.Count; i++) + foreach (var m_materialID in m_Mesh.m_materialIDs) { - ob.AppendFormat("{0},", m_Mesh.m_materialIDs[i]); + ob.AppendFormat("{0},", m_materialID); if (ob.Length - lineSplit > 2000) { diff --git a/AssetStudio/StudioClasses/ModelConverter.cs b/AssetStudio/StudioClasses/ModelConverter.cs index 8194b65..bc74883 100644 --- a/AssetStudio/StudioClasses/ModelConverter.cs +++ b/AssetStudio/StudioClasses/ModelConverter.cs @@ -213,8 +213,6 @@ namespace AssetStudio { var submesh = mesh.m_SubMeshes[i]; var iSubmesh = new ImportedSubmesh(); - iSubmesh.Index = i; - iSubmesh.Visible = true; Material mat = null; if (i < meshR.m_Materials.Length) { @@ -867,9 +865,9 @@ namespace AssetStudio private static ImportedVertex GetSourceVertex(List submeshList, int morphVertIndex) { - for (int i = 0; i < submeshList.Count; i++) + foreach (var submesh in submeshList) { - List vertList = submeshList[i].VertexList; + var vertList = submesh.VertexList; if (morphVertIndex < vertList.Count) { return vertList[morphVertIndex]; diff --git a/AssetStudio/StudioClasses/Studio.cs b/AssetStudio/StudioClasses/Studio.cs index b7e85d8..ea46516 100644 --- a/AssetStudio/StudioClasses/Studio.cs +++ b/AssetStudio/StudioClasses/Studio.cs @@ -414,12 +414,10 @@ namespace AssetStudio ProgressBarPerformStep(); } - - if (fileNode.Nodes.Count == 0) + if (fileNode.Nodes.Count > 0) { - fileNode.Text += " (no children)"; + fileNodes.Add(fileNode); } - fileNodes.Add(fileNode); } if (File.Exists(mainPath + "\\materials.json")) diff --git a/AssetStudioUtility/Imported.cs b/AssetStudioUtility/Imported.cs index 1355ede..a48f156 100644 --- a/AssetStudioUtility/Imported.cs +++ b/AssetStudioUtility/Imported.cs @@ -19,7 +19,6 @@ namespace AssetStudio { public string Name { get; set; } public Matrix Matrix { get; set; } - public dynamic Parent { get; set; } } @@ -35,9 +34,6 @@ namespace AssetStudio public List VertexList { get; set; } public List FaceList { get; set; } public string Material { get; set; } - public int Index { get; set; } - public bool WorldCoords { get; set; } - public bool Visible { get; set; } } public class ImportedVertex diff --git a/AssetStudioUtility/ObjChildren.cs b/AssetStudioUtility/ObjChildren.cs index 1076f6b..4b90853 100644 --- a/AssetStudioUtility/ObjChildren.cs +++ b/AssetStudioUtility/ObjChildren.cs @@ -5,67 +5,61 @@ using System.IO; namespace AssetStudio { - public interface IObjChild - { - dynamic Parent { get; set; } - } + public interface IObjChild + { + dynamic Parent { get; set; } + } - public abstract class ObjChildren : IEnumerable where T : IObjChild - { - protected List children; + public abstract class ObjChildren : IEnumerable where T : IObjChild + { + protected List children; - public T this[int i] - { - get { return (T)children[i]; } - } + public T this[int i] => children[i]; - public int Count - { - get { return children.Count; } - } + public int Count => children.Count; - public void InitChildren(int count) - { - children = new List(count); - } + public void InitChildren(int count) + { + children = new List(count); + } - public void AddChild(T obj) - { - children.Add(obj); - obj.Parent = this; - } + public void AddChild(T obj) + { + children.Add(obj); + obj.Parent = this; + } - public void InsertChild(int i, T obj) - { - children.Insert(i, obj); - obj.Parent = this; - } + public void InsertChild(int i, T obj) + { + children.Insert(i, obj); + obj.Parent = this; + } - public void RemoveChild(T obj) - { - obj.Parent = null; - children.Remove(obj); - } + public void RemoveChild(T obj) + { + obj.Parent = null; + children.Remove(obj); + } - public void RemoveChild(int i) - { - children[i].Parent = null; - children.RemoveAt(i); - } + public void RemoveChild(int i) + { + children[i].Parent = null; + children.RemoveAt(i); + } - public int IndexOf(T obj) - { - return children.IndexOf(obj); - } + public int IndexOf(T obj) + { + return children.IndexOf(obj); + } - public IEnumerator GetEnumerator() - { - return children.GetEnumerator(); - } + public IEnumerator GetEnumerator() + { + return children.GetEnumerator(); + } - IEnumerator IEnumerable.GetEnumerator() - { - return GetEnumerator(); - } - } + IEnumerator IEnumerable.GetEnumerator() + { + return GetEnumerator(); + } + } }