Change the condition under which assets are dumped inside a gdt:

Make the parameter --gdt to manually make the tool dump as a gdt
This commit is contained in:
Jan 2021-03-07 15:25:47 +01:00
parent 313e9e9f1a
commit b891f9527e
3 changed files with 9 additions and 9 deletions

View File

@ -228,7 +228,7 @@ class Unlinker::Impl
context.m_zone = zone; context.m_zone = zone;
context.m_base_path = outputFolderPath; context.m_base_path = outputFolderPath;
if(!m_args.m_raw) if(m_args.m_use_gdt)
{ {
if (!OpenGdtFile(zone, zoneDefinitionFileFolder, gdtStream)) if (!OpenGdtFile(zone, zoneDefinitionFileFolder, gdtStream))
return false; return false;
@ -240,7 +240,7 @@ class Unlinker::Impl
ObjWriting::DumpZone(context); ObjWriting::DumpZone(context);
if(!m_args.m_raw) if(m_args.m_use_gdt)
{ {
context.m_gdt->EndStream(); context.m_gdt->EndStream();
gdtStream.close(); gdtStream.close();

View File

@ -57,10 +57,10 @@ const CommandLineOption* const OPTION_IMAGE_FORMAT =
.WithParameter("imageFormatValue") .WithParameter("imageFormatValue")
.Build(); .Build();
const CommandLineOption* const OPTION_RAW = const CommandLineOption* const OPTION_GDT =
CommandLineOption::Builder::Create() CommandLineOption::Builder::Create()
.WithLongName("raw") .WithLongName("gdt")
.WithDescription("Prevents generation of a GDT and dumps assets as raw whenever possible.") .WithDescription("Dumps assets in a GDT whenever possible.")
.Build(); .Build();
const CommandLineOption* const COMMAND_LINE_OPTIONS[] const CommandLineOption* const COMMAND_LINE_OPTIONS[]
@ -72,7 +72,7 @@ const CommandLineOption* const COMMAND_LINE_OPTIONS[]
OPTION_OUTPUT_FOLDER, OPTION_OUTPUT_FOLDER,
OPTION_SEARCH_PATH, OPTION_SEARCH_PATH,
OPTION_IMAGE_FORMAT, OPTION_IMAGE_FORMAT,
OPTION_RAW OPTION_GDT
}; };
UnlinkerArgs::UnlinkerArgs() UnlinkerArgs::UnlinkerArgs()
@ -246,8 +246,8 @@ bool UnlinkerArgs::ParseArgs(const int argc, const char** argv)
} }
} }
// --raw // --gdt
m_raw = m_argument_parser.IsOptionSpecified(OPTION_RAW); m_use_gdt = m_argument_parser.IsOptionSpecified(OPTION_GDT);
return true; return true;
} }

View File

@ -39,7 +39,7 @@ public:
std::string m_output_folder; std::string m_output_folder;
bool m_minimal_zone_def; bool m_minimal_zone_def;
bool m_raw; bool m_use_gdt;
bool m_verbose; bool m_verbose;