chizui/YarikStudio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- [GUI] Change Scene Hierarchy root node to be original file when available.

Browse Source
This commit is contained in:
Razmoth
2023-09-19 18:35:04 +04:00
parent 2e3dcdc5d9
commit 8b49dd5868
2 changed files with 92 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
AssetStudioGUI/AssetStudioGUIForm.cs
View File

@@ -640,7 +640,7 @@ namespace AssetStudioGUI
if (saveFileDialog.ShowDialog(this) == DialogResult.OK) if (saveFileDialog.ShowDialog(this) == DialogResult.OK)
{ {
var path = saveFileDialog.FileName; var path = saveFileDialog.FileName;
var nodes = new Dictionary<string, dynamic>(); var nodes = new Dictionary<string, object>();
foreach (TreeNode node in sceneTreeView.Nodes) foreach (TreeNode node in sceneTreeView.Nodes)
{ {
var value = GetNode(node); var value = GetNode(node);
@@ -652,21 +652,32 @@ namespace AssetStudioGUI
} }
} }
private dynamic GetNode(TreeNode treeNode) private object GetNode(TreeNode treeNode)
{ {
if (treeNode.GetNodeCount(true) == 0) var nodes = new Dictionary<string, object>();
foreach (TreeNode node in treeNode.Nodes)
{ {
return string.Empty; if (HasGameObjectNode(node))
}
else
{
var nodes = new Dictionary<string, dynamic>();
var exportableNodes = treeNode.Nodes.Cast<GameObjectTreeNode>().Where(x => x.gameObject.m_Animator != null || (bool)x.gameObject.m_Transform?.m_Father.IsNull).ToList();
foreach (TreeNode node in exportableNodes)
{ {
nodes.TryAdd(node.Text, GetNode(node)); nodes.TryAdd(node.Text, GetNode(node));
} }
return nodes; }
return nodes.Count == 0 ? string.Empty : nodes;
}
private bool HasGameObjectNode(TreeNode treeNode)
{
if (treeNode is GameObjectTreeNode gameObjectNode && !(bool)gameObjectNode.gameObject.m_Transform?.m_Father.IsNull)
{
return gameObjectNode.gameObject.m_Animator != null;
}
else
{
foreach (TreeNode node in treeNode.Nodes)
{
return HasGameObjectNode(node);
}
return false;
} }
} }

123
AssetStudioGUI/Studio.cs
View File

