Changeset 2757 for code/trunk/src/orxonox

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.

File:

• code/trunk/src/orxonox/objects/worldentities/Camera.cc (modified) (1 diff)

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());
         }