From 874ac2c921d4b1eadab19308080e9443ca6e68bf Mon Sep 17 00:00:00 2001 From: kaetemi Date: Tue, 16 Feb 2016 00:28:24 +0100 Subject: [PATCH] Move pipeline utilities into new pipeline library --HG-- branch : feature-material-editor --- .../nel/pipeline}/database_config.h | 4 ++++ .../nel/{misc => pipeline}/tool_logger.h | 22 +++++++++---------- code/nel/src/CMakeLists.txt | 4 ++++ code/nel/src/pipeline/CMakeLists.txt | 18 +++++++++++++++ .../pipeline}/database_config.cpp | 6 ++++- .../src/{misc => pipeline}/tool_logger.cpp | 7 +++--- code/nel/tools/3d/mesh_utils/CMakeLists.txt | 2 +- .../tools/3d/mesh_utils/assimp_material.cpp | 2 +- code/nel/tools/3d/mesh_utils/assimp_shape.cpp | 2 +- code/nel/tools/3d/mesh_utils/mesh_utils.cpp | 16 +++++++------- .../nel/tools/3d/mesh_utils/scene_context.cpp | 2 +- code/nel/tools/3d/mesh_utils/scene_context.h | 4 ++-- 12 files changed, 59 insertions(+), 30 deletions(-) rename code/nel/{tools/3d/mesh_utils => include/nel/pipeline}/database_config.h (97%) rename code/nel/include/nel/{misc => pipeline}/tool_logger.h (89%) create mode 100644 code/nel/src/pipeline/CMakeLists.txt rename code/nel/{tools/3d/mesh_utils => src/pipeline}/database_config.cpp (96%) rename code/nel/src/{misc => pipeline}/tool_logger.cpp (92%) diff --git a/code/nel/tools/3d/mesh_utils/database_config.h b/code/nel/include/nel/pipeline/database_config.h similarity index 97% rename from code/nel/tools/3d/mesh_utils/database_config.h rename to code/nel/include/nel/pipeline/database_config.h index 25bcc2a00..ec9bb6ec6 100644 --- a/code/nel/tools/3d/mesh_utils/database_config.h +++ b/code/nel/include/nel/pipeline/database_config.h @@ -28,6 +28,8 @@ typedef NLMISC::CSString TPathString; typedef std::string TPathString; #endif +namespace NLPIPELINE { + /// Asset database configuration class CDatabaseConfig { @@ -55,4 +57,6 @@ private: }; +} /* namespace NLPIPELINE */ + /* end of file */ diff --git a/code/nel/include/nel/misc/tool_logger.h b/code/nel/include/nel/pipeline/tool_logger.h similarity index 89% rename from code/nel/include/nel/misc/tool_logger.h rename to code/nel/include/nel/pipeline/tool_logger.h index ff78a6afa..55b3b2455 100644 --- a/code/nel/include/nel/misc/tool_logger.h +++ b/code/nel/include/nel/pipeline/tool_logger.h @@ -27,8 +27,8 @@ * . */ -#ifndef NLMISC_TOOL_LOGGER_H -#define NLMISC_TOOL_LOGGER_H +#ifndef NLPIPELINE_TOOL_LOGGER_H +#define NLPIPELINE_TOOL_LOGGER_H #include // STL includes @@ -47,16 +47,16 @@ #endif #ifdef NL_DEBUG_H -#define tlerror(toolLogger, path, error, ...) nlwarning(error, ## __VA_ARGS__), toolLogger.writeError(NLMISC::ERROR, path, error, ## __VA_ARGS__) -#define tlwarning(toolLogger, path, error, ...) nlwarning(error, ## __VA_ARGS__), toolLogger.writeError(NLMISC::WARNING, path, error, ## __VA_ARGS__) -#define tlmessage(toolLogger, path, error, ...) nlinfo(error, ## __VA_ARGS__), toolLogger.writeError(NLMISC::MESSAGE, path, error, ## __VA_ARGS__) +#define tlerror(toolLogger, path, error, ...) nlwarning(error, ## __VA_ARGS__), toolLogger.writeError(NLPIPELINE::ERROR, path, error, ## __VA_ARGS__) +#define tlwarning(toolLogger, path, error, ...) nlwarning(error, ## __VA_ARGS__), toolLogger.writeError(NLPIPELINE::WARNING, path, error, ## __VA_ARGS__) +#define tlmessage(toolLogger, path, error, ...) nlinfo(error, ## __VA_ARGS__), toolLogger.writeError(NLPIPELINE::MESSAGE, path, error, ## __VA_ARGS__) #else -#define tlerror(toolLogger, path, error, ...) toolLogger.writeError(NLMISC::ERROR, path, error, ## __VA_ARGS__) -#define tlwarning(toolLogger, path, error, ...) toolLogger.writeError(NLMISC::WARNING, path, error, ## __VA_ARGS__) -#define tlmessage(toolLogger, path, error, ...) toolLogger.writeError(NLMISC::MESSAGE, path, error, ## __VA_ARGS__) +#define tlerror(toolLogger, path, error, ...) toolLogger.writeError(NLPIPELINE::ERROR, path, error, ## __VA_ARGS__) +#define tlwarning(toolLogger, path, error, ...) toolLogger.writeError(NLPIPELINE::WARNING, path, error, ## __VA_ARGS__) +#define tlmessage(toolLogger, path, error, ...) toolLogger.writeError(NLPIPELINE::MESSAGE, path, error, ## __VA_ARGS__) #endif -namespace NLMISC { +namespace NLPIPELINE { enum TError { @@ -203,8 +203,8 @@ public: } }; /* class CToolLogger */ -} /* namespace NLMISC */ +} /* namespace NLPIPELINE */ -#endif /* #ifndef NLMISC_TOOL_LOGGER_H */ +#endif /* #ifndef NLPIPELINE_TOOL_LOGGER_H */ /* end of file */ diff --git a/code/nel/src/CMakeLists.txt b/code/nel/src/CMakeLists.txt index 06faa5251..60e5afccb 100644 --- a/code/nel/src/CMakeLists.txt +++ b/code/nel/src/CMakeLists.txt @@ -35,3 +35,7 @@ ENDIF(WITH_NEL_CEGUI) IF(WITH_PACS) ADD_SUBDIRECTORY(pacs) ENDIF(WITH_PACS) + +IF(WITH_NEL_TOOLS) + ADD_SUBDIRECTORY(pipeline) +ENDIF(WITH_NEL_TOOLS) diff --git a/code/nel/src/pipeline/CMakeLists.txt b/code/nel/src/pipeline/CMakeLists.txt new file mode 100644 index 000000000..47ab9a376 --- /dev/null +++ b/code/nel/src/pipeline/CMakeLists.txt @@ -0,0 +1,18 @@ +FILE(GLOB SRC *.cpp *.h) +FILE(GLOB HEADERS ../../include/nel/pipeline/*.h) + +SOURCE_GROUP("" FILES ${HEADERS} ${SRC}) + +NL_TARGET_LIB(nelpipeline ${HEADERS} ${SRC}) + +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) + +TARGET_LINK_LIBRARIES(nelpipeline nelmisc) +NL_DEFAULT_PROPS(nelpipeline "NeL, Library: NeL Pipeline") +NL_ADD_RUNTIME_FLAGS(nelpipeline) + +NL_ADD_LIB_SUFFIX(nelpipeline) + +IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC) + INSTALL(TARGETS nelpipeline LIBRARY DESTINATION ${NL_LIB_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT libraries) +ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC) diff --git a/code/nel/tools/3d/mesh_utils/database_config.cpp b/code/nel/src/pipeline/database_config.cpp similarity index 96% rename from code/nel/tools/3d/mesh_utils/database_config.cpp rename to code/nel/src/pipeline/database_config.cpp index 7e6ea5b37..b326a2888 100644 --- a/code/nel/tools/3d/mesh_utils/database_config.cpp +++ b/code/nel/src/pipeline/database_config.cpp @@ -16,7 +16,7 @@ // along with this program. If not, see . #include -#include "database_config.h" +#include "nel/pipeline/database_config.h" #include #include @@ -25,6 +25,8 @@ using namespace std; using namespace NLMISC; +namespace NLPIPELINE { + TPathString CDatabaseConfig::s_RootPath; NLMISC::CConfigFile *CDatabaseConfig::s_ConfigFile = NULL; CDatabaseConfig CDatabaseConfig::s_Instance; @@ -104,4 +106,6 @@ void CDatabaseConfig::release() cleanup(); } +} /* namespace NLPIPELINE */ + /* end of file */ diff --git a/code/nel/src/misc/tool_logger.cpp b/code/nel/src/pipeline/tool_logger.cpp similarity index 92% rename from code/nel/src/misc/tool_logger.cpp rename to code/nel/src/pipeline/tool_logger.cpp index e6a9fbf36..064e25f77 100644 --- a/code/nel/src/misc/tool_logger.cpp +++ b/code/nel/src/pipeline/tool_logger.cpp @@ -25,8 +25,7 @@ * . */ -#include "stdmisc.h" -#include "nel/misc/tool_logger.h" +#include "nel/pipeline/tool_logger.h" // STL includes @@ -35,11 +34,11 @@ // Project includes -namespace NLMISC { +namespace NLPIPELINE { // Tool logger is fully implemented in header so small tools do not need to link to this library unnecessarily. void dummy_tool_logger_cpp() { } -} /* namespace NLMISC */ +} /* namespace NLPIPELINE */ /* end of file */ diff --git a/code/nel/tools/3d/mesh_utils/CMakeLists.txt b/code/nel/tools/3d/mesh_utils/CMakeLists.txt index a5a9fa952..c8390587c 100644 --- a/code/nel/tools/3d/mesh_utils/CMakeLists.txt +++ b/code/nel/tools/3d/mesh_utils/CMakeLists.txt @@ -7,7 +7,7 @@ INCLUDE_DIRECTORIES(${assimp_INCLUDE_DIRS}) NL_TARGET_LIB(mesh_utils ${SRCS} ${HDRS}) -TARGET_LINK_LIBRARIES(mesh_utils ${assimp_LIBRARIES} nelmisc nel3d) +TARGET_LINK_LIBRARIES(mesh_utils ${assimp_LIBRARIES} nelmisc nelpipeline nel3d) NL_DEFAULT_PROPS(mesh_utils "NeL, Tools, 3D: Mesh Utils") NL_ADD_RUNTIME_FLAGS(mesh_utils) diff --git a/code/nel/tools/3d/mesh_utils/assimp_material.cpp b/code/nel/tools/3d/mesh_utils/assimp_material.cpp index 5dbe8643c..4830d1b33 100644 --- a/code/nel/tools/3d/mesh_utils/assimp_material.cpp +++ b/code/nel/tools/3d/mesh_utils/assimp_material.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include diff --git a/code/nel/tools/3d/mesh_utils/assimp_shape.cpp b/code/nel/tools/3d/mesh_utils/assimp_shape.cpp index 7b404d1e2..7ab0729ae 100644 --- a/code/nel/tools/3d/mesh_utils/assimp_shape.cpp +++ b/code/nel/tools/3d/mesh_utils/assimp_shape.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include diff --git a/code/nel/tools/3d/mesh_utils/mesh_utils.cpp b/code/nel/tools/3d/mesh_utils/mesh_utils.cpp index b8d70660e..0b7025d0e 100644 --- a/code/nel/tools/3d/mesh_utils/mesh_utils.cpp +++ b/code/nel/tools/3d/mesh_utils/mesh_utils.cpp @@ -19,7 +19,8 @@ #include "mesh_utils.h" #include -#include +#include +#include #include #include #include @@ -28,7 +29,6 @@ #include #include -#include "database_config.h" #include "scene_meta.h" #include @@ -231,7 +231,7 @@ void exportShapes(CMeshUtilsContext &context) if (nodeContext.Shape) { std::string shapePath = NLMISC::CPath::standardizePath(context.Settings.DestinationDirectoryPath, true) + it->first + ".shape"; - context.ToolLogger.writeDepend(NLMISC::BUILD, shapePath.c_str(), "*"); + context.ToolLogger.writeDepend(NLPIPELINE::BUILD, shapePath.c_str(), "*"); NLMISC::COFile f; if (f.open(shapePath, false, false, true)) { @@ -262,7 +262,7 @@ void exportShapes(CMeshUtilsContext &context) std::string knownPath = NLMISC::CPath::lookup(fileName, false, false, false); if (!knownPath.empty()) { - context.ToolLogger.writeDepend(NLMISC::RUNTIME, shapePath.c_str(), knownPath.c_str()); + context.ToolLogger.writeDepend(NLPIPELINE::RUNTIME, shapePath.c_str(), knownPath.c_str()); } else { @@ -289,16 +289,16 @@ int exportScene(const CMeshUtilsSettings &settings) context.ToolLogger.initDepend(settings.ToolDependLog); if (!settings.ToolErrorLog.empty()) context.ToolLogger.initError(settings.ToolErrorLog); - context.ToolLogger.writeDepend(NLMISC::BUILD, "*", NLMISC::CPath::standardizePath(context.Settings.SourceFilePath, false).c_str()); // Base input file + context.ToolLogger.writeDepend(NLPIPELINE::BUILD, "*", NLMISC::CPath::standardizePath(context.Settings.SourceFilePath, false).c_str()); // Base input file // Apply database configuration - if (!CDatabaseConfig::init(settings.SourceFilePath)) + if (!NLPIPELINE::CDatabaseConfig::init(settings.SourceFilePath)) { tlerror(context.ToolLogger, context.Settings.SourceFilePath.c_str(), "Unable to find database.cfg in input path or any of its parents."); return EXIT_FAILURE; } - CDatabaseConfig::initTextureSearchDirectories(); + NLPIPELINE::CDatabaseConfig::initTextureSearchDirectories(); Assimp::Importer importer; const aiScene *scene = importer.ReadFile(settings.SourceFilePath, 0 @@ -321,7 +321,7 @@ int exportScene(const CMeshUtilsSettings &settings) context.InternalScene = scene; if (context.SceneMeta.load(context.Settings.SourceFilePath)) - context.ToolLogger.writeDepend(NLMISC::BUILD, "*", context.SceneMeta.metaFilePath().c_str()); // Meta input file + context.ToolLogger.writeDepend(NLPIPELINE::BUILD, "*", context.SceneMeta.metaFilePath().c_str()); // Meta input file validateInternalNodeNames(context, context.InternalScene->mRootNode); diff --git a/code/nel/tools/3d/mesh_utils/scene_context.cpp b/code/nel/tools/3d/mesh_utils/scene_context.cpp index 6812a312a..243f13482 100644 --- a/code/nel/tools/3d/mesh_utils/scene_context.cpp +++ b/code/nel/tools/3d/mesh_utils/scene_context.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include using namespace std; using namespace NLMISC; diff --git a/code/nel/tools/3d/mesh_utils/scene_context.h b/code/nel/tools/3d/mesh_utils/scene_context.h index 714e3ff54..10fa55e46 100644 --- a/code/nel/tools/3d/mesh_utils/scene_context.h +++ b/code/nel/tools/3d/mesh_utils/scene_context.h @@ -23,7 +23,7 @@ #include "scene_meta.h" #include -#include +#include #include #include @@ -67,7 +67,7 @@ struct CMeshUtilsContext const CMeshUtilsSettings &Settings; - NLMISC::CToolLogger ToolLogger; + NLPIPELINE::CToolLogger ToolLogger; const NL_SCENE_INTERNAL_TYPE *InternalScene; CSceneMeta SceneMeta;