Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2757 for code


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/ogreceguirenderer/OgreCEGUIRenderer.cpp

    r2710 r2757  
    455455        d_render_sys->_setTextureAddressingMode(0, d_uvwAddressMode);
    456456        d_render_sys->_setTextureMatrix(0, Matrix4::IDENTITY);
     457#if OGRE_VERSION >= 0x010600
     458        d_render_sys->_setAlphaRejectSettings(CMPF_ALWAYS_PASS, 0, false);
     459#else
    457460        d_render_sys->_setAlphaRejectSettings(CMPF_ALWAYS_PASS, 0);
     461#endif
    458462        d_render_sys->_setTextureBlendMode(0, d_colourBlendMode);
    459463        d_render_sys->_setTextureBlendMode(0, d_alphaBlendMode);
  • code/trunk/src/ogreceguirenderer/VERSION

    r2710 r2757  
    1 This library is part of the OGRE v1.4.9 source.
     1This library is part of the OGRE v1.6.1 source.
    22
    33-----
  • code/trunk/src/ogreceguirenderer/changes_orxonox.diff

    r2710 r2757  
    1818 #include "OgreCEGUIRenderer.h"
    1919 #include "OgreCEGUITexture.h"
     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);
    2032--- OgreCEGUIRenderer.h Wed Jan 28 21:14:09 2009
    2133+++ OgreCEGUIRenderer.h Wed Jan 28 21:06:46 2009
  • code/trunk/src/orxonox/objects/worldentities/Camera.cc

    r2710 r2757  
    109109            float coeff = min(1.0f, 15.0f * dt);
    110110
    111             Vector3 offset = this->getWorldPosition() - this->cameraNode_->getWorldPosition();
     111            Vector3 offset = this->getWorldPosition() - this->cameraNode_->_getDerivedPosition();
    112112            this->cameraNode_->translate(coeff * offset);
    113113
    114             this->cameraNode_->setOrientation(Quaternion::Slerp(coeff, this->cameraNode_->getWorldOrientation(), this->getWorldOrientation(), true));
     114            this->cameraNode_->setOrientation(Quaternion::Slerp(coeff, this->cameraNode_->_getDerivedOrientation(), this->getWorldOrientation(), true));
    115115            //this->cameraNode_->setOrientation(this->getWorldOrientation());
    116116        }
Note: See TracChangeset for help on using the changeset viewer.