mirror/AssetStudio
1
0
Fork 0
mirror of https://github.com/aelurum/AssetStudio.git synced 2025-05-25 05:40:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

clean up code

Browse Source
This commit is contained in:
Perfare 2019-07-28 03:47:12 +08:00
parent 4a46f897bd
commit b1ea8dd346
2 changed files with 34 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
AssetStudioGUI/AssetStudioGUIForm.cs
View File

@ -684,10 +684,10 @@ namespace AssetStudioGUI
break; break;
case Animator _: case Animator _:
StatusStripUpdate("Can be exported to FBX file."); StatusStripUpdate("Can be exported to FBX file.");
break; goto default;
case AnimationClip _: case AnimationClip _:
StatusStripUpdate("Can be exported with Animator or Objects"); StatusStripUpdate("Can be exported with Animator or Objects");
break; goto default;
default: default:
var str = assetItem.Asset.Dump(); var str = assetItem.Asset.Dump();
if (str != null) if (str != null)
@ -695,10 +695,6 @@ namespace AssetStudioGUI
textPreviewBox.Text = str; textPreviewBox.Text = str;
textPreviewBox.Visible = true; textPreviewBox.Visible = true;
} }
else
{
StatusStripUpdate("Only supported export the raw file.");
}
break; break;
} }
} }
@ -1790,22 +1786,15 @@ namespace AssetStudioGUI
private void exportSelectedObjectsToolStripMenuItem_Click(object sender, EventArgs e) private void exportSelectedObjectsToolStripMenuItem_Click(object sender, EventArgs e)
{ {
if (sceneTreeView.Nodes.Count > 0) ExportObjects(false);
{
var saveFolderDialog1 = new OpenFolderDialog();
if (saveFolderDialog1.ShowDialog(this) == DialogResult.OK)
{
var exportPath = saveFolderDialog1.Folder + "\\GameObject\\";
ExportObjectsWithAnimationClip(exportPath, sceneTreeView.Nodes, openAfterExport.Checked);
}
}
else
{
StatusStripUpdate("No Objects available for export");
}
} }
private void exportObjectswithAnimationClipMenuItem_Click(object sender, EventArgs e) private void exportObjectswithAnimationClipMenuItem_Click(object sender, EventArgs e)
{
ExportObjects(true);
}
private void ExportObjects(bool animation)
{ {
if (sceneTreeView.Nodes.Count > 0) if (sceneTreeView.Nodes.Count > 0)
{ {
@ -1813,8 +1802,16 @@ namespace AssetStudioGUI
if (saveFolderDialog1.ShowDialog(this) == DialogResult.OK) if (saveFolderDialog1.ShowDialog(this) == DialogResult.OK)
{ {
var exportPath = saveFolderDialog1.Folder + "\\GameObject\\"; var exportPath = saveFolderDialog1.Folder + "\\GameObject\\";
var animationList = GetSelectedAssets().Where(x => x.Type == ClassIDType.AnimationClip).ToList(); List<AssetItem> animationList = null;
ExportObjectsWithAnimationClip(exportPath, sceneTreeView.Nodes, openAfterExport.Checked, animationList.Count == 0 ? null : animationList); if (animation)
{
animationList = GetSelectedAssets().Where(x => x.Type == ClassIDType.AnimationClip).ToList();
if (animationList.Count == 0)
{
animationList = null;
}
}
ExportObjectsWithAnimationClip(exportPath, sceneTreeView.Nodes, openAfterExport.Checked, animationList);
} }
} }
else else
@ -1825,23 +1822,15 @@ namespace AssetStudioGUI
private void exportSelectedObjectsmergeToolStripMenuItem_Click(object sender, EventArgs e) private void exportSelectedObjectsmergeToolStripMenuItem_Click(object sender, EventArgs e)
{ {
if (sceneTreeView.Nodes.Count > 0) ExportMergeObjects(false);
{
var gameObjects = new List<GameObject>();
GetSelectedParentNode(sceneTreeView.Nodes, gameObjects);
var saveFileDialog = new SaveFileDialog();
saveFileDialog.FileName = gameObjects[0].m_Name + " (merge).fbx";
saveFileDialog.AddExtension = false;
saveFileDialog.Filter = "Fbx file (*.fbx)|*.fbx";
if (saveFileDialog.ShowDialog() == DialogResult.OK)
{
var exportPath = saveFileDialog.FileName;
ExportObjectsMergeWithAnimationClip(exportPath, openAfterExport.Checked, gameObjects);
}
}
} }
private void exportSelectedObjectsmergeWithAnimationClipToolStripMenuItem_Click(object sender, EventArgs e) private void exportSelectedObjectsmergeWithAnimationClipToolStripMenuItem_Click(object sender, EventArgs e)
{
ExportMergeObjects(true);
}
private void ExportMergeObjects(bool animation)
{ {
if (sceneTreeView.Nodes.Count > 0) if (sceneTreeView.Nodes.Count > 0)
{ {
@ -1854,8 +1843,16 @@ namespace AssetStudioGUI
if (saveFileDialog.ShowDialog() == DialogResult.OK) if (saveFileDialog.ShowDialog() == DialogResult.OK)
{ {
var exportPath = saveFileDialog.FileName; var exportPath = saveFileDialog.FileName;
var animationList = GetSelectedAssets().Where(x => x.Type == ClassIDType.AnimationClip).ToList(); List<AssetItem> animationList = null;
ExportObjectsMergeWithAnimationClip(exportPath, openAfterExport.Checked, gameObjects, animationList.Count == 0 ? null : animationList); if (animation)
{
animationList = GetSelectedAssets().Where(x => x.Type == ClassIDType.AnimationClip).ToList();
if (animationList.Count == 0)
{
animationList = null;
}
}
ExportObjectsMergeWithAnimationClip(exportPath, openAfterExport.Checked, gameObjects, animationList);
} }
} }
} }

22
AssetStudioUtility/ModelConverter.cs
View File

@ -888,28 +888,6 @@ namespace AssetStudio
return boneName; return boneName;
} }
private static string BlendShapeNameGroup(Mesh mesh, int index)
{
string name = mesh.m_Shapes.channels[index].name;
int dotPos = name.IndexOf('.');
if (dotPos >= 0)
{
return name.Substring(0, dotPos);
}
return "Ungrouped";
}
private static string BlendShapeNameExtension(Mesh mesh, int index)
{
string name = mesh.m_Shapes.channels[index].name;
int dotPos = name.IndexOf('.');
if (dotPos >= 0)
{
return name.Substring(dotPos + 1);
}
return name;
}
private static ImportedVertex GetSourceVertex(List<ImportedSubmesh> submeshList, int morphVertIndex) private static ImportedVertex GetSourceVertex(List<ImportedSubmesh> submeshList, int morphVertIndex)
{ {
foreach (var submesh in submeshList) foreach (var submesh in submeshList)