Changeset 9669 for code/branches/libs
- Timestamp:
- Sep 4, 2013, 9:49:17 PM (11 years ago)
- Location:
- code/branches/libs/src
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/libs/src/libraries/core/GraphicsManager.cc
r9667 r9669 402 402 The name of this log (so you can have several listeners 403 403 for different logs, and identify them) 404 @param skipThisMessage 405 If set to true by the messageLogged() implementation message will not be logged 404 406 */ 407 #if OGRE_VERSION >= 0x010800 408 void GraphicsManager::messageLogged(const std::string& message, 409 Ogre::LogMessageLevel lml, bool maskDebug, const std::string& logName, bool& skipThisMessage) 410 // TODO: do we have to ignore the message if skipThisMessage is set? 411 #else 405 412 void GraphicsManager::messageLogged(const std::string& message, 406 413 Ogre::LogMessageLevel lml, bool maskDebug, const std::string& logName) 414 #endif 407 415 { 408 416 OutputLevel orxonoxLevel; -
code/branches/libs/src/libraries/core/GraphicsManager.h
r9667 r9669 108 108 109 109 // event from Ogre::LogListener 110 void messageLogged(const std::string& message, Ogre::LogMessageLevel lml, 111 bool maskDebug, const std::string& logName); 110 #if OGRE_VERSION >= 0x010800 111 void messageLogged(const std::string& message, Ogre::LogMessageLevel lml, bool maskDebug, const std::string& logName, bool& skipThisMessage); 112 #else 113 void messageLogged(const std::string& message, Ogre::LogMessageLevel lml, bool maskDebug, const std::string& logName); 114 #endif 112 115 113 116 // console commands -
code/branches/libs/src/libraries/core/Resource.cc
r8351 r9669 101 101 ptr->group = group; 102 102 ptr->size = it->uncompressedSize; 103 #if OGRE_VERSION >= 0x010800 104 if (dynamic_cast<const Ogre::FileSystemArchive*>(it->archive) != NULL) 105 #else 103 106 if (dynamic_cast<Ogre::FileSystemArchive*>(it->archive) != NULL) 107 #endif 104 108 { 105 109 boost::filesystem::path base(it->archive->getName()); -
code/branches/libs/src/modules/objects/Planet.cc
r9667 r9669 108 108 float scaleFactor = this->getScale(); 109 109 110 #if OGRE_VERSION >= 0x010700 110 #if OGRE_VERSION >= 0x010800 111 Ogre::ProgressiveMesh::LodValueList distList; 112 #elif OGRE_VERSION >= 0x010700 111 113 Ogre::Mesh::LodValueList distList; 112 114 #else 113 115 Ogre::Mesh::LodDistanceList distList; 114 116 #endif 115 117 116 118 distList.push_back(10.0f*scaleFactor); … … 127 129 float reductionValue = 0.2f; 128 130 131 #if OGRE_VERSION >= 0x010800 132 Ogre::ProgressiveMesh::generateLodLevels(this->mesh_.getEntity()->getMesh().get(), distList, Ogre::ProgressiveMesh::VRQ_PROPORTIONAL, 133 reductionValue); 134 #else 129 135 this->mesh_.getEntity()->getMesh()->generateLodLevels(distList, Ogre::ProgressiveMesh::VRQ_PROPORTIONAL, reductionValue); 136 #endif 130 137 billboard_.setBillboardSet(this->getScene()->getSceneManager(), this->atmosphere_, Vector3(0,0,0)); 131 138 -
code/branches/libs/src/orxonox/graphics/Model.cc
r9667 r9669 30 30 31 31 #include <OgreEntity.h> 32 #include <OgreProgressiveMesh.h> 32 33 33 34 #include "core/CoreIncludes.h" … … 162 163 orxout(verbose, context::lod) << "Setting lodLevel for " << this->meshSrc_<< " with lodLevel_: " << this->lodLevel_ <<" and volume: "<< volume << ":" << endl; 163 164 164 #if OGRE_VERSION >= 0x010700 165 #if OGRE_VERSION >= 0x010800 166 Ogre::ProgressiveMesh::LodValueList distList; 167 #elif OGRE_VERSION >= 0x010700 165 168 Ogre::Mesh::LodValueList distList; 166 169 #else … … 190 193 191 194 //Generiert LOD-Levels 195 #if OGRE_VERSION >= 0x010800 196 Ogre::ProgressiveMesh::generateLodLevels(this->mesh_.getEntity()->getMesh().get(), distList, Ogre::ProgressiveMesh::VRQ_PROPORTIONAL, 197 this->lodReductionRate_); 198 #else 192 199 this->mesh_.getEntity()->getMesh()->generateLodLevels(distList, Ogre::ProgressiveMesh::VRQ_PROPORTIONAL, this->lodReductionRate_); 200 #endif 193 201 } 194 202 else
Note: See TracChangeset
for help on using the changeset viewer.