Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Simplify outString (a simple printf should be enough)

Browse source
This commit is contained in:
kervala 2016-09-23 13:29:00 +02:00
parent af5bf969ff
commit b35b7325c9
1 changed files with 12 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
code/nel/tools/3d/build_interface/main.cpp
View file

@ -35,21 +35,9 @@ using namespace std;
using namespace NLMISC; using namespace NLMISC;
// *************************************************************************** // ***************************************************************************
//char sExeDir[MAX_PATH];
std::string sExeDir;
NLMISC::CApplicationContext _ApplicationContext;
void outString(const string &sText) void outString(const string &sText)
{ {
std::string sCurDir = CPath::getCurrentPath(); printf("%s\n", sText.c_str());
CPath::setCurrentPath(sExeDir.c_str());
//char sCurDir[MAX_PATH];
//GetCurrentDirectory (MAX_PATH, sCurDir);
//SetCurrentDirectory (sExeDir);
NLMISC::createDebug ();
NLMISC::InfoLog->displayRaw(sText.c_str());
//SetCurrentDirectory (sCurDir);
CPath::setCurrentPath(sCurDir.c_str());
} }
// *************************************************************************** // ***************************************************************************
@ -230,7 +218,7 @@ int main(int argc, char **argv)
if( !CFile::isDirectory(sDir) ) if( !CFile::isDirectory(sDir) )
{ {
outString (string("ERROR : directory ") + sDir + " does not exist\n"); outString(toString("ERROR: directory %s does not exist", sDir.c_str()));
return -1; return -1;
} }
CPath::getPathContent(sDir, false, false, true, AllMapNames); CPath::getPathContent(sDir, false, false, true, AllMapNames);
@ -256,7 +244,7 @@ int main(int argc, char **argv)
if (pBtmp->getPixelFormat() != CBitmap::RGBA) if (pBtmp->getPixelFormat() != CBitmap::RGBA)
{ {
nlwarning("Converting %s to RGBA (32 bits), originally using %u bits...", AllMapNames[i].c_str(), (uint)colors); outString(toString("Converting %s to RGBA (32 bits), originally using %u bits...", AllMapNames[i].c_str(), (uint)colors));
pBtmp->convertToType(CBitmap::RGBA); pBtmp->convertToType(CBitmap::RGBA);
} }
@ -266,7 +254,7 @@ int main(int argc, char **argv)
{ {
if (pBtmp) delete pBtmp; if (pBtmp) delete pBtmp;
outString (string("ERROR :") + e.what()); outString(toString("ERROR : %s", e.what()));
return -1; return -1;
} }
} }
@ -363,24 +351,11 @@ int main(int argc, char **argv)
fmtName += ".tga"; fmtName += ".tga";
if (outTga.open(fmtName)) if (outTga.open(fmtName))
{ {
std::string ext; outString(toString("Writing %s", fmtName.c_str()));
if (toLower(fmtName).find(".png") != string::npos)
{
ext = "png";
GlobalTexture.writePNG (outTga, 32);
} }
else else
{ {
ext = "tga"; outString(toString("ERROR: Unable to write %s", fmtName.c_str()));
GlobalTexture.writeTGA (outTga, 32);
}
outTga.close();
outString (toString("Writing %s file : %s\n", ext.c_str(), fmtName.c_str()));
}
else
{
outString (string("ERROR: Cannot write tga file : ") + fmtName + "\n");
} }
// Write UV text file // Write UV text file
@ -399,11 +374,12 @@ int main(int argc, char **argv)
UVMax[i].U, UVMax[i].V); UVMax[i].U, UVMax[i].V);
} }
fclose (f); fclose (f);
outString (string("Writing UV file : ") + fmtName + "\n");
outString(toString("Writing UV file %s", fmtName.c_str()));
} }
else else
{ {
outString (string("ERROR: Cannot write UV file : ") + fmtName + "\n"); outString(toString("ERROR: Cannot write UV file %s", fmtName.c_str()));
} }
} }
else // build as a subset else // build as a subset
@ -424,8 +400,7 @@ int main(int argc, char **argv)
if (f == NULL) if (f == NULL)
{ {
outString (string("ERROR: Cannot write UV file : ") + fmtName + "\n"); outString(toString("ERROR: Unable to write UV file %s", fmtName.c_str()));
// fclose (iFile);
return -1; return -1;
} }
@ -467,7 +442,7 @@ int main(int argc, char **argv)
} }
// fclose (iFile); // fclose (iFile);
fclose (f); fclose (f);
outString (string("Writing UV file : ") + fmtName + "\n"); outString(toString("Writing UV file: %s", fmtName.c_str()));
} }
return 0; return 0;