Changeset 2757 for code/trunk

Timestamp:

Mar 8, 2009, 1:25:40 PM (16 years ago)

Author:

rgrieder

Message:

Code level compliance with OGRE 1.6
You can not yet use it though! The particle, material, etc. scripts do not yet fit.

Location:

code/trunk/src

Files:

• ogreceguirenderer/OgreCEGUIRenderer.cpp (modified) (1 diff)
• ogreceguirenderer/VERSION (modified) (1 diff)
• ogreceguirenderer/changes_orxonox.diff (modified) (1 diff)
• orxonox/objects/worldentities/Camera.cc (modified) (1 diff)

code/trunk/src/ogreceguirenderer/OgreCEGUIRenderer.cpp

@@ -455 +455 @@
         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);

code/trunk/src/ogreceguirenderer/VERSION

@@ -1 @@
-This library is part of the OGRE v1.4.9 source.
+This library is part of the OGRE v1.6.1 source.
 
 -----

code/trunk/src/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

code/trunk/src/orxonox/objects/worldentities/Camera.cc

@@ -109 +109 @@
             float coeff = min(1.0f, 15.0f * dt);
 
-            Vector3 offset = this->getWorldPosition() - this->cameraNode_->getWorldPosition();
+            Vector3 offset = this->getWorldPosition() - this->cameraNode_->_getDerivedPosition();
             this->cameraNode_->translate(coeff * offset);
 
-            this->cameraNode_->setOrientation(Quaternion::Slerp(coeff, this->cameraNode_->getWorldOrientation(), this->getWorldOrientation(), true));
+            this->cameraNode_->setOrientation(Quaternion::Slerp(coeff, this->cameraNode_->_getDerivedOrientation(), this->getWorldOrientation(), true));
             //this->cameraNode_->setOrientation(this->getWorldOrientation());
         }