Include world editor files directory in prim export
--HG-- branch : build_pipeline_py
This commit is contained in:
parent
1a0ee41780
commit
7219073bdc
2 changed files with 8 additions and 0 deletions
|
@ -101,6 +101,8 @@ if (ContinentLeveldesignWorldDirectory != "") or (len(IgOtherSourceDirectories)
|
|||
mkPath(log, continentDir)
|
||||
formDir = LeveldesignDirectory
|
||||
mkPath(log, LeveldesignDirectory)
|
||||
worldEditorFiles = WorldEditorFilesDirectory
|
||||
mkPath(log, WorldEditorFilesDirectory)
|
||||
|
||||
printLog(log, "CONFIG " + configFile)
|
||||
cf = open(configFile, "w")
|
||||
|
@ -123,6 +125,7 @@ if (ContinentLeveldesignWorldDirectory != "") or (len(IgOtherSourceDirectories)
|
|||
cf.write("};\n")
|
||||
cf.write("\n")
|
||||
cf.write("FormDir = \"" + formDir + "\";\n")
|
||||
cf.write("WorldEditorFiles = \"" + worldEditorFiles + "\";\n")
|
||||
cf.write("\n")
|
||||
cf.close()
|
||||
subprocess.call([ PrimExport, configFile ])
|
||||
|
|
|
@ -329,6 +329,7 @@ struct CExportOptions
|
|||
std::vector<std::string> PrimDirs; // Directory to parse for .flora and .prim associated
|
||||
// This is here we get continent.cfg file
|
||||
std::string FormDir; // Directory to get georges dfn
|
||||
std::string WorldEditorFiles;
|
||||
|
||||
CExportOptions ();
|
||||
bool loadcf (NLMISC::CConfigFile &cf);
|
||||
|
@ -372,6 +373,9 @@ bool CExportOptions::loadcf (CConfigFile &cf)
|
|||
CConfigFile::CVar &cvFormDir = cf.getVar("FormDir");
|
||||
FormDir = cvFormDir.asString();
|
||||
|
||||
CConfigFile::CVar &cvWorldEditorFiles = cf.getVar("WorldEditorFiles");
|
||||
WorldEditorFiles = cvWorldEditorFiles.asString();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -774,6 +778,7 @@ int main (int argc, char**argv)
|
|||
// *** Add pathes in the search path for georges forms
|
||||
|
||||
CPath::addSearchPath (options.FormDir, true, true);
|
||||
CPath::addSearchPath (options.WorldEditorFiles, true, true);
|
||||
|
||||
// Ligo config
|
||||
CLigoConfig config;
|
||||
|
|
Loading…
Reference in a new issue