Changeset 7948 for code/branches/kicklib/src/external/ogreceguirenderer/changes_orxonox.diff

Timestamp:

Feb 21, 2011, 6:16:24 AM (13 years ago)

Author:

rgrieder

Message:

Dropped support for OGRE v1.4 and removed the remaining workarounds.

File:

• code/branches/kicklib/src/external/ogreceguirenderer/changes_orxonox.diff (modified) (1 diff)

code/branches/kicklib/src/external/ogreceguirenderer/changes_orxonox.diff

@@ -18 +18 @@
  #include "OgreCEGUIRenderer.h"
  #include "OgreCEGUITexture.h"
-@@ -454,7 +454,11 @@
-        d_render_sys->_setTextureUnitFiltering(0, FO_LINEAR, FO_LINEAR, FO_POINT);
-        d_render_sys->_setTextureAddressingMode(0, d_uvwAddressMode);
-        d_render_sys->_setTextureMatrix(0, Matrix4::IDENTITY);
-+#if OGRE_VERSION >= 0x010600
-+       d_render_sys->_setAlphaRejectSettings(CMPF_ALWAYS_PASS, 0, false);
-+#else
-        d_render_sys->_setAlphaRejectSettings(CMPF_ALWAYS_PASS, 0);
-+#endif
-        d_render_sys->_setTextureBlendMode(0, d_colourBlendMode);
-        d_render_sys->_setTextureBlendMode(0, d_alphaBlendMode);
-        d_render_sys->_disableTextureUnitsFrom(1);
 --- OgreCEGUIRenderer.h Wed Jan 28 21:14:09 2009
 +++ OgreCEGUIRenderer.h Wed Jan 28 21:06:46 2009