Changeset 6108 for code/branches/presentation2/src/orxonox/graphics

Timestamp:

Nov 20, 2009, 8:15:25 PM (15 years ago)

Author:

scheusso

Message:

merged steering branch to presentation2 branch

Location:

code/branches/presentation2

Files:

• . (modified) (1 prop)
• src/orxonox/graphics/Camera.cc (modified) (1 diff)
• src/orxonox/graphics/Camera.h (modified) (1 diff)

code/branches/presentation2/src/orxonox/graphics/Camera.cc

@@ -61 +61 @@
 
         this->camera_ = this->getScene()->getSceneManager()->createCamera(getUniqueNumberString());
+        this->camera_->setUserObject(this);
         this->cameraNode_ = this->getScene()->getRootSceneNode()->createChildSceneNode();
         this->attachNode(this->cameraNode_);

code/branches/presentation2/src/orxonox/graphics/Camera.h

@@ -52 +52 @@
             void releaseFocus();
 
+            inline Ogre::Camera* getOgreCamera()
+               { return this->camera_; }
+
             inline bool hasFocus()
                 { return this->bHasFocus_; }