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

Include world editor files directory in prim export

Browse source 
--HG--
branch : build_pipeline_py
This commit is contained in:
kaetemi 2014-02-07 01:49:16 +01:00
parent 1a0ee41780
commit 7219073bdc
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
code/nel/tools/build_gamedata/processes/ig/2_build.py
View file

@ -101,6 +101,8 @@ if (ContinentLeveldesignWorldDirectory != "") or (len(IgOtherSourceDirectories)
mkPath(log, continentDir) mkPath(log, continentDir)
formDir = LeveldesignDirectory formDir = LeveldesignDirectory
mkPath(log, LeveldesignDirectory) mkPath(log, LeveldesignDirectory)
worldEditorFiles = WorldEditorFilesDirectory
mkPath(log, WorldEditorFilesDirectory)
printLog(log, "CONFIG " + configFile) printLog(log, "CONFIG " + configFile)
cf = open(configFile, "w") cf = open(configFile, "w")
@ -123,6 +125,7 @@ if (ContinentLeveldesignWorldDirectory != "") or (len(IgOtherSourceDirectories)
cf.write("};\n") cf.write("};\n")
cf.write("\n") cf.write("\n")
cf.write("FormDir = \"" + formDir + "\";\n") cf.write("FormDir = \"" + formDir + "\";\n")
cf.write("WorldEditorFiles = \"" + worldEditorFiles + "\";\n")
cf.write("\n") cf.write("\n")
cf.close() cf.close()
subprocess.call([ PrimExport, configFile ]) subprocess.call([ PrimExport, configFile ])

5
code/ryzom/tools/leveldesign/prim_export/main.cpp
View file

@ -329,6 +329,7 @@ struct CExportOptions
std::vector<std::string> PrimDirs; // Directory to parse for .flora and .prim associated std::vector<std::string> PrimDirs; // Directory to parse for .flora and .prim associated
// This is here we get continent.cfg file // This is here we get continent.cfg file
std::string FormDir; // Directory to get georges dfn std::string FormDir; // Directory to get georges dfn
std::string WorldEditorFiles;
CExportOptions (); CExportOptions ();
bool loadcf (NLMISC::CConfigFile &cf); bool loadcf (NLMISC::CConfigFile &cf);
@ -372,6 +373,9 @@ bool CExportOptions::loadcf (CConfigFile &cf)
CConfigFile::CVar &cvFormDir = cf.getVar("FormDir"); CConfigFile::CVar &cvFormDir = cf.getVar("FormDir");
FormDir = cvFormDir.asString(); FormDir = cvFormDir.asString();
CConfigFile::CVar &cvWorldEditorFiles = cf.getVar("WorldEditorFiles");
WorldEditorFiles = cvWorldEditorFiles.asString();
return true; return true;
} }
@ -774,6 +778,7 @@ int main (int argc, char**argv)
// *** Add pathes in the search path for georges forms // *** Add pathes in the search path for georges forms
CPath::addSearchPath (options.FormDir, true, true); CPath::addSearchPath (options.FormDir, true, true);
CPath::addSearchPath (options.WorldEditorFiles, true, true);
// Ligo config // Ligo config
CLigoConfig config; CLigoConfig config;