From cc7793ff97a6fbbf493250ec6646a7aeb8438eae Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 12 Dec 2015 11:24:01 +0100 Subject: [PATCH] Changed: Added new variable DumpVisualSlotsIndex to choose if we need to dump all visual slots index in vs_index.txt --- code/ryzom/tools/sheets_packer/sheets_packer.cfg | 1 + code/ryzom/tools/sheets_packer/sheets_packer_cfg.cpp | 3 +++ code/ryzom/tools/sheets_packer/sheets_packer_cfg.h | 5 ++++- code/ryzom/tools/sheets_packer/sheets_packer_init.cpp | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/code/ryzom/tools/sheets_packer/sheets_packer.cfg b/code/ryzom/tools/sheets_packer/sheets_packer.cfg index ab175d829..c6af1f4ca 100644 --- a/code/ryzom/tools/sheets_packer/sheets_packer.cfg +++ b/code/ryzom/tools/sheets_packer/sheets_packer.cfg @@ -8,3 +8,4 @@ WorldSheet = "ryzom.world"; PrimitivesPath = "../../common/data_leveldesign/primitives"; OutputDataPath = "../../client/data"; LigoPrimitiveClass = "world_editor_classes.xml"; +DumpVisualSlotsIndex = 1; diff --git a/code/ryzom/tools/sheets_packer/sheets_packer_cfg.cpp b/code/ryzom/tools/sheets_packer/sheets_packer_cfg.cpp index d44f6f1c0..b415205ce 100644 --- a/code/ryzom/tools/sheets_packer/sheets_packer_cfg.cpp +++ b/code/ryzom/tools/sheets_packer/sheets_packer_cfg.cpp @@ -147,6 +147,7 @@ const std::string ConfigFileName = "sheets_packer.cfg"; //--------------------------------------------------- CClientConfig::CClientConfig() { + DumpVisualSlotsIndex = false; }// CClientConfig // @@ -180,6 +181,8 @@ void setValues() READ_STRING(OutputDataPath) // Ligo primitive class READ_STRING(LigoPrimitiveClass) + //Dump VisualSlots index + READ_BOOL(DumpVisualSlotsIndex) ///////////// // FILTERS // diff --git a/code/ryzom/tools/sheets_packer/sheets_packer_cfg.h b/code/ryzom/tools/sheets_packer/sheets_packer_cfg.h index feeade016..dc100658c 100644 --- a/code/ryzom/tools/sheets_packer/sheets_packer_cfg.h +++ b/code/ryzom/tools/sheets_packer/sheets_packer_cfg.h @@ -51,8 +51,11 @@ struct CClientConfig /// Path where to create lmconts.packed std::string OutputDataPath; + // File containing LIGO primitives + std::string LigoPrimitiveClass; - std::string LigoPrimitiveClass; + // Whether dump visual slots index or not + bool DumpVisualSlotsIndex; public: /// Constructor. diff --git a/code/ryzom/tools/sheets_packer/sheets_packer_init.cpp b/code/ryzom/tools/sheets_packer/sheets_packer_init.cpp index 0415a01bc..51d6c0095 100644 --- a/code/ryzom/tools/sheets_packer/sheets_packer_init.cpp +++ b/code/ryzom/tools/sheets_packer/sheets_packer_init.cpp @@ -93,7 +93,7 @@ bool init() nlinfo("Loading sheets..."); IProgressCallback callback; SheetMngr.setOutputDataPath(AppCfg.OutputDataPath); - SheetMngr.load (callback, true, true); + SheetMngr.load (callback, true, true, AppCfg.DumpVisualSlotsIndex); // Make the lmconts.packed file if (!LigoConfig.readPrimitiveClass (AppCfg.LigoPrimitiveClass.c_str(), false))