Changeset 1289 for code/branches/merge/src/orxonox/objects/Camera.h

Timestamp:

May 15, 2008, 4:43:20 PM (16 years ago)

Author:

scheusso

Message:

merged camera change into merger branch

File:

• code/branches/merge/src/orxonox/objects/Camera.h (modified) (3 diffs)

code/branches/merge/src/orxonox/objects/Camera.h

@@ -23 +23 @@
  *      Fabian 'x3n' Landau
  *   Co-authors:
- *      ...
+ *      Benjamin Knecht
  *
  */
@@ -45 +45 @@
         virtual ~Camera();
 
-        //inline void setPosition(Ogre::Vector3 pos) { position_->setPosition(pos); cam_->setPosition(pos); }
-        void setCameraNode(Ogre::SceneNode* node);
+        void setPositionNode(Ogre::SceneNode* node);
         inline Ogre::SceneNode* getCameraNode() { return this->positionNode_; }
         // maybe also BaseObject
         void setTargetNode(Ogre::SceneNode* obj);
 
-
+        void tick(float dt);
         void update();
         inline bool hasFocus() { return this->bHasFocus_; }
@@ -62 +61 @@
         Ogre::SceneNode* targetNode_;
         Ogre::SceneNode* positionNode_;
+        Ogre::SceneNode* cameraNode_;
+        Ogre::Vector3 oldPos;
         Ogre::Camera* cam_;
         bool bHasFocus_;