Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9669


Ignore:
Timestamp:
Sep 4, 2013, 9:49:17 PM (8 years ago)
Author:
landauf
Message:

adjusted code for ogre 1.8.1

Location:
code/branches/libs/src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • code/branches/libs/src/libraries/core/GraphicsManager.cc

    r9667 r9669  
    402402        The name of this log (so you can have several listeners
    403403        for different logs, and identify them)
     404    @param skipThisMessage
     405        If set to true by the messageLogged() implementation message will not be logged
    404406    */
     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
    405412    void GraphicsManager::messageLogged(const std::string& message,
    406413        Ogre::LogMessageLevel lml, bool maskDebug, const std::string& logName)
     414#endif
    407415    {
    408416        OutputLevel orxonoxLevel;
  • code/branches/libs/src/libraries/core/GraphicsManager.h

    r9667 r9669  
    108108
    109109        // 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
    112115
    113116        // console commands
  • code/branches/libs/src/libraries/core/Resource.cc

    r8351 r9669  
    101101                ptr->group = group;
    102102                ptr->size = it->uncompressedSize;
     103#if OGRE_VERSION >= 0x010800
     104                if (dynamic_cast<const Ogre::FileSystemArchive*>(it->archive) != NULL)
     105#else
    103106                if (dynamic_cast<Ogre::FileSystemArchive*>(it->archive) != NULL)
     107#endif
    104108                {
    105109                    boost::filesystem::path base(it->archive->getName());
  • code/branches/libs/src/modules/objects/Planet.cc

    r9667 r9669  
    108108                float scaleFactor = this->getScale();
    109109
    110     #if OGRE_VERSION >= 0x010700
     110#if OGRE_VERSION >= 0x010800
     111                Ogre::ProgressiveMesh::LodValueList distList;
     112#elif OGRE_VERSION >= 0x010700
    111113                Ogre::Mesh::LodValueList distList;
    112     #else
     114#else
    113115                Ogre::Mesh::LodDistanceList distList;
    114     #endif
     116#endif
    115117
    116118                distList.push_back(10.0f*scaleFactor);
     
    127129                float reductionValue = 0.2f;
    128130
     131#if OGRE_VERSION >= 0x010800
     132                Ogre::ProgressiveMesh::generateLodLevels(this->mesh_.getEntity()->getMesh().get(), distList, Ogre::ProgressiveMesh::VRQ_PROPORTIONAL,
     133                    reductionValue);
     134#else
    129135                this->mesh_.getEntity()->getMesh()->generateLodLevels(distList, Ogre::ProgressiveMesh::VRQ_PROPORTIONAL, reductionValue);
     136#endif
    130137                billboard_.setBillboardSet(this->getScene()->getSceneManager(), this->atmosphere_, Vector3(0,0,0));
    131138
  • code/branches/libs/src/orxonox/graphics/Model.cc

    r9667 r9669  
    3030
    3131#include <OgreEntity.h>
     32#include <OgreProgressiveMesh.h>
    3233
    3334#include "core/CoreIncludes.h"
     
    162163                orxout(verbose, context::lod) << "Setting lodLevel for " << this->meshSrc_<< " with lodLevel_: " << this->lodLevel_ <<" and volume: "<< volume << ":" << endl;
    163164
    164 #if OGRE_VERSION >= 0x010700
     165#if OGRE_VERSION >= 0x010800
     166                Ogre::ProgressiveMesh::LodValueList distList;
     167#elif OGRE_VERSION >= 0x010700
    165168                Ogre::Mesh::LodValueList distList;
    166169#else
     
    190193
    191194                    //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
    192199                    this->mesh_.getEntity()->getMesh()->generateLodLevels(distList, Ogre::ProgressiveMesh::VRQ_PROPORTIONAL, this->lodReductionRate_);
     200#endif
    193201                }
    194202                else
Note: See TracChangeset for help on using the changeset viewer.