mirror of
https://github.com/aelurum/AssetStudio.git
synced 2026-11-15 19:28:48 -05:00
Add option to dump material assets during model export
This commit is contained in:
@@ -89,6 +89,8 @@ namespace AssetStudio
|
|||||||
public sealed class Material : NamedObject
|
public sealed class Material : NamedObject
|
||||||
{
|
{
|
||||||
public PPtr<Shader> m_Shader;
|
public PPtr<Shader> m_Shader;
|
||||||
|
public string[] m_ValidKeywords;
|
||||||
|
public string[] m_InvalidKeywords;
|
||||||
public UnityPropertySheet m_SavedProperties;
|
public UnityPropertySheet m_SavedProperties;
|
||||||
|
|
||||||
public Material() { }
|
public Material() { }
|
||||||
@@ -97,6 +99,8 @@ namespace AssetStudio
|
|||||||
{
|
{
|
||||||
var parsedMaterial = JsonSerializer.Deserialize<Material>(type, jsonOptions);
|
var parsedMaterial = JsonSerializer.Deserialize<Material>(type, jsonOptions);
|
||||||
m_Shader = parsedMaterial.m_Shader;
|
m_Shader = parsedMaterial.m_Shader;
|
||||||
|
m_ValidKeywords = parsedMaterial.m_ValidKeywords;
|
||||||
|
m_InvalidKeywords = parsedMaterial.m_InvalidKeywords;
|
||||||
m_SavedProperties = parsedMaterial.m_SavedProperties;
|
m_SavedProperties = parsedMaterial.m_SavedProperties;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -111,8 +115,8 @@ namespace AssetStudio
|
|||||||
|
|
||||||
if (version >= (2021, 2, 18)) //2021.2.18 and up
|
if (version >= (2021, 2, 18)) //2021.2.18 and up
|
||||||
{
|
{
|
||||||
var m_ValidKeywords = reader.ReadStringArray();
|
m_ValidKeywords = reader.ReadStringArray();
|
||||||
var m_InvalidKeywords = reader.ReadStringArray();
|
m_InvalidKeywords = reader.ReadStringArray();
|
||||||
}
|
}
|
||||||
else if (version >= 5) //5.0 - 2021.2.17
|
else if (version >= 5) //5.0 - 2021.2.17
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -281,7 +281,7 @@ namespace AssetStudioCLI
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void ExportFbx(IImported convert, string exportPath)
|
private static void ExportFbx(ModelConverter convert, string exportPath)
|
||||||
{
|
{
|
||||||
var fbxSettings = new Fbx.Settings
|
var fbxSettings = new Fbx.Settings
|
||||||
{
|
{
|
||||||
@@ -289,8 +289,25 @@ namespace AssetStudioCLI
|
|||||||
ScaleFactor = CLIOptions.o_fbxScaleFactor.Value,
|
ScaleFactor = CLIOptions.o_fbxScaleFactor.Value,
|
||||||
ExportAllUvsAsDiffuseMaps = CLIOptions.f_fbxUvsAsDiffuseMaps.Value,
|
ExportAllUvsAsDiffuseMaps = CLIOptions.f_fbxUvsAsDiffuseMaps.Value,
|
||||||
ExportAnimations = CLIOptions.o_fbxAnimMode.Value != AnimationExportMode.Skip,
|
ExportAnimations = CLIOptions.o_fbxAnimMode.Value != AnimationExportMode.Skip,
|
||||||
|
DumpMaterials = CLIOptions.f_fbxDumpMaterials.Value,
|
||||||
};
|
};
|
||||||
ModelExporter.ExportFbx(exportPath, convert, fbxSettings);
|
ModelExporter.ExportFbx(exportPath, convert, fbxSettings);
|
||||||
|
if (!fbxSettings.DumpMaterials || convert.MaterialAssetSet.Count == 0 || !File.Exists(exportPath))
|
||||||
|
return;
|
||||||
|
|
||||||
|
var exportDir = Path.Combine(Path.GetDirectoryName(exportPath), "Materials");
|
||||||
|
Directory.CreateDirectory(exportDir);
|
||||||
|
foreach (var mat in convert.MaterialAssetSet)
|
||||||
|
{
|
||||||
|
var jsonDoc = mat.ToJsonDoc();
|
||||||
|
var str = System.Text.Json.JsonSerializer.Serialize(jsonDoc, Object.JsonOptions);
|
||||||
|
var exportFullPath = Path.Combine(exportDir, $"{mat.m_Name}.json");
|
||||||
|
if (File.Exists(exportFullPath))
|
||||||
|
{
|
||||||
|
exportFullPath = Path.Combine(exportDir, $"{mat.m_Name} #{mat.GetHashCode():x}.json");
|
||||||
|
}
|
||||||
|
File.WriteAllText(exportFullPath, str);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static bool ExportRawFile(AssetItem item, string exportPath)
|
public static bool ExportRawFile(AssetItem item, string exportPath)
|
||||||
|
|||||||
@@ -120,6 +120,7 @@ namespace AssetStudioCLI.Options
|
|||||||
public static Option<float> o_fbxScaleFactor;
|
public static Option<float> o_fbxScaleFactor;
|
||||||
public static Option<int> o_fbxBoneSize;
|
public static Option<int> o_fbxBoneSize;
|
||||||
public static Option<AnimationExportMode> o_fbxAnimMode;
|
public static Option<AnimationExportMode> o_fbxAnimMode;
|
||||||
|
public static Option<bool> f_fbxDumpMaterials;
|
||||||
public static Option<bool> f_fbxUvsAsDiffuseMaps;
|
public static Option<bool> f_fbxUvsAsDiffuseMaps;
|
||||||
//filter
|
//filter
|
||||||
public static Option<List<string>> o_filterByName;
|
public static Option<List<string>> o_filterByName;
|
||||||
@@ -417,6 +418,14 @@ namespace AssetStudioCLI.Options
|
|||||||
optionExample: "Example: \"--fbx-animation skip\"\n",
|
optionExample: "Example: \"--fbx-animation skip\"\n",
|
||||||
optionHelpGroup: HelpGroups.FBX
|
optionHelpGroup: HelpGroups.FBX
|
||||||
);
|
);
|
||||||
|
f_fbxDumpMaterials = new GroupedOption<bool>
|
||||||
|
(
|
||||||
|
optionDefaultValue: false,
|
||||||
|
optionName: "--fbx-dump-materials",
|
||||||
|
optionDescription: "(Flag) If specified, Studio will dump model-related Material assets along with a model\n",
|
||||||
|
optionExample: "",
|
||||||
|
optionHelpGroup: HelpGroups.FBX
|
||||||
|
);
|
||||||
f_fbxUvsAsDiffuseMaps = new GroupedOption<bool>
|
f_fbxUvsAsDiffuseMaps = new GroupedOption<bool>
|
||||||
(
|
(
|
||||||
optionDefaultValue: false,
|
optionDefaultValue: false,
|
||||||
@@ -781,6 +790,17 @@ namespace AssetStudioCLI.Options
|
|||||||
f_l2dForceBezier.Value = true;
|
f_l2dForceBezier.Value = true;
|
||||||
flagIndexes.Add(i);
|
flagIndexes.Add(i);
|
||||||
break;
|
break;
|
||||||
|
case "--fbx-dump-mats":
|
||||||
|
case "--fbx-dump-materials":
|
||||||
|
if (o_workMode.Value != WorkMode.SplitObjects)
|
||||||
|
{
|
||||||
|
Console.WriteLine($"{"Error".Color(brightRed)} during parsing [{flag.Color(brightYellow)}] flag. This flag is not suitable for the current working mode [{o_workMode.Value}].\n");
|
||||||
|
ShowOptionDescription(o_workMode);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
f_fbxDumpMaterials.Value = true;
|
||||||
|
flagIndexes.Add(i);
|
||||||
|
break;
|
||||||
case "--fbx-uvs-as-diffuse":
|
case "--fbx-uvs-as-diffuse":
|
||||||
if (o_workMode.Value != WorkMode.SplitObjects)
|
if (o_workMode.Value != WorkMode.SplitObjects)
|
||||||
{
|
{
|
||||||
@@ -1601,6 +1621,7 @@ namespace AssetStudioCLI.Options
|
|||||||
sb.AppendLine($"# FBX Scale Factor: {o_fbxScaleFactor}");
|
sb.AppendLine($"# FBX Scale Factor: {o_fbxScaleFactor}");
|
||||||
sb.AppendLine($"# FBX Bone Size: {o_fbxBoneSize}");
|
sb.AppendLine($"# FBX Bone Size: {o_fbxBoneSize}");
|
||||||
sb.AppendLine($"# FBX Animation Mode: {o_fbxAnimMode}");
|
sb.AppendLine($"# FBX Animation Mode: {o_fbxAnimMode}");
|
||||||
|
sb.AppendLine($"# FBX Dump Materials: {f_fbxDumpMaterials}");
|
||||||
sb.AppendLine($"# FBX UVs as Diffuse Maps: {f_fbxUvsAsDiffuseMaps}");
|
sb.AppendLine($"# FBX UVs as Diffuse Maps: {f_fbxUvsAsDiffuseMaps}");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -64,6 +64,7 @@ namespace AssetStudio
|
|||||||
public bool ExportSkins { get; set; }
|
public bool ExportSkins { get; set; }
|
||||||
public bool ExportAnimations { get; set; }
|
public bool ExportAnimations { get; set; }
|
||||||
public bool ExportBlendShape { get; set; }
|
public bool ExportBlendShape { get; set; }
|
||||||
|
public bool DumpMaterials { get; set; }
|
||||||
public bool CastToBone { get; set; }
|
public bool CastToBone { get; set; }
|
||||||
public float BoneSize { get; set; }
|
public float BoneSize { get; set; }
|
||||||
public bool ExportAllUvsAsDiffuseMaps { get; set; }
|
public bool ExportAllUvsAsDiffuseMaps { get; set; }
|
||||||
@@ -78,8 +79,8 @@ namespace AssetStudio
|
|||||||
Init();
|
Init();
|
||||||
}
|
}
|
||||||
|
|
||||||
public Settings(bool eulerFilter, float filterPrecision, bool exportAllNodes, bool exportSkins, bool exportAnimations, bool exportBlendShape, bool castToBone, float boneSize,
|
public Settings(bool eulerFilter, float filterPrecision, bool exportAllNodes, bool exportSkins, bool exportAnimations, bool exportBlendShape, bool dumpMaterials,
|
||||||
bool exportAllUvsAsDiffuseMaps, float scaleFactor, int fbxVersionIndex, int fbxFormat, Dictionary<int, int> uvBindings)
|
bool castToBone, float boneSize, bool exportAllUvsAsDiffuseMaps, float scaleFactor, int fbxVersionIndex, int fbxFormat, Dictionary<int, int> uvBindings)
|
||||||
{
|
{
|
||||||
EulerFilter = eulerFilter;
|
EulerFilter = eulerFilter;
|
||||||
FilterPrecision = filterPrecision;
|
FilterPrecision = filterPrecision;
|
||||||
@@ -87,6 +88,7 @@ namespace AssetStudio
|
|||||||
ExportSkins = exportSkins;
|
ExportSkins = exportSkins;
|
||||||
ExportAnimations = exportAnimations;
|
ExportAnimations = exportAnimations;
|
||||||
ExportBlendShape = exportBlendShape;
|
ExportBlendShape = exportBlendShape;
|
||||||
|
DumpMaterials = dumpMaterials;
|
||||||
CastToBone = castToBone;
|
CastToBone = castToBone;
|
||||||
BoneSize = (int)boneSize;
|
BoneSize = (int)boneSize;
|
||||||
ExportAllUvsAsDiffuseMaps = exportAllUvsAsDiffuseMaps;
|
ExportAllUvsAsDiffuseMaps = exportAllUvsAsDiffuseMaps;
|
||||||
@@ -110,6 +112,7 @@ namespace AssetStudio
|
|||||||
ExportSkins = true;
|
ExportSkins = true;
|
||||||
ExportAnimations = true;
|
ExportAnimations = true;
|
||||||
ExportBlendShape = true;
|
ExportBlendShape = true;
|
||||||
|
DumpMaterials = false;
|
||||||
CastToBone = false;
|
CastToBone = false;
|
||||||
ExportAllUvsAsDiffuseMaps = false;
|
ExportAllUvsAsDiffuseMaps = false;
|
||||||
BoneSize = 10;
|
BoneSize = 10;
|
||||||
|
|||||||
Generated
+43
-28
@@ -86,6 +86,7 @@
|
|||||||
this.imagesTabPage = new System.Windows.Forms.TabPage();
|
this.imagesTabPage = new System.Windows.Forms.TabPage();
|
||||||
this.keepSpriteSizeCheckBox = new System.Windows.Forms.CheckBox();
|
this.keepSpriteSizeCheckBox = new System.Windows.Forms.CheckBox();
|
||||||
this.fbxTabPage = new System.Windows.Forms.TabPage();
|
this.fbxTabPage = new System.Windows.Forms.TabPage();
|
||||||
|
this.dumpMaterialsCheckBox = new System.Windows.Forms.CheckBox();
|
||||||
this.live2DTabPage = new System.Windows.Forms.TabPage();
|
this.live2DTabPage = new System.Windows.Forms.TabPage();
|
||||||
this.Cancel = new System.Windows.Forms.Button();
|
this.Cancel = new System.Windows.Forms.Button();
|
||||||
((System.ComponentModel.ISupportInitialize)(this.parallelExportUpDown)).BeginInit();
|
((System.ComponentModel.ISupportInitialize)(this.parallelExportUpDown)).BeginInit();
|
||||||
@@ -106,7 +107,7 @@
|
|||||||
//
|
//
|
||||||
this.OKbutton.AutoSize = true;
|
this.OKbutton.AutoSize = true;
|
||||||
this.OKbutton.BackColor = System.Drawing.SystemColors.ButtonFace;
|
this.OKbutton.BackColor = System.Drawing.SystemColors.ButtonFace;
|
||||||
this.OKbutton.Location = new System.Drawing.Point(228, 418);
|
this.OKbutton.Location = new System.Drawing.Point(228, 442);
|
||||||
this.OKbutton.Margin = new System.Windows.Forms.Padding(6);
|
this.OKbutton.Margin = new System.Windows.Forms.Padding(6);
|
||||||
this.OKbutton.Name = "OKbutton";
|
this.OKbutton.Name = "OKbutton";
|
||||||
this.OKbutton.Size = new System.Drawing.Size(88, 27);
|
this.OKbutton.Size = new System.Drawing.Size(88, 27);
|
||||||
@@ -484,10 +485,10 @@
|
|||||||
// fbxResetButton
|
// fbxResetButton
|
||||||
//
|
//
|
||||||
this.fbxResetButton.BackColor = System.Drawing.SystemColors.ButtonFace;
|
this.fbxResetButton.BackColor = System.Drawing.SystemColors.ButtonFace;
|
||||||
this.fbxResetButton.Location = new System.Drawing.Point(280, 320);
|
this.fbxResetButton.Location = new System.Drawing.Point(280, 340);
|
||||||
this.fbxResetButton.Name = "fbxResetButton";
|
this.fbxResetButton.Name = "fbxResetButton";
|
||||||
this.fbxResetButton.Size = new System.Drawing.Size(88, 27);
|
this.fbxResetButton.Size = new System.Drawing.Size(88, 27);
|
||||||
this.fbxResetButton.TabIndex = 20;
|
this.fbxResetButton.TabIndex = 21;
|
||||||
this.fbxResetButton.Text = "Reset";
|
this.fbxResetButton.Text = "Reset";
|
||||||
this.fbxResetButton.UseVisualStyleBackColor = false;
|
this.fbxResetButton.UseVisualStyleBackColor = false;
|
||||||
this.fbxResetButton.Click += new System.EventHandler(this.resetButton_Click);
|
this.fbxResetButton.Click += new System.EventHandler(this.resetButton_Click);
|
||||||
@@ -495,10 +496,10 @@
|
|||||||
// uvBindingsLabel
|
// uvBindingsLabel
|
||||||
//
|
//
|
||||||
this.uvBindingsLabel.AutoSize = true;
|
this.uvBindingsLabel.AutoSize = true;
|
||||||
this.uvBindingsLabel.Location = new System.Drawing.Point(7, 166);
|
this.uvBindingsLabel.Location = new System.Drawing.Point(7, 184);
|
||||||
this.uvBindingsLabel.Name = "uvBindingsLabel";
|
this.uvBindingsLabel.Name = "uvBindingsLabel";
|
||||||
this.uvBindingsLabel.Size = new System.Drawing.Size(97, 15);
|
this.uvBindingsLabel.Size = new System.Drawing.Size(97, 15);
|
||||||
this.uvBindingsLabel.TabIndex = 16;
|
this.uvBindingsLabel.TabIndex = 17;
|
||||||
this.uvBindingsLabel.Text = "UV type bindings";
|
this.uvBindingsLabel.Text = "UV type bindings";
|
||||||
//
|
//
|
||||||
// uvIndicesCheckedListBox
|
// uvIndicesCheckedListBox
|
||||||
@@ -514,11 +515,11 @@
|
|||||||
"UV5",
|
"UV5",
|
||||||
"UV6",
|
"UV6",
|
||||||
"UV7"});
|
"UV7"});
|
||||||
this.uvIndicesCheckedListBox.Location = new System.Drawing.Point(18, 188);
|
this.uvIndicesCheckedListBox.Location = new System.Drawing.Point(18, 206);
|
||||||
this.uvIndicesCheckedListBox.Name = "uvIndicesCheckedListBox";
|
this.uvIndicesCheckedListBox.Name = "uvIndicesCheckedListBox";
|
||||||
this.uvIndicesCheckedListBox.ScrollAlwaysVisible = true;
|
this.uvIndicesCheckedListBox.ScrollAlwaysVisible = true;
|
||||||
this.uvIndicesCheckedListBox.Size = new System.Drawing.Size(151, 93);
|
this.uvIndicesCheckedListBox.Size = new System.Drawing.Size(151, 93);
|
||||||
this.uvIndicesCheckedListBox.TabIndex = 17;
|
this.uvIndicesCheckedListBox.TabIndex = 18;
|
||||||
this.optionTooltip.SetToolTip(this.uvIndicesCheckedListBox, "Checked UVs will be exported (if they exist)");
|
this.optionTooltip.SetToolTip(this.uvIndicesCheckedListBox, "Checked UVs will be exported (if they exist)");
|
||||||
this.uvIndicesCheckedListBox.SelectedIndexChanged += new System.EventHandler(this.uvIndicesCheckedListBox_SelectedIndexChanged);
|
this.uvIndicesCheckedListBox.SelectedIndexChanged += new System.EventHandler(this.uvIndicesCheckedListBox_SelectedIndexChanged);
|
||||||
//
|
//
|
||||||
@@ -538,11 +539,11 @@
|
|||||||
"Shininess",
|
"Shininess",
|
||||||
"Reflection",
|
"Reflection",
|
||||||
"Transparency"});
|
"Transparency"});
|
||||||
this.uvTypesListBox.Location = new System.Drawing.Point(205, 188);
|
this.uvTypesListBox.Location = new System.Drawing.Point(205, 206);
|
||||||
this.uvTypesListBox.Name = "uvTypesListBox";
|
this.uvTypesListBox.Name = "uvTypesListBox";
|
||||||
this.uvTypesListBox.ScrollAlwaysVisible = true;
|
this.uvTypesListBox.ScrollAlwaysVisible = true;
|
||||||
this.uvTypesListBox.Size = new System.Drawing.Size(151, 93);
|
this.uvTypesListBox.Size = new System.Drawing.Size(151, 93);
|
||||||
this.uvTypesListBox.TabIndex = 18;
|
this.uvTypesListBox.TabIndex = 19;
|
||||||
this.uvTypesListBox.SelectedIndexChanged += new System.EventHandler(this.uvTypesListBox_SelectedIndexChanged);
|
this.uvTypesListBox.SelectedIndexChanged += new System.EventHandler(this.uvTypesListBox_SelectedIndexChanged);
|
||||||
//
|
//
|
||||||
// exportAllUvsAsDiffuseMaps
|
// exportAllUvsAsDiffuseMaps
|
||||||
@@ -551,10 +552,10 @@
|
|||||||
this.exportAllUvsAsDiffuseMaps.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
this.exportAllUvsAsDiffuseMaps.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||||
| System.Windows.Forms.AnchorStyles.Right)));
|
| System.Windows.Forms.AnchorStyles.Right)));
|
||||||
this.exportAllUvsAsDiffuseMaps.AutoSize = true;
|
this.exportAllUvsAsDiffuseMaps.AutoSize = true;
|
||||||
this.exportAllUvsAsDiffuseMaps.Location = new System.Drawing.Point(7, 287);
|
this.exportAllUvsAsDiffuseMaps.Location = new System.Drawing.Point(7, 305);
|
||||||
this.exportAllUvsAsDiffuseMaps.Name = "exportAllUvsAsDiffuseMaps";
|
this.exportAllUvsAsDiffuseMaps.Name = "exportAllUvsAsDiffuseMaps";
|
||||||
this.exportAllUvsAsDiffuseMaps.Size = new System.Drawing.Size(183, 19);
|
this.exportAllUvsAsDiffuseMaps.Size = new System.Drawing.Size(183, 19);
|
||||||
this.exportAllUvsAsDiffuseMaps.TabIndex = 19;
|
this.exportAllUvsAsDiffuseMaps.TabIndex = 20;
|
||||||
this.exportAllUvsAsDiffuseMaps.Text = "Export all UVs as diffuse maps";
|
this.exportAllUvsAsDiffuseMaps.Text = "Export all UVs as diffuse maps";
|
||||||
this.optionTooltip.SetToolTip(this.exportAllUvsAsDiffuseMaps, "Check if some UV maps are missing after export (e.g. in Blender). But this can al" +
|
this.optionTooltip.SetToolTip(this.exportAllUvsAsDiffuseMaps, "Check if some UV maps are missing after export (e.g. in Blender). But this can al" +
|
||||||
"so cause some bugs with UVs.");
|
"so cause some bugs with UVs.");
|
||||||
@@ -600,7 +601,7 @@
|
|||||||
this.scaleFactor.Location = new System.Drawing.Point(309, 65);
|
this.scaleFactor.Location = new System.Drawing.Point(309, 65);
|
||||||
this.scaleFactor.Name = "scaleFactor";
|
this.scaleFactor.Name = "scaleFactor";
|
||||||
this.scaleFactor.Size = new System.Drawing.Size(58, 23);
|
this.scaleFactor.Size = new System.Drawing.Size(58, 23);
|
||||||
this.scaleFactor.TabIndex = 11;
|
this.scaleFactor.TabIndex = 12;
|
||||||
this.scaleFactor.Value = new decimal(new int[] {
|
this.scaleFactor.Value = new decimal(new int[] {
|
||||||
1,
|
1,
|
||||||
0,
|
0,
|
||||||
@@ -613,7 +614,7 @@
|
|||||||
this.label5.Location = new System.Drawing.Point(224, 67);
|
this.label5.Location = new System.Drawing.Point(224, 67);
|
||||||
this.label5.Name = "label5";
|
this.label5.Name = "label5";
|
||||||
this.label5.Size = new System.Drawing.Size(67, 15);
|
this.label5.Size = new System.Drawing.Size(67, 15);
|
||||||
this.label5.TabIndex = 10;
|
this.label5.TabIndex = 11;
|
||||||
this.label5.Text = "ScaleFactor";
|
this.label5.Text = "ScaleFactor";
|
||||||
//
|
//
|
||||||
// fbxFormat
|
// fbxFormat
|
||||||
@@ -626,7 +627,7 @@
|
|||||||
this.fbxFormat.Location = new System.Drawing.Point(297, 95);
|
this.fbxFormat.Location = new System.Drawing.Point(297, 95);
|
||||||
this.fbxFormat.Name = "fbxFormat";
|
this.fbxFormat.Name = "fbxFormat";
|
||||||
this.fbxFormat.Size = new System.Drawing.Size(70, 23);
|
this.fbxFormat.Size = new System.Drawing.Size(70, 23);
|
||||||
this.fbxFormat.TabIndex = 13;
|
this.fbxFormat.TabIndex = 14;
|
||||||
//
|
//
|
||||||
// label4
|
// label4
|
||||||
//
|
//
|
||||||
@@ -634,7 +635,7 @@
|
|||||||
this.label4.Location = new System.Drawing.Point(220, 98);
|
this.label4.Location = new System.Drawing.Point(220, 98);
|
||||||
this.label4.Name = "label4";
|
this.label4.Name = "label4";
|
||||||
this.label4.Size = new System.Drawing.Size(65, 15);
|
this.label4.Size = new System.Drawing.Size(65, 15);
|
||||||
this.label4.TabIndex = 12;
|
this.label4.TabIndex = 13;
|
||||||
this.label4.Text = "FBXFormat";
|
this.label4.Text = "FBXFormat";
|
||||||
//
|
//
|
||||||
// fbxVersion
|
// fbxVersion
|
||||||
@@ -651,7 +652,7 @@
|
|||||||
this.fbxVersion.Location = new System.Drawing.Point(313, 126);
|
this.fbxVersion.Location = new System.Drawing.Point(313, 126);
|
||||||
this.fbxVersion.Name = "fbxVersion";
|
this.fbxVersion.Name = "fbxVersion";
|
||||||
this.fbxVersion.Size = new System.Drawing.Size(54, 23);
|
this.fbxVersion.Size = new System.Drawing.Size(54, 23);
|
||||||
this.fbxVersion.TabIndex = 15;
|
this.fbxVersion.TabIndex = 16;
|
||||||
//
|
//
|
||||||
// label3
|
// label3
|
||||||
//
|
//
|
||||||
@@ -659,7 +660,7 @@
|
|||||||
this.label3.Location = new System.Drawing.Point(226, 130);
|
this.label3.Location = new System.Drawing.Point(226, 130);
|
||||||
this.label3.Name = "label3";
|
this.label3.Name = "label3";
|
||||||
this.label3.Size = new System.Drawing.Size(65, 15);
|
this.label3.Size = new System.Drawing.Size(65, 15);
|
||||||
this.label3.TabIndex = 14;
|
this.label3.TabIndex = 15;
|
||||||
this.label3.Text = "FBXVersion";
|
this.label3.Text = "FBXVersion";
|
||||||
//
|
//
|
||||||
// boneSize
|
// boneSize
|
||||||
@@ -667,7 +668,7 @@
|
|||||||
this.boneSize.Location = new System.Drawing.Point(309, 35);
|
this.boneSize.Location = new System.Drawing.Point(309, 35);
|
||||||
this.boneSize.Name = "boneSize";
|
this.boneSize.Name = "boneSize";
|
||||||
this.boneSize.Size = new System.Drawing.Size(58, 23);
|
this.boneSize.Size = new System.Drawing.Size(58, 23);
|
||||||
this.boneSize.TabIndex = 9;
|
this.boneSize.TabIndex = 10;
|
||||||
this.boneSize.Value = new decimal(new int[] {
|
this.boneSize.Value = new decimal(new int[] {
|
||||||
10,
|
10,
|
||||||
0,
|
0,
|
||||||
@@ -680,7 +681,7 @@
|
|||||||
this.label2.Location = new System.Drawing.Point(238, 37);
|
this.label2.Location = new System.Drawing.Point(238, 37);
|
||||||
this.label2.Name = "label2";
|
this.label2.Name = "label2";
|
||||||
this.label2.Size = new System.Drawing.Size(54, 15);
|
this.label2.Size = new System.Drawing.Size(54, 15);
|
||||||
this.label2.TabIndex = 8;
|
this.label2.TabIndex = 9;
|
||||||
this.label2.Text = "BoneSize";
|
this.label2.Text = "BoneSize";
|
||||||
//
|
//
|
||||||
// exportSkins
|
// exportSkins
|
||||||
@@ -703,7 +704,7 @@
|
|||||||
this.label1.Location = new System.Drawing.Point(218, 7);
|
this.label1.Location = new System.Drawing.Point(218, 7);
|
||||||
this.label1.Name = "label1";
|
this.label1.Name = "label1";
|
||||||
this.label1.Size = new System.Drawing.Size(81, 15);
|
this.label1.Size = new System.Drawing.Size(81, 15);
|
||||||
this.label1.TabIndex = 6;
|
this.label1.TabIndex = 7;
|
||||||
this.label1.Text = "FilterPrecision";
|
this.label1.Text = "FilterPrecision";
|
||||||
//
|
//
|
||||||
// filterPrecision
|
// filterPrecision
|
||||||
@@ -717,7 +718,7 @@
|
|||||||
this.filterPrecision.Location = new System.Drawing.Point(309, 5);
|
this.filterPrecision.Location = new System.Drawing.Point(309, 5);
|
||||||
this.filterPrecision.Name = "filterPrecision";
|
this.filterPrecision.Name = "filterPrecision";
|
||||||
this.filterPrecision.Size = new System.Drawing.Size(58, 23);
|
this.filterPrecision.Size = new System.Drawing.Size(58, 23);
|
||||||
this.filterPrecision.TabIndex = 7;
|
this.filterPrecision.TabIndex = 8;
|
||||||
this.filterPrecision.Value = new decimal(new int[] {
|
this.filterPrecision.Value = new decimal(new int[] {
|
||||||
25,
|
25,
|
||||||
0,
|
0,
|
||||||
@@ -774,7 +775,7 @@
|
|||||||
this.optionsTabControl.Margin = new System.Windows.Forms.Padding(12);
|
this.optionsTabControl.Margin = new System.Windows.Forms.Padding(12);
|
||||||
this.optionsTabControl.Name = "optionsTabControl";
|
this.optionsTabControl.Name = "optionsTabControl";
|
||||||
this.optionsTabControl.SelectedIndex = 0;
|
this.optionsTabControl.SelectedIndex = 0;
|
||||||
this.optionsTabControl.Size = new System.Drawing.Size(398, 400);
|
this.optionsTabControl.Size = new System.Drawing.Size(398, 415);
|
||||||
this.optionsTabControl.TabIndex = 1;
|
this.optionsTabControl.TabIndex = 1;
|
||||||
//
|
//
|
||||||
// generalTabPage
|
// generalTabPage
|
||||||
@@ -793,7 +794,7 @@
|
|||||||
this.generalTabPage.Controls.Add(this.openAfterExport);
|
this.generalTabPage.Controls.Add(this.openAfterExport);
|
||||||
this.generalTabPage.Location = new System.Drawing.Point(4, 24);
|
this.generalTabPage.Location = new System.Drawing.Point(4, 24);
|
||||||
this.generalTabPage.Name = "generalTabPage";
|
this.generalTabPage.Name = "generalTabPage";
|
||||||
this.generalTabPage.Size = new System.Drawing.Size(390, 372);
|
this.generalTabPage.Size = new System.Drawing.Size(390, 387);
|
||||||
this.generalTabPage.TabIndex = 0;
|
this.generalTabPage.TabIndex = 0;
|
||||||
this.generalTabPage.Text = "General";
|
this.generalTabPage.Text = "General";
|
||||||
//
|
//
|
||||||
@@ -816,7 +817,7 @@
|
|||||||
this.imagesTabPage.Controls.Add(this.exportSpriteWithAlphaMask);
|
this.imagesTabPage.Controls.Add(this.exportSpriteWithAlphaMask);
|
||||||
this.imagesTabPage.Location = new System.Drawing.Point(4, 24);
|
this.imagesTabPage.Location = new System.Drawing.Point(4, 24);
|
||||||
this.imagesTabPage.Name = "imagesTabPage";
|
this.imagesTabPage.Name = "imagesTabPage";
|
||||||
this.imagesTabPage.Size = new System.Drawing.Size(390, 372);
|
this.imagesTabPage.Size = new System.Drawing.Size(390, 387);
|
||||||
this.imagesTabPage.TabIndex = 3;
|
this.imagesTabPage.TabIndex = 3;
|
||||||
this.imagesTabPage.Text = "Images";
|
this.imagesTabPage.Text = "Images";
|
||||||
//
|
//
|
||||||
@@ -837,6 +838,7 @@
|
|||||||
// fbxTabPage
|
// fbxTabPage
|
||||||
//
|
//
|
||||||
this.fbxTabPage.BackColor = System.Drawing.SystemColors.Menu;
|
this.fbxTabPage.BackColor = System.Drawing.SystemColors.Menu;
|
||||||
|
this.fbxTabPage.Controls.Add(this.dumpMaterialsCheckBox);
|
||||||
this.fbxTabPage.Controls.Add(this.fbxResetButton);
|
this.fbxTabPage.Controls.Add(this.fbxResetButton);
|
||||||
this.fbxTabPage.Controls.Add(this.eulerFilter);
|
this.fbxTabPage.Controls.Add(this.eulerFilter);
|
||||||
this.fbxTabPage.Controls.Add(this.uvBindingsLabel);
|
this.fbxTabPage.Controls.Add(this.uvBindingsLabel);
|
||||||
@@ -860,10 +862,22 @@
|
|||||||
this.fbxTabPage.Controls.Add(this.label4);
|
this.fbxTabPage.Controls.Add(this.label4);
|
||||||
this.fbxTabPage.Location = new System.Drawing.Point(4, 24);
|
this.fbxTabPage.Location = new System.Drawing.Point(4, 24);
|
||||||
this.fbxTabPage.Name = "fbxTabPage";
|
this.fbxTabPage.Name = "fbxTabPage";
|
||||||
this.fbxTabPage.Size = new System.Drawing.Size(390, 372);
|
this.fbxTabPage.Size = new System.Drawing.Size(390, 387);
|
||||||
this.fbxTabPage.TabIndex = 1;
|
this.fbxTabPage.TabIndex = 1;
|
||||||
this.fbxTabPage.Text = "FBX";
|
this.fbxTabPage.Text = "FBX";
|
||||||
//
|
//
|
||||||
|
// dumpMaterialsCheckBox
|
||||||
|
//
|
||||||
|
this.dumpMaterialsCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||||
|
| System.Windows.Forms.AnchorStyles.Right)));
|
||||||
|
this.dumpMaterialsCheckBox.AutoSize = true;
|
||||||
|
this.dumpMaterialsCheckBox.Location = new System.Drawing.Point(7, 153);
|
||||||
|
this.dumpMaterialsCheckBox.Name = "dumpMaterialsCheckBox";
|
||||||
|
this.dumpMaterialsCheckBox.Size = new System.Drawing.Size(110, 19);
|
||||||
|
this.dumpMaterialsCheckBox.TabIndex = 6;
|
||||||
|
this.dumpMaterialsCheckBox.Text = "Dump materials";
|
||||||
|
this.dumpMaterialsCheckBox.UseVisualStyleBackColor = true;
|
||||||
|
//
|
||||||
// live2DTabPage
|
// live2DTabPage
|
||||||
//
|
//
|
||||||
this.live2DTabPage.BackColor = System.Drawing.SystemColors.Menu;
|
this.live2DTabPage.BackColor = System.Drawing.SystemColors.Menu;
|
||||||
@@ -875,7 +889,7 @@
|
|||||||
this.live2DTabPage.Controls.Add(this.l2dMotionExportMethodPanel);
|
this.live2DTabPage.Controls.Add(this.l2dMotionExportMethodPanel);
|
||||||
this.live2DTabPage.Location = new System.Drawing.Point(4, 24);
|
this.live2DTabPage.Location = new System.Drawing.Point(4, 24);
|
||||||
this.live2DTabPage.Name = "live2DTabPage";
|
this.live2DTabPage.Name = "live2DTabPage";
|
||||||
this.live2DTabPage.Size = new System.Drawing.Size(390, 372);
|
this.live2DTabPage.Size = new System.Drawing.Size(390, 387);
|
||||||
this.live2DTabPage.TabIndex = 2;
|
this.live2DTabPage.TabIndex = 2;
|
||||||
this.live2DTabPage.Text = "Cubism Live2D";
|
this.live2DTabPage.Text = "Cubism Live2D";
|
||||||
//
|
//
|
||||||
@@ -884,7 +898,7 @@
|
|||||||
this.Cancel.AutoSize = true;
|
this.Cancel.AutoSize = true;
|
||||||
this.Cancel.BackColor = System.Drawing.SystemColors.ButtonFace;
|
this.Cancel.BackColor = System.Drawing.SystemColors.ButtonFace;
|
||||||
this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
|
this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
|
||||||
this.Cancel.Location = new System.Drawing.Point(322, 418);
|
this.Cancel.Location = new System.Drawing.Point(322, 442);
|
||||||
this.Cancel.Margin = new System.Windows.Forms.Padding(6);
|
this.Cancel.Margin = new System.Windows.Forms.Padding(6);
|
||||||
this.Cancel.Name = "Cancel";
|
this.Cancel.Name = "Cancel";
|
||||||
this.Cancel.Size = new System.Drawing.Size(88, 27);
|
this.Cancel.Size = new System.Drawing.Size(88, 27);
|
||||||
@@ -902,7 +916,7 @@
|
|||||||
this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
|
this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
|
||||||
this.BackColor = System.Drawing.SystemColors.Menu;
|
this.BackColor = System.Drawing.SystemColors.Menu;
|
||||||
this.CancelButton = this.Cancel;
|
this.CancelButton = this.Cancel;
|
||||||
this.ClientSize = new System.Drawing.Size(422, 451);
|
this.ClientSize = new System.Drawing.Size(422, 481);
|
||||||
this.Controls.Add(this.optionsTabControl);
|
this.Controls.Add(this.optionsTabControl);
|
||||||
this.Controls.Add(this.OKbutton);
|
this.Controls.Add(this.OKbutton);
|
||||||
this.Controls.Add(this.Cancel);
|
this.Controls.Add(this.Cancel);
|
||||||
@@ -998,5 +1012,6 @@
|
|||||||
private System.Windows.Forms.Button Cancel;
|
private System.Windows.Forms.Button Cancel;
|
||||||
private System.Windows.Forms.Panel panel2;
|
private System.Windows.Forms.Panel panel2;
|
||||||
private System.Windows.Forms.CheckBox keepSpriteSizeCheckBox;
|
private System.Windows.Forms.CheckBox keepSpriteSizeCheckBox;
|
||||||
|
private System.Windows.Forms.CheckBox dumpMaterialsCheckBox;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -70,6 +70,7 @@ namespace AssetStudioGUI
|
|||||||
Studio.FbxSettings.ExportSkins = exportSkins.Checked;
|
Studio.FbxSettings.ExportSkins = exportSkins.Checked;
|
||||||
Studio.FbxSettings.ExportAnimations = exportAnimations.Checked;
|
Studio.FbxSettings.ExportAnimations = exportAnimations.Checked;
|
||||||
Studio.FbxSettings.ExportBlendShape = exportBlendShape.Checked;
|
Studio.FbxSettings.ExportBlendShape = exportBlendShape.Checked;
|
||||||
|
Studio.FbxSettings.DumpMaterials = dumpMaterialsCheckBox.Checked;
|
||||||
Studio.FbxSettings.CastToBone = castToBone.Checked;
|
Studio.FbxSettings.CastToBone = castToBone.Checked;
|
||||||
Studio.FbxSettings.ExportAllUvsAsDiffuseMaps = exportAllUvsAsDiffuseMaps.Checked;
|
Studio.FbxSettings.ExportAllUvsAsDiffuseMaps = exportAllUvsAsDiffuseMaps.Checked;
|
||||||
Studio.FbxSettings.BoneSize = (int)boneSize.Value;
|
Studio.FbxSettings.BoneSize = (int)boneSize.Value;
|
||||||
@@ -133,6 +134,7 @@ namespace AssetStudioGUI
|
|||||||
exportSkins.Checked = fbxSettings.ExportSkins;
|
exportSkins.Checked = fbxSettings.ExportSkins;
|
||||||
exportAnimations.Checked = fbxSettings.ExportAnimations;
|
exportAnimations.Checked = fbxSettings.ExportAnimations;
|
||||||
exportBlendShape.Checked = fbxSettings.ExportBlendShape;
|
exportBlendShape.Checked = fbxSettings.ExportBlendShape;
|
||||||
|
dumpMaterialsCheckBox.Checked = fbxSettings.DumpMaterials;
|
||||||
castToBone.Checked = fbxSettings.CastToBone;
|
castToBone.Checked = fbxSettings.CastToBone;
|
||||||
exportAllUvsAsDiffuseMaps.Checked = fbxSettings.ExportAllUvsAsDiffuseMaps;
|
exportAllUvsAsDiffuseMaps.Checked = fbxSettings.ExportAllUvsAsDiffuseMaps;
|
||||||
boneSize.Value = (decimal)fbxSettings.BoneSize;
|
boneSize.Value = (decimal)fbxSettings.BoneSize;
|
||||||
|
|||||||
@@ -249,9 +249,25 @@ namespace AssetStudioGUI
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void ExportFbx(IImported convert, string exportPath)
|
private static void ExportFbx(ModelConverter convert, string exportPath)
|
||||||
{
|
{
|
||||||
ModelExporter.ExportFbx(exportPath, convert, Studio.FbxSettings);
|
ModelExporter.ExportFbx(exportPath, convert, Studio.FbxSettings);
|
||||||
|
if (!Studio.FbxSettings.DumpMaterials || convert.MaterialAssetSet.Count == 0 || !File.Exists(exportPath))
|
||||||
|
return;
|
||||||
|
|
||||||
|
var exportDir = Path.Combine(Path.GetDirectoryName(exportPath), "Materials");
|
||||||
|
Directory.CreateDirectory(exportDir);
|
||||||
|
foreach (var mat in convert.MaterialAssetSet)
|
||||||
|
{
|
||||||
|
var jsonDoc = mat.ToJsonDoc();
|
||||||
|
var str = System.Text.Json.JsonSerializer.Serialize(jsonDoc, Object.JsonOptions);
|
||||||
|
var exportFullPath = Path.Combine(exportDir, $"{mat.m_Name}.json");
|
||||||
|
if (File.Exists(exportFullPath))
|
||||||
|
{
|
||||||
|
exportFullPath = Path.Combine(exportDir, $"{mat.m_Name} #{mat.GetHashCode():x}.json");
|
||||||
|
}
|
||||||
|
File.WriteAllText(exportFullPath, str);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static bool ExportRawFile(AssetItem item, string exportPath)
|
public static bool ExportRawFile(AssetItem item, string exportPath)
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ namespace AssetStudio
|
|||||||
public List<ImportedTexture> TextureList { get; protected set; } = new List<ImportedTexture>();
|
public List<ImportedTexture> TextureList { get; protected set; } = new List<ImportedTexture>();
|
||||||
public List<ImportedKeyframedAnimation> AnimationList { get; protected set; } = new List<ImportedKeyframedAnimation>();
|
public List<ImportedKeyframedAnimation> AnimationList { get; protected set; } = new List<ImportedKeyframedAnimation>();
|
||||||
public List<ImportedMorph> MorphList { get; protected set; } = new List<ImportedMorph>();
|
public List<ImportedMorph> MorphList { get; protected set; } = new List<ImportedMorph>();
|
||||||
|
public HashSet<Material> MaterialAssetSet { get; protected set; } = new HashSet<Material>();
|
||||||
|
|
||||||
private ImageFormat imageFormat;
|
private ImageFormat imageFormat;
|
||||||
private Avatar avatar;
|
private Avatar avatar;
|
||||||
@@ -315,6 +316,7 @@ namespace AssetStudio
|
|||||||
if (meshR.m_Materials[i - firstSubMesh].TryGet(out var m_Material))
|
if (meshR.m_Materials[i - firstSubMesh].TryGet(out var m_Material))
|
||||||
{
|
{
|
||||||
mat = m_Material;
|
mat = m_Material;
|
||||||
|
MaterialAssetSet.Add(mat);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ImportedMaterial iMat = ConvertMaterial(mat);
|
ImportedMaterial iMat = ConvertMaterial(mat);
|
||||||
|
|||||||
Reference in New Issue
Block a user