Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Sep 26, 2013, 11:03:33 PM (11 years ago)
Author:
landauf
Message:

merged branch 'libs' back to trunk. orxonox now compiles and runs with ogre 1.8 and it compiles (but doesn't run) with cegui 0.8

Location:
code/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/trunk

  • code/trunk/src/modules/objects/Planet.cc

    r9667 r9675  
    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
Note: See TracChangeset for help on using the changeset viewer.