aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-10 09:19:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIXE: replace the WIN32 API for directories manipulation by the the POSIX API to compile with linux.

Browse source 
--HG--
branch : ig_elevaton_port_to_linux
This commit is contained in:
liria 2013-06-08 14:39:30 +02:00
parent cfc78bd614
commit 99efdb2a23
2 changed files with 62 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
code/nel/tools/3d/CMakeLists.txt
View file

@ -3,6 +3,7 @@ SUBDIRS(
build_far_bank build_far_bank
build_smallbank build_smallbank
ig_lighter ig_lighter
ig_elevation
zone_dependencies zone_dependencies
zone_ig_lighter zone_ig_lighter
zone_lighter zone_lighter
@ -26,7 +27,7 @@ SUBDIRS(
zviewer) zviewer)
IF(WIN32) IF(WIN32)
ADD_SUBDIRECTORY(ig_elevation) # ADD_SUBDIRECTORY(ig_elevation)
ADD_SUBDIRECTORY(lightmap_optimizer) ADD_SUBDIRECTORY(lightmap_optimizer)
IF(MFC_FOUND) IF(MFC_FOUND)

94
code/nel/tools/3d/ig_elevation/main.cpp
View file

@ -35,7 +35,14 @@
#include "nel/3d/scene_group.h" #include "nel/3d/scene_group.h"
#include <windows.h> // #include <windows.h>
#include <dirent.h> /* Pour l'utilisation des dossiers */
#ifndef WIN32
#include <sys/types.h>
#endif
#include <unistd.h> /* getcwd,chdir -- replacement for getCurDiretory & setCurDirectory on windows */
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@ -126,31 +133,43 @@ struct CZoneLimits
}; };
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
void dir (const string &sFilter, vector<string> &sAllFiles, bool bFullPath) void dir (const string &sFilter, vector<string> &sAllFiles, bool bFullPath)
{ {
WIN32_FIND_DATA findData; char sCurDir[MAX_PATH];
HANDLE hFind; DIR* dp = NULL;
char sCurDir[MAX_PATH]; struct dirent *dirp= NULL;
sAllFiles.clear ();
GetCurrentDirectory (MAX_PATH, sCurDir); getcwd ( sCurDir, MAX_PATH ) ;
hFind = FindFirstFile (sFilter.c_str(), &findData); sAllFiles.clear ();
while (hFind != INVALID_HANDLE_VALUE) if ( (dp = opendir( sCurDir )) == NULL) {
{ string sTmp = string("ERROR : Can't open the dir : \"")+string(sCurDir)+string("\"") ;
DWORD res = GetFileAttributes(findData.cFileName); outString ( sTmp ) ;
if (res != INVALID_FILE_ATTRIBUTES && !(res&FILE_ATTRIBUTE_DIRECTORY)) return ;
{ }
if (bFullPath)
sAllFiles.push_back(string(sCurDir) + "\\" + findData.cFileName); while ( (dirp = readdir(dp)) != NULL) {
else
sAllFiles.push_back(findData.cFileName);
} std:string sFileName = std::string(dirp->d_name) ;
if (FindNextFile (hFind, &findData) == 0) if ( sFileName.substr((sFileName.length()-sFilter.length()),sFilter.length()).
break; find(sFilter)!= std::string::npos )
} {
FindClose (hFind); if (bFullPath)
// on windows should we use "\\"
sAllFiles.push_back(string(sCurDir) + "/" + sFileName);
else
sAllFiles.push_back(sFileName);
}
}
closedir(dp);
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
CZoneRegion *loadLand (const string &filename) CZoneRegion *loadLand (const string &filename)
{ {
@ -222,12 +241,14 @@ void SaveInstanceGroup (const char* sFilename, CInstanceGroup *pIG)
} }
catch (const Exception &e) catch (const Exception &e)
{ {
outString(string(e.what())); string stTmp = string(e.what()) ;
outString( stTmp );
} }
} }
else else
{ {
outString(string("Couldn't create ") + sFilename); string stTemp = string("Couldn't create ") + string(sFilename) ;
outString( stTemp );
} }
} }
@ -274,7 +295,7 @@ int main(int nNbArg, char**ppArgs)
NL3D_BlockMemoryAssertOnPurge = false; NL3D_BlockMemoryAssertOnPurge = false;
char sCurDir[MAX_PATH]; char sCurDir[MAX_PATH];
GetCurrentDirectory (MAX_PATH, sCurDir); getcwd (sCurDir,MAX_PATH);
if (nNbArg != 2) if (nNbArg != 2)
{ {
@ -334,7 +355,9 @@ int main(int nNbArg, char**ppArgs)
} }
else else
{ {
outString(string("Couldn't not open " + options.HeightMapFile1 + " : heightmap 1 map ignored")); string sTmp = string("Couldn't not open ")+string(options.HeightMapFile1)
+string(" : heightmap 1 map ignored");
outString(sTmp);
delete HeightMap1; delete HeightMap1;
HeightMap1 = NULL; HeightMap1 = NULL;
} }
@ -360,7 +383,9 @@ int main(int nNbArg, char**ppArgs)
} }
else else
{ {
outString(string("Couldn't not open " + options.HeightMapFile2 + " : heightmap 2 map ignored\n")); string sTmp = string("Couldn't not open ")+string(options.HeightMapFile2)
+string(" : heightmap 2 map ignored\n");
outString(sTmp);
delete HeightMap2; delete HeightMap2;
HeightMap2 = NULL; HeightMap2 = NULL;
} }
@ -376,15 +401,15 @@ int main(int nNbArg, char**ppArgs)
// Get all files // Get all files
vector<string> vAllFiles; vector<string> vAllFiles;
SetCurrentDirectory (options.InputIGDir.c_str()); chdir (options.InputIGDir.c_str());
dir ("*.ig", vAllFiles, false); dir (".ig", vAllFiles, false);
SetCurrentDirectory (sCurDir); chdir (sCurDir);
for (uint32 i = 0; i < vAllFiles.size(); ++i) for (uint32 i = 0; i < vAllFiles.size(); ++i)
{ {
SetCurrentDirectory (options.InputIGDir.c_str()); chdir (options.InputIGDir.c_str());
CInstanceGroup *pIG = LoadInstanceGroup (vAllFiles[i].c_str()); CInstanceGroup *pIG = LoadInstanceGroup (vAllFiles[i].c_str());
SetCurrentDirectory (sCurDir); chdir (sCurDir);
if (pIG != NULL) if (pIG != NULL)
{ {
bool realTimeSunContribution = pIG->getRealTimeSunContribution(); bool realTimeSunContribution = pIG->getRealTimeSunContribution();
@ -459,12 +484,13 @@ int main(int nNbArg, char**ppArgs)
pIGout->enableRealTimeSunContribution(realTimeSunContribution); pIGout->enableRealTimeSunContribution(realTimeSunContribution);
SetCurrentDirectory (options.OutputIGDir.c_str()); chdir (options.OutputIGDir.c_str());
SaveInstanceGroup (vAllFiles[i].c_str(), pIGout); SaveInstanceGroup (vAllFiles[i].c_str(), pIGout);
SetCurrentDirectory (sCurDir); chdir (sCurDir);
delete pIG; delete pIG;
} }
} }
return 1; return 1;
} }