Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: code/trunk/src/external/ogreceguirenderer/changes_orxonox.diff @ 7988

Last change on this file since 7988 was 7163, checked in by dafrick, 14 years ago

Merged presentation3 branch into trunk.

  • Property svn:eol-style set to native
File size: 3.5 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
[7163]34@@ -29,15 +29,15 @@
[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>
[7163]47 #include <OgreTextureUnitState.h>
48
49-#if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32) && !defined(OGRE_STATIC_LIB)
50+#if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32) && !defined(OGRE_GUIRENDERER_STATIC_LIB)
51 #   ifdef OGRE_GUIRENDERER_EXPORTS
52 #       define OGRE_GUIRENDERER_API __declspec(dllexport)
53 #   else
[2602]54--- OgreCEGUIResourceProvider.cpp       Wed Jan 28 21:14:09 2009
55+++ OgreCEGUIResourceProvider.cpp       Wed Jan 28 21:07:15 2009
56@@ -25,7 +25,7 @@
[2705]57 *************************************************************************/
58 #include "OgreCEGUIResourceProvider.h"
59 
60-#include <CEGUI/CEGUIExceptions.h>
61+#include <CEGUIExceptions.h>
62 #include <OgreArchiveManager.h>
63 
64 
[2602]65--- OgreCEGUIResourceProvider.h Wed Jan 28 21:14:09 2009
66+++ OgreCEGUIResourceProvider.h Wed Jan 28 21:06:51 2009
67@@ -26,7 +26,7 @@
[2705]68 #ifndef _OgreCEGUIResourceProvider_h_
69 #define _OgreCEGUIResourceProvider_h_
70 
71-#include <CEGUI/CEGUIResourceProvider.h>
72+#include <CEGUIResourceProvider.h>
73 #include "OgreCEGUIRenderer.h"
74 
75 // Start of CEGUI namespace section
[2602]76--- OgreCEGUITexture.cpp        Wed Jan 28 21:14:09 2009
77+++ OgreCEGUITexture.cpp        Wed Jan 28 21:07:21 2009
78@@ -24,8 +24,8 @@
[2705]79     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
80 *************************************************************************/
81 
82-#include <CEGUI/CEGUISystem.h>
83-#include <CEGUI/CEGUIExceptions.h>
84+#include <CEGUISystem.h>
85+#include <CEGUIExceptions.h>
86 #include "OgreCEGUITexture.h"
87 #include "OgreCEGUIRenderer.h"
88 
[2602]89--- OgreCEGUITexture.h  Wed Jan 28 21:14:09 2009
90+++ OgreCEGUITexture.h  Wed Jan 28 21:07:06 2009
91@@ -26,9 +26,9 @@
[2705]92 #ifndef _OgreCEGUITexture_h_
93 #define _OgreCEGUITexture_h_
94 
95-#include <CEGUI/CEGUIBase.h>
96-#include <CEGUI/CEGUIRenderer.h>
97-#include <CEGUI/CEGUITexture.h>
98+#include <CEGUIBase.h>
99+#include <CEGUIRenderer.h>
100+#include <CEGUITexture.h>
101 #include "OgreCEGUIRenderer.h"
102 
103 // Start of CEGUI namespace section
Note: See TracBrowser for help on using the repository browser.