Changed: Use CCmdArgs for build_interface

--HG--
branch : develop
This commit is contained in:
kervala 2016-09-23 13:26:55 +02:00
parent ed3a5e577f
commit 20f4825686

View file

@ -24,8 +24,7 @@
#include "nel/misc/log.h" #include "nel/misc/log.h"
#include "nel/misc/path.h" #include "nel/misc/path.h"
#include "nel/misc/uv.h" #include "nel/misc/uv.h"
#include "nel/misc/cmd_args.h"
//#include "windows.h"
#include <vector> #include <vector>
#include <string> #include <string>
@ -191,57 +190,44 @@ void enlargeCanvas (NLMISC::CBitmap &b)
// *************************************************************************** // ***************************************************************************
// main // main
// *************************************************************************** // ***************************************************************************
int main(int nNbArg, char **ppArgs) int main(int argc, char **argv)
{ {
//GetCurrentDirectory (MAX_PATH, sExeDir); CApplicationContext applicationContext;
sExeDir = CPath::getCurrentPath();
if (nNbArg < 3) // Parse Command Line.
{ NLMISC::CCmdArgs args;
outString ("ERROR : Wrong number of arguments\n");
outString ("USAGE : build_interface [-s<existing_uv_txt_name>] <out_tga_name> <path_maps1> [path_maps2] [path_maps3] ....\n"); args.setDescription("Build a huge interface texture from several small elements to optimize video memory usage.");
outString (" -s : build a subset of an existing interface definition while preserving the existing texture ids,"); args.addArg("s", "subset", "existing_uv_txt_name", "Build a subset of an existing interface definition while preserving the existing texture ids, to support freeing up VRAM by switching to the subset without rebuilding the entire interface.");
outString (" to support freeing up VRAM by switching to the subset without rebuilding the entire interface\n"); args.addAdditionalArg("output_filename", "PNG or TGA file to generate", true);
return -1; args.addAdditionalArg("input_path", "Path that containts interfaces elements", false);
}
if (!args.parse(argc, argv)) return 1;
// build as a subset of existing interface // build as a subset of existing interface
bool buildSubset = false; bool buildSubset = false;
string existingUVfilename; string existingUVfilename;
list<string> inputDirs;
for ( uint i=1; (sint)i<nNbArg; ++i ) if (args.haveArg("s"))
{ {
if ( ppArgs[i][0] == '-' )
{
switch ( ppArgs[i][1] )
{
case 'S':
case 's':
buildSubset = true; buildSubset = true;
existingUVfilename = string( ppArgs[i]+2 ); existingUVfilename = args.getArg("s").front();
break;
default:
break;
}
}
else
inputDirs.push_back(ppArgs[i]);
} }
string fmtName; std::vector<std::string> inputDirs = args.getAdditionalArg("input_path");
uint iNumDirs = (uint)inputDirs.size();
if( iNumDirs ) string fmtName = args.getAdditionalArg("output_filename").front();
{
fmtName = inputDirs.front(); // append PNG extension if no one provided
inputDirs.pop_front(); if (fmtName.rfind('.') == string::npos) fmtName += ".png";
--iNumDirs;
}
vector<string> AllMapNames; vector<string> AllMapNames;
list<string>::iterator it = inputDirs.begin(); vector<string>::iterator it = inputDirs.begin(), itEnd = inputDirs.end();
list<string>::iterator itEnd = inputDirs.end();
while( it != itEnd ) while( it != itEnd )
{ {
string sDir = *it++; string sDir = *it++;
if( !CFile::isDirectory(sDir) ) if( !CFile::isDirectory(sDir) )
{ {
outString (string("ERROR : directory ") + sDir + " does not exist\n"); outString (string("ERROR : directory ") + sDir + " does not exist\n");
@ -427,14 +413,15 @@ int main(int nNbArg, char **ppArgs)
string filename = CPath::lookup (existingUVfilename, false); string filename = CPath::lookup (existingUVfilename, false);
if( (filename == "") || (!iFile.open(filename)) ) if( (filename == "") || (!iFile.open(filename)) )
{ {
outString (string("ERROR : could not open file ") + existingUVfilename + "\n"); outString(toString("ERROR: Unable to open %s", existingUVfilename.c_str()));
return -1; return -1;
} }
// Write subset UV text file // Write subset UV text file
fmtName = fmtName.substr(0, fmtName.rfind('.')); fmtName = fmtName.substr(0, fmtName.rfind('.'));
fmtName += ".txt"; fmtName += ".txt";
FILE *f = fopen (fmtName.c_str(), "wt"); FILE *f = nlfopen(fmtName, "wt");
if (f == NULL) if (f == NULL)
{ {
outString (string("ERROR: Cannot write UV file : ") + fmtName + "\n"); outString (string("ERROR: Cannot write UV file : ") + fmtName + "\n");