[Orxonox-commit 52] r2757 - in trunk/src: ogreceguirenderer orxonox/objects/worldentities

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-03-08 13:25:40 +0100 (Sun, 08 Mar 2009)
New Revision: 2757

Modified:
   trunk/src/ogreceguirenderer/OgreCEGUIRenderer.cpp
   trunk/src/ogreceguirenderer/VERSION
   trunk/src/ogreceguirenderer/changes_orxonox.diff
   trunk/src/orxonox/objects/worldentities/Camera.cc
Log:
Code level compliance with OGRE 1.6
You can not yet use it though! The particle, material, etc. scripts do not yet fit.

Modified: trunk/src/ogreceguirenderer/OgreCEGUIRenderer.cpp
===================================================================
--- trunk/src/ogreceguirenderer/OgreCEGUIRenderer.cpp	2009-03-08 12:24:15 UTC (rev 2756)
+++ trunk/src/ogreceguirenderer/OgreCEGUIRenderer.cpp	2009-03-08 12:25:40 UTC (rev 2757)
@@ -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);

Modified: trunk/src/ogreceguirenderer/VERSION
===================================================================
--- trunk/src/ogreceguirenderer/VERSION	2009-03-08 12:24:15 UTC (rev 2756)
+++ trunk/src/ogreceguirenderer/VERSION	2009-03-08 12:25:40 UTC (rev 2757)
@@ -1,4 +1,4 @@
-This library is part of the OGRE v1.4.9 source.
+This library is part of the OGRE v1.6.1 source.
 
 -----
 

Modified: trunk/src/ogreceguirenderer/changes_orxonox.diff
===================================================================
--- trunk/src/ogreceguirenderer/changes_orxonox.diff	2009-03-08 12:24:15 UTC (rev 2756)
+++ trunk/src/ogreceguirenderer/changes_orxonox.diff	2009-03-08 12:25:40 UTC (rev 2757)
@@ -17,6 +17,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
 @@ -29,9 +29,9 @@

Modified: trunk/src/orxonox/objects/worldentities/Camera.cc
===================================================================
--- trunk/src/orxonox/objects/worldentities/Camera.cc	2009-03-08 12:24:15 UTC (rev 2756)
+++ trunk/src/orxonox/objects/worldentities/Camera.cc	2009-03-08 12:25:40 UTC (rev 2757)
@@ -108,10 +108,10 @@
             // this stuff here may need some adjustments
             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());
         }
     }