mirror of
https://github.com/aelurum/AssetStudio.git
synced 2026-11-15 19:28:48 -05:00
Merge branch 'pr/124' into AssetStudioMod
This commit is contained in:
@@ -290,6 +290,7 @@ namespace AssetStudioCLI
|
|||||||
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,
|
DumpMaterials = CLIOptions.f_fbxDumpMaterials.Value,
|
||||||
|
FbxFormat = CLIOptions.f_fbxAsciiFormat.Value ? 1 : 0,
|
||||||
};
|
};
|
||||||
ModelExporter.ExportFbx(exportPath, convert, fbxSettings);
|
ModelExporter.ExportFbx(exportPath, convert, fbxSettings);
|
||||||
if (!fbxSettings.DumpMaterials || convert.MaterialAssetSet.Count == 0 || !File.Exists(exportPath))
|
if (!fbxSettings.DumpMaterials || convert.MaterialAssetSet.Count == 0 || !File.Exists(exportPath))
|
||||||
|
|||||||
@@ -122,6 +122,7 @@ namespace AssetStudioCLI.Options
|
|||||||
public static Option<AnimationExportMode> o_fbxAnimMode;
|
public static Option<AnimationExportMode> o_fbxAnimMode;
|
||||||
public static Option<bool> f_fbxDumpMaterials;
|
public static Option<bool> f_fbxDumpMaterials;
|
||||||
public static Option<bool> f_fbxUvsAsDiffuseMaps;
|
public static Option<bool> f_fbxUvsAsDiffuseMaps;
|
||||||
|
public static Option<bool> f_fbxAsciiFormat;
|
||||||
//filter
|
//filter
|
||||||
public static Option<List<string>> o_filterByName;
|
public static Option<List<string>> o_filterByName;
|
||||||
public static Option<List<string>> o_filterByContainer;
|
public static Option<List<string>> o_filterByContainer;
|
||||||
@@ -432,7 +433,16 @@ namespace AssetStudioCLI.Options
|
|||||||
optionName: "--fbx-uvs-as-diffuse",
|
optionName: "--fbx-uvs-as-diffuse",
|
||||||
optionDescription: "(Flag) If specified, Studio will export all UVs as Diffuse maps.\n" +
|
optionDescription: "(Flag) If specified, Studio will export all UVs as Diffuse maps.\n" +
|
||||||
"Сan be useful if you cannot find some UVs after exporting (e.g. in Blender)\n" +
|
"Сan be useful if you cannot find some UVs after exporting (e.g. in Blender)\n" +
|
||||||
"(But can also cause some bugs with UVs)",
|
"(But can also cause some bugs with UVs)\n",
|
||||||
|
optionExample: "",
|
||||||
|
optionHelpGroup: HelpGroups.FBX
|
||||||
|
);
|
||||||
|
f_fbxAsciiFormat = new GroupedOption<bool>
|
||||||
|
(
|
||||||
|
optionDefaultValue: false,
|
||||||
|
optionName: "--fbx-ascii-format",
|
||||||
|
optionDescription: "(Flag) If specified, Studio will export FBX in ASCII format.\n" +
|
||||||
|
"If not specified, Binary format will be used",
|
||||||
optionExample: "",
|
optionExample: "",
|
||||||
optionHelpGroup: HelpGroups.FBX
|
optionHelpGroup: HelpGroups.FBX
|
||||||
);
|
);
|
||||||
@@ -743,6 +753,7 @@ namespace AssetStudioCLI.Options
|
|||||||
: WorkMode.SplitObjects;
|
: WorkMode.SplitObjects;
|
||||||
o_exportAssetTypes.Value = new List<ClassIDType>
|
o_exportAssetTypes.Value = new List<ClassIDType>
|
||||||
{
|
{
|
||||||
|
ClassIDType.AnimationClip,
|
||||||
ClassIDType.Animator,
|
ClassIDType.Animator,
|
||||||
ClassIDType.Mesh,
|
ClassIDType.Mesh,
|
||||||
ClassIDType.Texture2D,
|
ClassIDType.Texture2D,
|
||||||
@@ -802,7 +813,7 @@ namespace AssetStudioCLI.Options
|
|||||||
flagIndexes.Add(i);
|
flagIndexes.Add(i);
|
||||||
break;
|
break;
|
||||||
case "--fbx-uvs-as-diffuse":
|
case "--fbx-uvs-as-diffuse":
|
||||||
if (o_workMode.Value != WorkMode.SplitObjects)
|
if (o_workMode.Value != WorkMode.SplitObjects && o_workMode.Value != WorkMode.Animator)
|
||||||
{
|
{
|
||||||
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");
|
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);
|
ShowOptionDescription(o_workMode);
|
||||||
@@ -811,6 +822,16 @@ namespace AssetStudioCLI.Options
|
|||||||
f_fbxUvsAsDiffuseMaps.Value = true;
|
f_fbxUvsAsDiffuseMaps.Value = true;
|
||||||
flagIndexes.Add(i);
|
flagIndexes.Add(i);
|
||||||
break;
|
break;
|
||||||
|
case "--fbx-ascii-format":
|
||||||
|
if (o_workMode.Value != WorkMode.SplitObjects && o_workMode.Value != WorkMode.Animator)
|
||||||
|
{
|
||||||
|
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_fbxAsciiFormat.Value = true;
|
||||||
|
flagIndexes.Add(i);
|
||||||
|
break;
|
||||||
case "--filter-with-regex":
|
case "--filter-with-regex":
|
||||||
f_filterWithRegex.Value = true;
|
f_filterWithRegex.Value = true;
|
||||||
flagIndexes.Add(i);
|
flagIndexes.Add(i);
|
||||||
@@ -1623,6 +1644,7 @@ namespace AssetStudioCLI.Options
|
|||||||
sb.AppendLine($"# FBX Animation Mode: {o_fbxAnimMode}");
|
sb.AppendLine($"# FBX Animation Mode: {o_fbxAnimMode}");
|
||||||
sb.AppendLine($"# FBX Dump Materials: {f_fbxDumpMaterials}");
|
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}");
|
||||||
|
sb.AppendLine($"# FBX Export in ASCII Format: {f_fbxAsciiFormat}");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
sb.AppendLine("======");
|
sb.AppendLine("======");
|
||||||
|
|||||||
Reference in New Issue
Block a user