From 1f8983c1b2aeac847cc5456ac425757b07c30fd5 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Fri, 8 Apr 2016 21:53:09 +0200 Subject: [PATCH] [DEV] update new etk::FSNode and debug --- ege/resource/MeshEmf.cpp | 2 +- sample/CameraPosition/appl/debug.h | 36 ++++++++++++------------------ sample/Collision/appl/debug.h | 36 ++++++++++++------------------ sample/DoubleView/appl/debug.h | 36 ++++++++++++------------------ sample/MeshCreator/appl/debug.h | 36 ++++++++++++------------------ sample/RayTest/appl/debug.h | 34 +++++++++++----------------- 6 files changed, 70 insertions(+), 110 deletions(-) diff --git a/ege/resource/MeshEmf.cpp b/ege/resource/MeshEmf.cpp index e4ee9f5..8d1018d 100644 --- a/ege/resource/MeshEmf.cpp +++ b/ege/resource/MeshEmf.cpp @@ -48,7 +48,7 @@ static int32_t countIndent(etk::FSNode& _file) { } } //EGE_DEBUG("indent : " << nbIndent); - _file.fileSeek(-nbChar, etk::FSN_SEEK_CURRENT); + _file.fileSeek(-nbChar, etk::seekNode_current); return nbIndent; } diff --git a/sample/CameraPosition/appl/debug.h b/sample/CameraPosition/appl/debug.h index f8a0555..3c863ac 100644 --- a/sample/CameraPosition/appl/debug.h +++ b/sample/CameraPosition/appl/debug.h @@ -11,31 +11,23 @@ namespace appl { int32_t getLogId(); -}; -// TODO : Review this problem of multiple intanciation of "std::stringbuf sb" -#define APPL_BASE(info,data) \ - do { \ - if (info <= elog::getLevel(appl::getLogId())) { \ - std::stringbuf sb; \ - std::ostream tmpStream(&sb); \ - tmpStream << data; \ - elog::logStream(appl::getLogId(), info, __LINE__, __class__, __func__, tmpStream); \ - } \ - } while(0) +} +#define APPL_BASE(info,data) ELOG_BASE(appl::getLogId(),info,data) -#define APPL_CRITICAL(data) APPL_BASE(1, data) -#define APPL_ERROR(data) APPL_BASE(2, data) -#define APPL_WARNING(data) APPL_BASE(3, data) +#define APPL_PRINT(data) APPL_BASE(-1, data) +#define APPL_CRITICAL(data) APPL_BASE(1, data) +#define APPL_ERROR(data) APPL_BASE(2, data) +#define APPL_WARNING(data) APPL_BASE(3, data) #ifdef DEBUG - #define APPL_INFO(data) APPL_BASE(4, data) - #define APPL_DEBUG(data) APPL_BASE(5, data) - #define APPL_VERBOSE(data) APPL_BASE(6, data) - #define APPL_TODO(data) APPL_BASE(4, "TODO : " << data) + #define APPL_INFO(data) APPL_BASE(4, data) + #define APPL_DEBUG(data) APPL_BASE(5, data) + #define APPL_VERBOSE(data) APPL_BASE(6, data) + #define APPL_TODO(data) APPL_BASE(4, "TODO : " << data) #else - #define APPL_INFO(data) do { } while(false) - #define APPL_DEBUG(data) do { } while(false) - #define APPL_VERBOSE(data) do { } while(false) - #define APPL_TODO(data) do { } while(false) + #define APPL_INFO(data) do { } while(false) + #define APPL_DEBUG(data) do { } while(false) + #define APPL_VERBOSE(data) do { } while(false) + #define APPL_TODO(data) do { } while(false) #endif #define APPL_ASSERT(cond,data) \ diff --git a/sample/Collision/appl/debug.h b/sample/Collision/appl/debug.h index f8a0555..3c863ac 100644 --- a/sample/Collision/appl/debug.h +++ b/sample/Collision/appl/debug.h @@ -11,31 +11,23 @@ namespace appl { int32_t getLogId(); -}; -// TODO : Review this problem of multiple intanciation of "std::stringbuf sb" -#define APPL_BASE(info,data) \ - do { \ - if (info <= elog::getLevel(appl::getLogId())) { \ - std::stringbuf sb; \ - std::ostream tmpStream(&sb); \ - tmpStream << data; \ - elog::logStream(appl::getLogId(), info, __LINE__, __class__, __func__, tmpStream); \ - } \ - } while(0) +} +#define APPL_BASE(info,data) ELOG_BASE(appl::getLogId(),info,data) -#define APPL_CRITICAL(data) APPL_BASE(1, data) -#define APPL_ERROR(data) APPL_BASE(2, data) -#define APPL_WARNING(data) APPL_BASE(3, data) +#define APPL_PRINT(data) APPL_BASE(-1, data) +#define APPL_CRITICAL(data) APPL_BASE(1, data) +#define APPL_ERROR(data) APPL_BASE(2, data) +#define APPL_WARNING(data) APPL_BASE(3, data) #ifdef DEBUG - #define APPL_INFO(data) APPL_BASE(4, data) - #define APPL_DEBUG(data) APPL_BASE(5, data) - #define APPL_VERBOSE(data) APPL_BASE(6, data) - #define APPL_TODO(data) APPL_BASE(4, "TODO : " << data) + #define APPL_INFO(data) APPL_BASE(4, data) + #define APPL_DEBUG(data) APPL_BASE(5, data) + #define APPL_VERBOSE(data) APPL_BASE(6, data) + #define APPL_TODO(data) APPL_BASE(4, "TODO : " << data) #else - #define APPL_INFO(data) do { } while(false) - #define APPL_DEBUG(data) do { } while(false) - #define APPL_VERBOSE(data) do { } while(false) - #define APPL_TODO(data) do { } while(false) + #define APPL_INFO(data) do { } while(false) + #define APPL_DEBUG(data) do { } while(false) + #define APPL_VERBOSE(data) do { } while(false) + #define APPL_TODO(data) do { } while(false) #endif #define APPL_ASSERT(cond,data) \ diff --git a/sample/DoubleView/appl/debug.h b/sample/DoubleView/appl/debug.h index f8a0555..3c863ac 100644 --- a/sample/DoubleView/appl/debug.h +++ b/sample/DoubleView/appl/debug.h @@ -11,31 +11,23 @@ namespace appl { int32_t getLogId(); -}; -// TODO : Review this problem of multiple intanciation of "std::stringbuf sb" -#define APPL_BASE(info,data) \ - do { \ - if (info <= elog::getLevel(appl::getLogId())) { \ - std::stringbuf sb; \ - std::ostream tmpStream(&sb); \ - tmpStream << data; \ - elog::logStream(appl::getLogId(), info, __LINE__, __class__, __func__, tmpStream); \ - } \ - } while(0) +} +#define APPL_BASE(info,data) ELOG_BASE(appl::getLogId(),info,data) -#define APPL_CRITICAL(data) APPL_BASE(1, data) -#define APPL_ERROR(data) APPL_BASE(2, data) -#define APPL_WARNING(data) APPL_BASE(3, data) +#define APPL_PRINT(data) APPL_BASE(-1, data) +#define APPL_CRITICAL(data) APPL_BASE(1, data) +#define APPL_ERROR(data) APPL_BASE(2, data) +#define APPL_WARNING(data) APPL_BASE(3, data) #ifdef DEBUG - #define APPL_INFO(data) APPL_BASE(4, data) - #define APPL_DEBUG(data) APPL_BASE(5, data) - #define APPL_VERBOSE(data) APPL_BASE(6, data) - #define APPL_TODO(data) APPL_BASE(4, "TODO : " << data) + #define APPL_INFO(data) APPL_BASE(4, data) + #define APPL_DEBUG(data) APPL_BASE(5, data) + #define APPL_VERBOSE(data) APPL_BASE(6, data) + #define APPL_TODO(data) APPL_BASE(4, "TODO : " << data) #else - #define APPL_INFO(data) do { } while(false) - #define APPL_DEBUG(data) do { } while(false) - #define APPL_VERBOSE(data) do { } while(false) - #define APPL_TODO(data) do { } while(false) + #define APPL_INFO(data) do { } while(false) + #define APPL_DEBUG(data) do { } while(false) + #define APPL_VERBOSE(data) do { } while(false) + #define APPL_TODO(data) do { } while(false) #endif #define APPL_ASSERT(cond,data) \ diff --git a/sample/MeshCreator/appl/debug.h b/sample/MeshCreator/appl/debug.h index f8a0555..3c863ac 100644 --- a/sample/MeshCreator/appl/debug.h +++ b/sample/MeshCreator/appl/debug.h @@ -11,31 +11,23 @@ namespace appl { int32_t getLogId(); -}; -// TODO : Review this problem of multiple intanciation of "std::stringbuf sb" -#define APPL_BASE(info,data) \ - do { \ - if (info <= elog::getLevel(appl::getLogId())) { \ - std::stringbuf sb; \ - std::ostream tmpStream(&sb); \ - tmpStream << data; \ - elog::logStream(appl::getLogId(), info, __LINE__, __class__, __func__, tmpStream); \ - } \ - } while(0) +} +#define APPL_BASE(info,data) ELOG_BASE(appl::getLogId(),info,data) -#define APPL_CRITICAL(data) APPL_BASE(1, data) -#define APPL_ERROR(data) APPL_BASE(2, data) -#define APPL_WARNING(data) APPL_BASE(3, data) +#define APPL_PRINT(data) APPL_BASE(-1, data) +#define APPL_CRITICAL(data) APPL_BASE(1, data) +#define APPL_ERROR(data) APPL_BASE(2, data) +#define APPL_WARNING(data) APPL_BASE(3, data) #ifdef DEBUG - #define APPL_INFO(data) APPL_BASE(4, data) - #define APPL_DEBUG(data) APPL_BASE(5, data) - #define APPL_VERBOSE(data) APPL_BASE(6, data) - #define APPL_TODO(data) APPL_BASE(4, "TODO : " << data) + #define APPL_INFO(data) APPL_BASE(4, data) + #define APPL_DEBUG(data) APPL_BASE(5, data) + #define APPL_VERBOSE(data) APPL_BASE(6, data) + #define APPL_TODO(data) APPL_BASE(4, "TODO : " << data) #else - #define APPL_INFO(data) do { } while(false) - #define APPL_DEBUG(data) do { } while(false) - #define APPL_VERBOSE(data) do { } while(false) - #define APPL_TODO(data) do { } while(false) + #define APPL_INFO(data) do { } while(false) + #define APPL_DEBUG(data) do { } while(false) + #define APPL_VERBOSE(data) do { } while(false) + #define APPL_TODO(data) do { } while(false) #endif #define APPL_ASSERT(cond,data) \ diff --git a/sample/RayTest/appl/debug.h b/sample/RayTest/appl/debug.h index f8a0555..28cd11d 100644 --- a/sample/RayTest/appl/debug.h +++ b/sample/RayTest/appl/debug.h @@ -12,30 +12,22 @@ namespace appl { int32_t getLogId(); }; -// TODO : Review this problem of multiple intanciation of "std::stringbuf sb" -#define APPL_BASE(info,data) \ - do { \ - if (info <= elog::getLevel(appl::getLogId())) { \ - std::stringbuf sb; \ - std::ostream tmpStream(&sb); \ - tmpStream << data; \ - elog::logStream(appl::getLogId(), info, __LINE__, __class__, __func__, tmpStream); \ - } \ - } while(0) +#define APPL_BASE(info,data) ELOG_BASE(appl::getLogId(),info,data) -#define APPL_CRITICAL(data) APPL_BASE(1, data) -#define APPL_ERROR(data) APPL_BASE(2, data) -#define APPL_WARNING(data) APPL_BASE(3, data) +#define APPL_PRINT(data) APPL_BASE(-1, data) +#define APPL_CRITICAL(data) APPL_BASE(1, data) +#define APPL_ERROR(data) APPL_BASE(2, data) +#define APPL_WARNING(data) APPL_BASE(3, data) #ifdef DEBUG - #define APPL_INFO(data) APPL_BASE(4, data) - #define APPL_DEBUG(data) APPL_BASE(5, data) - #define APPL_VERBOSE(data) APPL_BASE(6, data) - #define APPL_TODO(data) APPL_BASE(4, "TODO : " << data) + #define APPL_INFO(data) APPL_BASE(4, data) + #define APPL_DEBUG(data) APPL_BASE(5, data) + #define APPL_VERBOSE(data) APPL_BASE(6, data) + #define APPL_TODO(data) APPL_BASE(4, "TODO : " << data) #else - #define APPL_INFO(data) do { } while(false) - #define APPL_DEBUG(data) do { } while(false) - #define APPL_VERBOSE(data) do { } while(false) - #define APPL_TODO(data) do { } while(false) + #define APPL_INFO(data) do { } while(false) + #define APPL_DEBUG(data) do { } while(false) + #define APPL_VERBOSE(data) do { } while(false) + #define APPL_TODO(data) do { } while(false) #endif #define APPL_ASSERT(cond,data) \