Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: code/trunk/src/ogreceguirenderer/changes_orxonox.diff @ 2982

Last change on this file since 2982 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
RevLine 
[2602]1--- OgreCEGUIRenderer.cpp       Wed Jan 28 21:14:09 2009
2+++ OgreCEGUIRenderer.cpp       Wed Jan 28 21:07:10 2009
3@@ -24,11 +24,11 @@
[2705]4     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
5 *************************************************************************/
6 
7-#include <CEGUI/CEGUIImagesetManager.h>
8-#include <CEGUI/CEGUIImageset.h>
9-#include <CEGUI/CEGUIImage.h>
10-#include <CEGUI/CEGUIExceptions.h>
11-#include <CEGUI/CEGUISystem.h>
12+#include <CEGUIImagesetManager.h>
13+#include <CEGUIImageset.h>
14+#include <CEGUIImage.h>
15+#include <CEGUIExceptions.h>
16+#include <CEGUISystem.h>
17 
18 #include "OgreCEGUIRenderer.h"
19 #include "OgreCEGUITexture.h"
[2757]20@@ -454,7 +454,11 @@
21        d_render_sys->_setTextureUnitFiltering(0, FO_LINEAR, FO_LINEAR, FO_POINT);
22        d_render_sys->_setTextureAddressingMode(0, d_uvwAddressMode);
23        d_render_sys->_setTextureMatrix(0, Matrix4::IDENTITY);
24+#if OGRE_VERSION >= 0x010600
25+       d_render_sys->_setAlphaRejectSettings(CMPF_ALWAYS_PASS, 0, false);
26+#else
27        d_render_sys->_setAlphaRejectSettings(CMPF_ALWAYS_PASS, 0);
28+#endif
29        d_render_sys->_setTextureBlendMode(0, d_colourBlendMode);
30        d_render_sys->_setTextureBlendMode(0, d_alphaBlendMode);
31        d_render_sys->_disableTextureUnitsFrom(1);
[2602]32--- OgreCEGUIRenderer.h Wed Jan 28 21:14:09 2009
33+++ OgreCEGUIRenderer.h Wed Jan 28 21:06:46 2009
34@@ -29,9 +29,9 @@
[2705]35 #ifndef _OgreCEGUIRenderer_h_
36 #define _OgreCEGUIRenderer_h_
37 
38-#include <CEGUI/CEGUIBase.h>
39-#include <CEGUI/CEGUIRenderer.h>
40-#include <CEGUI/CEGUITexture.h>
41+#include <CEGUIBase.h>
42+#include <CEGUIRenderer.h>
43+#include <CEGUITexture.h>
44 
45 #include <OgreRenderQueueListener.h>
46 #include <OgreSceneManagerEnumerator.h>
[2602]47--- OgreCEGUIResourceProvider.cpp       Wed Jan 28 21:14:09 2009
48+++ OgreCEGUIResourceProvider.cpp       Wed Jan 28 21:07:15 2009
49@@ -25,7 +25,7 @@
[2705]50 *************************************************************************/
51 #include "OgreCEGUIResourceProvider.h"
52 
53-#include <CEGUI/CEGUIExceptions.h>
54+#include <CEGUIExceptions.h>
55 #include <OgreArchiveManager.h>
56 
57 
[2602]58--- OgreCEGUIResourceProvider.h Wed Jan 28 21:14:09 2009
59+++ OgreCEGUIResourceProvider.h Wed Jan 28 21:06:51 2009
60@@ -26,7 +26,7 @@
[2705]61 #ifndef _OgreCEGUIResourceProvider_h_
62 #define _OgreCEGUIResourceProvider_h_
63 
64-#include <CEGUI/CEGUIResourceProvider.h>
65+#include <CEGUIResourceProvider.h>
66 #include "OgreCEGUIRenderer.h"
67 
68 // Start of CEGUI namespace section
[2602]69--- OgreCEGUITexture.cpp        Wed Jan 28 21:14:09 2009
70+++ OgreCEGUITexture.cpp        Wed Jan 28 21:07:21 2009
71@@ -24,8 +24,8 @@
[2705]72     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
73 *************************************************************************/
74 
75-#include <CEGUI/CEGUISystem.h>
76-#include <CEGUI/CEGUIExceptions.h>
77+#include <CEGUISystem.h>
78+#include <CEGUIExceptions.h>
79 #include "OgreCEGUITexture.h"
80 #include "OgreCEGUIRenderer.h"
81 
[2602]82--- OgreCEGUITexture.h  Wed Jan 28 21:14:09 2009
83+++ OgreCEGUITexture.h  Wed Jan 28 21:07:06 2009
84@@ -26,9 +26,9 @@
[2705]85 #ifndef _OgreCEGUITexture_h_
86 #define _OgreCEGUITexture_h_
87 
88-#include <CEGUI/CEGUIBase.h>
89-#include <CEGUI/CEGUIRenderer.h>
90-#include <CEGUI/CEGUITexture.h>
91+#include <CEGUIBase.h>
92+#include <CEGUIRenderer.h>
93+#include <CEGUITexture.h>
94 #include "OgreCEGUIRenderer.h"
95 
96 // Start of CEGUI namespace section
Note: See TracBrowser for help on using the repository browser.