Attached Files | openvibe-ogre.patch [^] (3,101 bytes) 2013-03-28 11:31 [Show Content] [Hide Content]Index: openvibe-kernel-omk/trunc/src/openvibe-kernel/kernel/player/ovkCOgreVisualisation.cpp
===================================================================
--- openvibe-kernel-omk/trunc/src/openvibe-kernel/kernel/player/ovkCOgreVisualisation.cpp (revision 3547)
+++ openvibe-kernel-omk/trunc/src/openvibe-kernel/kernel/player/ovkCOgreVisualisation.cpp (working copy)
@@ -26,16 +26,25 @@
finish();
}
+#ifdef TARGET_HAS_ThirdPartyOgre3D_1_8
+void COgreVisualisation::messageLogged(const String& message, LogMessageLevel lml, bool maskDebug, const String &logName, bool& skipThisMessage)
+#else
void COgreVisualisation::messageLogged(const String& message, LogMessageLevel lml, bool maskDebug, const String &logName)
+#endif
{
- switch(lml)
- {
- case Ogre::LML_CRITICAL:
- case Ogre::LML_TRIVIAL:
- case Ogre::LML_NORMAL:
- default:
- this->getLogManager() << m_eLogLevel << "<" << LogColor_PushStateBit << LogColor_ForegroundBlue << "Ogre3D" << LogColor_PopStateBit << "::Log> " << message.c_str() << "\n";
- break;
+#ifndef TARGET_HAS_ThirdPartyOgre3D_1_8
+ bool skipThisMessage = false;
+#endif
+ if (!skipThisMessage) {
+ switch(lml)
+ {
+ case Ogre::LML_CRITICAL:
+ case Ogre::LML_TRIVIAL:
+ case Ogre::LML_NORMAL:
+ default:
+ this->getLogManager() << m_eLogLevel << "<" << LogColor_PushStateBit << LogColor_ForegroundBlue << "Ogre3D" << LogColor_PopStateBit << "::Log> " << message.c_str() << "\n";
+ break;
+ }
}
}
Index: openvibe-kernel-omk/trunc/src/openvibe-kernel/kernel/player/ovkCOgreVisualisation.h
===================================================================
--- openvibe-kernel-omk/trunc/src/openvibe-kernel/kernel/player/ovkCOgreVisualisation.h (revision 3547)
+++ openvibe-kernel-omk/trunc/src/openvibe-kernel/kernel/player/ovkCOgreVisualisation.h (working copy)
@@ -41,7 +41,11 @@
* \param logName
* \logName the name of this log
*/
+#ifdef TARGET_HAS_ThirdPartyOgre3D_1_8
+ virtual void messageLogged(const Ogre::String& message, Ogre::LogMessageLevel lml, bool maskDebug, const Ogre::String &logName, bool &skipThisMessage);
+#else
virtual void messageLogged(const Ogre::String& message, Ogre::LogMessageLevel lml, bool maskDebug, const Ogre::String &logName);
+#endif
/**
* \brief Load configuration files and initialise Ogre
Index: cmake-modules/FindThirdPartyOgre3D.cmake
===================================================================
--- cmake-modules/FindThirdPartyOgre3D.cmake (revision 3547)
+++ cmake-modules/FindThirdPartyOgre3D.cmake (working copy)
@@ -41,6 +41,10 @@
INCLUDE_DIRECTORIES(${OIS_INCLUDE_DIRS} ${Ogre3D_INCLUDE_DIRS})
ADD_DEFINITIONS(${OIS_CFLAGS} ${Ogre3D_CFLAGS})
ADD_DEFINITIONS(${OIS_CFLAGS_OTHERS} ${Ogre3D_CFLAGS_OTHERS})
+ STRING(REGEX MATCH "^1.8." Ogre3D_VERSION_1_8 ${Ogre3D_VERSION})
+ IF(Ogre3D_VERSION_1_8)
+ ADD_DEFINITIONS(-DTARGET_HAS_ThirdPartyOgre3D_1_8)
+ ENDIF(Ogre3D_VERSION_1_8)
# MESSAGE(STATUS "A ${OIS_CFLAGS} ${Ogre3D_CFLAGS} B ${OIS_CFLAGS_OTHERS} ${Ogre3D_CFLAGS_OTHERS} C ${Ogre3D_LIBRARIES_RELEASE} D ${Ogre3D_LIBRARIES_DEBUG}")
IF(UNIX)
|