Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: code/branches/netp/src/ogreceguirenderer/changes_orxonox.diff @ 2833

Last change on this file since 2833 was 2757, checked in by rgrieder, 16 years ago

Code level compliance with OGRE 1.6
You can not yet use it though! The particle, material, etc. scripts do not yet fit.
  • Property svn:eol-style set to native
File size: 3.2 KB

  • OgreCEGUIRenderer.cpp

     
    2424    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    2525*************************************************************************/
    2626
    27 #include <CEGUI/CEGUIImagesetManager.h>
    28 #include <CEGUI/CEGUIImageset.h>
    29 #include <CEGUI/CEGUIImage.h>
    30 #include <CEGUI/CEGUIExceptions.h>
    31 #include <CEGUI/CEGUISystem.h>
     27#include <CEGUIImagesetManager.h>
     28#include <CEGUIImageset.h>
     29#include <CEGUIImage.h>
     30#include <CEGUIExceptions.h>
     31#include <CEGUISystem.h>
    3232
    3333#include "OgreCEGUIRenderer.h"
    3434#include "OgreCEGUITexture.h"
    … …  
    454454        d_render_sys->_setTextureUnitFiltering(0, FO_LINEAR, FO_LINEAR, FO_POINT);
    455455        d_render_sys->_setTextureAddressingMode(0, d_uvwAddressMode);
    456456        d_render_sys->_setTextureMatrix(0, Matrix4::IDENTITY);
     457#if OGRE_VERSION >= 0x010600
     458        d_render_sys->_setAlphaRejectSettings(CMPF_ALWAYS_PASS, 0, false);
     459#else
    457460        d_render_sys->_setAlphaRejectSettings(CMPF_ALWAYS_PASS, 0);
     461#endif
    458462        d_render_sys->_setTextureBlendMode(0, d_colourBlendMode);
    459463        d_render_sys->_setTextureBlendMode(0, d_alphaBlendMode);
    460464        d_render_sys->_disableTextureUnitsFrom(1);

  • OgreCEGUIRenderer.h

     
    2929#ifndef _OgreCEGUIRenderer_h_
    3030#define _OgreCEGUIRenderer_h_
    3131
    32 #include <CEGUI/CEGUIBase.h>
    33 #include <CEGUI/CEGUIRenderer.h>
    34 #include <CEGUI/CEGUITexture.h>
     32#include <CEGUIBase.h>
     33#include <CEGUIRenderer.h>
     34#include <CEGUITexture.h>
    3535
    3636#include <OgreRenderQueueListener.h>
    3737#include <OgreSceneManagerEnumerator.h>

  • OgreCEGUIResourceProvider.cpp

     
    2525*************************************************************************/
    2626#include "OgreCEGUIResourceProvider.h"
    2727
    28 #include <CEGUI/CEGUIExceptions.h>
     28#include <CEGUIExceptions.h>
    2929#include <OgreArchiveManager.h>
    3030
    3131

  • OgreCEGUIResourceProvider.h

     
    2626#ifndef _OgreCEGUIResourceProvider_h_
    2727#define _OgreCEGUIResourceProvider_h_
    2828
    29 #include <CEGUI/CEGUIResourceProvider.h>
     29#include <CEGUIResourceProvider.h>
    3030#include "OgreCEGUIRenderer.h"
    3131
    3232// Start of CEGUI namespace section

  • OgreCEGUITexture.cpp

     
    2424    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    2525*************************************************************************/
    2626
    27 #include <CEGUI/CEGUISystem.h>
    28 #include <CEGUI/CEGUIExceptions.h>
     27#include <CEGUISystem.h>
     28#include <CEGUIExceptions.h>
    2929#include "OgreCEGUITexture.h"
    3030#include "OgreCEGUIRenderer.h"
    3131

  • OgreCEGUITexture.h

     
    2626#ifndef _OgreCEGUITexture_h_
    2727#define _OgreCEGUITexture_h_
    2828
    29 #include <CEGUI/CEGUIBase.h>
    30 #include <CEGUI/CEGUIRenderer.h>
    31 #include <CEGUI/CEGUITexture.h>
     29#include <CEGUIBase.h>
     30#include <CEGUIRenderer.h>
     31#include <CEGUITexture.h>
    3232#include "OgreCEGUIRenderer.h"
    3333
    3434// Start of CEGUI namespace section
Note: See TracBrowser for help on using the repository browser.