From f259cc7dcaaa5811f1f59d11643bcbd18d970c9b Mon Sep 17 00:00:00 2001 From: kaetemi Date: Fri, 7 Feb 2014 01:49:16 +0100 Subject: [PATCH] Include world editor files directory in prim export --- code/nel/tools/build_gamedata/processes/ig/2_build.py | 3 +++ code/ryzom/tools/leveldesign/prim_export/main.cpp | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/code/nel/tools/build_gamedata/processes/ig/2_build.py b/code/nel/tools/build_gamedata/processes/ig/2_build.py index 6c5b14961..538071b7d 100644 --- a/code/nel/tools/build_gamedata/processes/ig/2_build.py +++ b/code/nel/tools/build_gamedata/processes/ig/2_build.py @@ -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 ]) diff --git a/code/ryzom/tools/leveldesign/prim_export/main.cpp b/code/ryzom/tools/leveldesign/prim_export/main.cpp index 6c7bb14f0..86aeafa62 100644 --- a/code/ryzom/tools/leveldesign/prim_export/main.cpp +++ b/code/ryzom/tools/leveldesign/prim_export/main.cpp @@ -329,6 +329,7 @@ struct CExportOptions std::vector 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;