Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Feb 21, 2018, 12:03:52 AM (7 years ago)
Author:
landauf
Message:

merged ogre1.9 (including cegui0.8) into new branch

Location:
code/branches/cegui0.8_ogre1.9
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • code/branches/cegui0.8_ogre1.9

  • code/branches/cegui0.8_ogre1.9/src/libraries/core/CMakeLists.txt

    r11712 r11795  
    9595  LINK_LIBRARIES
    9696    ${OGRE_LIBRARY}
     97    ${OGRE_OVERLAY_LIBRARY}
    9798    ${Boost_FILESYSTEM_LIBRARY}
    9899    ${Boost_SYSTEM_LIBRARY} # Filesystem dependency
  • code/branches/cegui0.8_ogre1.9/src/libraries/core/GUIManager.cc

    r11117 r11795  
    482482        assert(guiSystem_);
    483483        this->protectedCeguiSystemCall(std::bind(&CEGUI::System::injectTimePulse, arg::_1, time.getDeltaTime()));
     484#if CEGUI_VERSION >= 0x000800
     485        this->protectedCeguiContextCall(std::bind(&CEGUI::GUIContext::injectTimePulse, arg::_1, time.getDeltaTime()));
     486#endif
    484487    }
    485488
     
    664667            this->setBackgroundImage("");
    665668        else
    666             this->setBackgroundImage("set: " + imageSet + " image: " + imageName);
     669            this->setBackgroundImage(imageSet + "/" + imageName);
    667670    }
    668671
     
    846849    bool GUIManager::protectedCeguiContextCall(FunctionType function)
    847850    {
    848         return this->protectedCall(function, this->guiSystem_->getDefaultGUIContext());
     851        return this->protectedCall(function, &this->guiSystem_->getDefaultGUIContext());
    849852    }
    850853#endif
  • code/branches/cegui0.8_ogre1.9/src/libraries/core/GraphicsManager.cc

    r11115 r11795  
    4545#include <OgreViewport.h>
    4646#include <OgreWindowEventUtilities.h>
     47#if OGRE_VERSION >= 0x010900
     48#   include <Overlay/OgreOverlaySystem.h>
     49#endif
    4750
    4851#include "SpecialConfig.h"
     
    115118        this->loadOgreRoot();
    116119
     120#if OGRE_VERSION >= 0x010900
     121        this->overlaySystem_ = new Ogre::OverlaySystem();
     122#else
     123        this->overlaySystem_ = nullptr;
     124#endif
     125
    117126        // At first, add the root paths of the data directories as resource locations
    118127        Ogre::ResourceGroupManager::getSingleton().addResourceLocation(ConfigurablePaths::getDataPathString(), "FileSystem");
     
    155164        Loader::getInstance().unload(extResources_.get());
    156165
     166#if OGRE_VERSION >= 0x010900
     167        safeObjectDelete(&overlaySystem_);
     168#endif
    157169        safeObjectDelete(&ogreRoot_);
    158170        safeObjectDelete(&ogreLogger_);
  • code/branches/cegui0.8_ogre1.9/src/libraries/core/GraphicsManager.h

    r11085 r11795  
    5252
    5353#include "util/DestructionHelper.h"
     54#include "util/OgreForwardRefs.h"
    5455#include "util/Singleton.h"
    5556#include "config/Configurable.h"
     
    7980        void postUpdate(const Clock& time);
    8081
    81         Ogre::Viewport* getViewport()         { return this->viewport_; }
    82         Ogre::RenderWindow* getRenderWindow() { return this->renderWindow_; }
     82        Ogre::Viewport* getViewport()           { return this->viewport_; }
     83        Ogre::RenderWindow* getRenderWindow()   { return this->renderWindow_; }
     84        Ogre::OverlaySystem* getOverlaySystem() { return this->overlaySystem_; }
    8385        size_t getRenderWindowHandle();
    8486
     
    129131        Ogre::RenderWindow*      renderWindow_;            //!< the one and only render window
    130132        Ogre::Viewport*          viewport_;                //!< default full size viewport
     133        Ogre::OverlaySystem*     overlaySystem_;
    131134        GlowMaterialListener*    glowMaterialListener_;    //!< Material Listener for the 'Glow' compositor
    132135        float                    lastFrameStartTime_;      //!< Time stamp of the beginning of the last frame
Note: See TracChangeset for help on using the changeset viewer.