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:
11 edited

Legend:

Unmodified
Added
Removed

  • code/branches/cegui0.8_ogre1.9

  • code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/ChatOverlay.cc

    r11083 r11795  
    3030
    3131#include <string>
    32 #include <OgreTextAreaOverlayElement.h>
     32
     33#if OGRE_VERSION >= 0x010900
     34#   include <Overlay/OgreTextAreaOverlayElement.h>
     35#else
     36#   include <OgreTextAreaOverlayElement.h>
     37#endif
    3338
    3439#include "util/Convert.h"

  • code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/ChatOverlay.h

    r11071 r11795  
    3333
    3434#include <list>
    35 #include <OgreOverlayElement.h>
     35
     36#include <OgrePrerequisites.h>
     37#if OGRE_VERSION >= 0x010900
     38#   include <Overlay/OgreOverlayElement.h>
     39#else
     40#   include <OgreOverlayElement.h>
     41#endif
    3642
    3743#include "chat/ChatListener.h"

  • code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDBar.cc

    r11071 r11795  
    3232#include "HUDBar.h"
    3333
    34 #include <OgreOverlayManager.h>
    3534#include <OgreMaterialManager.h>
    3635#include <OgreTechnique.h>
    3736#include <OgrePass.h>
    38 #include <OgrePanelOverlayElement.h>
     37
     38#if OGRE_VERSION >= 0x010900
     39#   include <Overlay/OgreOverlayManager.h>
     40#   include <Overlay/OgrePanelOverlayElement.h>
     41#else
     42#   include <OgreOverlayManager.h>
     43#   include <OgrePanelOverlayElement.h>
     44#endif
    3945
    4046#include "util/Convert.h"
    … …  
    248254        return this->icon_->getMaterialName();
    249255    }
     256
     257    void HUDBar::setIconPosition(Vector2 position)
     258    {
     259        this->icon_->setPosition(position.x, position.y);
     260    }
     261
     262    void HUDBar::setIconDimensions(Vector2 dimensions)
     263    {
     264        this->icon_->setDimensions(dimensions.x, dimensions.y);
     265    }
    250266}

  • code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDBar.h

    r11071 r11795  
    3737#include <map>
    3838#include <vector>
    39 #include <OgrePanelOverlayElement.h>
    4039
    4140#include "util/Math.h"
    … …  
    122121            { return this->currentColour_; }
    123122
    124         inline void setIconPosition(Vector2 position)
    125             { this->icon_->setPosition(position.x, position.y); }
    126         inline void setIconDimensions(Vector2 dimensions)
    127             { this->icon_->setDimensions(dimensions.x, dimensions.y); }
     123        void setIconPosition(Vector2 position);
     124        void setIconDimensions(Vector2 dimensions);
    128125
    129126    protected:

  • code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDNavigation.cc

    r11071 r11795  
    3232
    3333#include <OgreCamera.h>
    34 #include <OgreFontManager.h>
    35 #include <OgreOverlayManager.h>
    36 #include <OgreTextAreaOverlayElement.h>
    37 #include <OgrePanelOverlayElement.h>
     34
     35#if OGRE_VERSION >= 0x010900
     36#   include <Overlay/OgreFontManager.h>
     37#   include <Overlay/OgreOverlayManager.h>
     38#   include <Overlay/OgreTextAreaOverlayElement.h>
     39#   include <Overlay/OgrePanelOverlayElement.h>
     40#else
     41#   include <OgreFontManager.h>
     42#   include <OgreOverlayManager.h>
     43#   include <OgreTextAreaOverlayElement.h>
     44#   include <OgrePanelOverlayElement.h>
     45#endif
    3846
    3947#include <typeinfo>

  • code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDRadar.cc

    r11071 r11795  
    3131#include "HUDRadar.h"
    3232
    33 #include <OgreOverlayManager.h>
    34 #include <OgrePanelOverlayElement.h>
     33#if OGRE_VERSION >= 0x010900
     34#   include <Overlay/OgreOverlayManager.h>
     35#   include <Overlay/OgrePanelOverlayElement.h>
     36#else
     37#   include <OgreOverlayManager.h>
     38#   include <OgrePanelOverlayElement.h>
     39#endif
    3540
    3641#include "util/Math.h"

  • code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDWeapon.cc

    r11071 r11795  
    2828
    2929#include "HUDWeapon.h"
     30
     31#if OGRE_VERSION >= 0x010900
     32#   include <Overlay/OgreOverlayManager.h>
     33#   include <Overlay/OgrePanelOverlayElement.h>
     34#else
     35#   include <OgreOverlayManager.h>
     36#   include <OgrePanelOverlayElement.h>
     37#endif
    3038
    3139#include "core/CoreIncludes.h"

  • code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDWeapon.h

    r11071 r11795  
    3535#include <vector>
    3636#include <string>
    37 
    38 #include <OgreOverlayManager.h>
    39 #include <OgrePanelOverlayElement.h>
    4037
    4138#include "overlays/OrxonoxOverlay.h"

  • code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDWeaponMode.cc

    r11071 r11795  
    2828
    2929#include "HUDWeaponMode.h"
     30
     31#if OGRE_VERSION >= 0x010900
     32#   include <Overlay/OgreOverlayManager.h>
     33#   include <Overlay/OgrePanelOverlayElement.h>
     34#else
     35#   include <OgreOverlayManager.h>
     36#   include <OgrePanelOverlayElement.h>
     37#endif
    3038
    3139#include "util/Convert.h"

  • code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDWeaponMode.h

    r11071 r11795  
    3636#include <vector>
    3737#include <string>
    38 
    39 #include <OgreOverlayManager.h>
    40 #include <OgrePanelOverlayElement.h>
    4138
    4239#include "overlays/OrxonoxOverlay.h"
Note: See TracChangeset for help on using the changeset viewer.