@@ -421,79 +421,96 @@ namespace AssetStudioGUI
var treeNodeCollection = new List<TreeNode>(); var treeNodeCollection = new List<TreeNode>();
var treeNodeDictionary = new Dictionary<GameObject, GameObjectTreeNode>(); var treeNodeDictionary = new Dictionary<GameObject, GameObjectTreeNode>();
var assetsFileCount = assetsManager.assetsFileList.Count;
int j = 0; int j = 0;
Progress.Reset(); Progress.Reset();
foreach (var assetsFile in assetsManager.assetsFileList) var files = assetsManager.assetsFileList.GroupBy(x => x.originalPath ?? string.Empty).OrderBy(x => x.Key).ToDictionary(x => x.Key, x => x.ToList());
foreach (var (file, assetsFiles) in files)
{ {
var fileNode = new TreeNode(assetsFile.fileName); //RootNode var fileNode = !string.IsNullOrEmpty(file) ? new TreeNode(Path.GetFileName(file)) : null; //RootNode
foreach (var obj in assetsFile.Objects) foreach (var assetsFile in assetsFiles)
{ {
if (assetsManager.tokenSource.IsCancellationRequested) var assetsFileNode = new TreeNode(assetsFile.fileName);
foreach (var obj in assetsFile.Objects)
{ {
Logger.Info("Building tree structure been cancelled !!"); if (assetsManager.tokenSource.IsCancellationRequested)
return (string.Empty, Array.Empty<TreeNode>().ToList()); {
Logger.Info("Building tree structure been cancelled !!");
return (string.Empty, Array.Empty<TreeNode>().ToList());
}
if (obj is GameObject m_GameObject)
{
if (!treeNodeDictionary.TryGetValue(m_GameObject, out var currentNode))
{
currentNode = new GameObjectTreeNode(m_GameObject);
treeNodeDictionary.Add(m_GameObject, currentNode);
}
foreach (var pptr in m_GameObject.m_Components)
{
if (pptr.TryGet(out var m_Component))
{
objectAssetItemDic[m_Component].TreeNode = currentNode;
if (m_Component is MeshFilter m_MeshFilter)
{
if (m_MeshFilter.m_Mesh.TryGet(out var m_Mesh))
{
objectAssetItemDic[m_Mesh].TreeNode = currentNode;
}
}
else if (m_Component is SkinnedMeshRenderer m_SkinnedMeshRenderer)
{
if (m_SkinnedMeshRenderer.m_Mesh.TryGet(out var m_Mesh))
{
objectAssetItemDic[m_Mesh].TreeNode = currentNode;
}
}
}
}
var parentNode = assetsFileNode;
if (m_GameObject.m_Transform != null)
{
if (m_GameObject.m_Transform.m_Father.TryGet(out var m_Father))
{
if (m_Father.m_GameObject.TryGet(out var parentGameObject))
{
if (!treeNodeDictionary.TryGetValue(parentGameObject, out var parentGameObjectNode))
{
parentGameObjectNode = new GameObjectTreeNode(parentGameObject);
treeNodeDictionary.Add(parentGameObject, parentGameObjectNode);
}
parentNode = parentGameObjectNode;
}
}
}
parentNode.Nodes.Add(currentNode);
}
} }
if (obj is GameObject m_GameObject) if (assetsFileNode.Nodes.Count > 0)
{ {
if (!treeNodeDictionary.TryGetValue(m_GameObject, out var currentNode)) if (fileNode == null)
{ {
currentNode = new GameObjectTreeNode(m_GameObject); treeNodeCollection.Add(assetsFileNode);
treeNodeDictionary.Add(m_GameObject, currentNode);
} }
else
foreach (var pptr in m_GameObject.m_Components)
{ {
if (pptr.TryGet(out var m_Component)) fileNode.Nodes.Add(assetsFileNode);
{
objectAssetItemDic[m_Component].TreeNode = currentNode;
if (m_Component is MeshFilter m_MeshFilter)
{
if (m_MeshFilter.m_Mesh.TryGet(out var m_Mesh))
{
objectAssetItemDic[m_Mesh].TreeNode = currentNode;
}
}
else if (m_Component is SkinnedMeshRenderer m_SkinnedMeshRenderer)
{
if (m_SkinnedMeshRenderer.m_Mesh.TryGet(out var m_Mesh))
{
objectAssetItemDic[m_Mesh].TreeNode = currentNode;
}
}
}
} }
var parentNode = fileNode;
if (m_GameObject.m_Transform != null)
{
if (m_GameObject.m_Transform.m_Father.TryGet(out var m_Father))
{
if (m_Father.m_GameObject.TryGet(out var parentGameObject))
{
if (!treeNodeDictionary.TryGetValue(parentGameObject, out var parentGameObjectNode))
{
parentGameObjectNode = new GameObjectTreeNode(parentGameObject);
treeNodeDictionary.Add(parentGameObject, parentGameObjectNode);
}
parentNode = parentGameObjectNode;
}
}
}
parentNode.Nodes.Add(currentNode);
} }
} }
if (fileNode.Nodes.Count > 0) if (fileNode?.Nodes.Count > 0)
{ {
treeNodeCollection.Add(fileNode); treeNodeCollection.Add(fileNode);
} }
Progress.Report(++j, assetsFileCount); Progress.Report(++j, files.Count);
} }
treeNodeDictionary.Clear(); treeNodeDictionary.Clear();