source:
code/branches/masterserver2/src/external/ogreceguirenderer/changes_orxonox.diff
@
8280
Last change on this file since 8280 was 7163, checked in by dafrick, 14 years ago | |
---|---|
|
|
File size: 3.5 KB |
-
OgreCEGUIRenderer.cpp
24 24 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 25 25 *************************************************************************/ 26 26 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> 32 32 33 33 #include "OgreCEGUIRenderer.h" 34 34 #include "OgreCEGUITexture.h" … … 454 454 d_render_sys->_setTextureUnitFiltering(0, FO_LINEAR, FO_LINEAR, FO_POINT); 455 455 d_render_sys->_setTextureAddressingMode(0, d_uvwAddressMode); 456 456 d_render_sys->_setTextureMatrix(0, Matrix4::IDENTITY); 457 #if OGRE_VERSION >= 0x010600 458 d_render_sys->_setAlphaRejectSettings(CMPF_ALWAYS_PASS, 0, false); 459 #else 457 460 d_render_sys->_setAlphaRejectSettings(CMPF_ALWAYS_PASS, 0); 461 #endif 458 462 d_render_sys->_setTextureBlendMode(0, d_colourBlendMode); 459 463 d_render_sys->_setTextureBlendMode(0, d_alphaBlendMode); 460 464 d_render_sys->_disableTextureUnitsFrom(1); -
OgreCEGUIRenderer.h
29 29 #ifndef _OgreCEGUIRenderer_h_ 30 30 #define _OgreCEGUIRenderer_h_ 31 31 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> 35 35 36 36 #include <OgreRenderQueueListener.h> 37 37 #include <OgreSceneManagerEnumerator.h> 38 38 #include <OgreTextureUnitState.h> 39 39 40 #if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32) && !defined(OGRE_ STATIC_LIB)40 #if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32) && !defined(OGRE_GUIRENDERER_STATIC_LIB) 41 41 # ifdef OGRE_GUIRENDERER_EXPORTS 42 42 # define OGRE_GUIRENDERER_API __declspec(dllexport) 43 43 # else -
OgreCEGUIResourceProvider.cpp
25 25 *************************************************************************/ 26 26 #include "OgreCEGUIResourceProvider.h" 27 27 28 #include <CEGUI /CEGUIExceptions.h>28 #include <CEGUIExceptions.h> 29 29 #include <OgreArchiveManager.h> 30 30 31 31 -
OgreCEGUIResourceProvider.h
26 26 #ifndef _OgreCEGUIResourceProvider_h_ 27 27 #define _OgreCEGUIResourceProvider_h_ 28 28 29 #include <CEGUI /CEGUIResourceProvider.h>29 #include <CEGUIResourceProvider.h> 30 30 #include "OgreCEGUIRenderer.h" 31 31 32 32 // Start of CEGUI namespace section -
OgreCEGUITexture.cpp
24 24 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 25 25 *************************************************************************/ 26 26 27 #include <CEGUI /CEGUISystem.h>28 #include <CEGUI /CEGUIExceptions.h>27 #include <CEGUISystem.h> 28 #include <CEGUIExceptions.h> 29 29 #include "OgreCEGUITexture.h" 30 30 #include "OgreCEGUIRenderer.h" 31 31 -
OgreCEGUITexture.h
26 26 #ifndef _OgreCEGUITexture_h_ 27 27 #define _OgreCEGUITexture_h_ 28 28 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> 32 32 #include "OgreCEGUIRenderer.h" 33 33 34 34 // Start of CEGUI namespace section
Note: See TracBrowser
for help on using the repository browser.