Changeset 7073 for code/branches/presentation3/src/orxonox/worldentities/ControllableEntity.h

Timestamp:

Jun 2, 2010, 12:02:50 AM (15 years ago)

Author:

landauf

Message:

merged fps branch to presentation3

Location:

code/branches/presentation3

Files:

• . (modified) (1 prop)
• src/orxonox/worldentities/ControllableEntity.h (modified) (2 diffs)

code/branches/presentation3/src/orxonox/worldentities/ControllableEntity.h

@@ -163 +163 @@
             inline void setHudTemplate(const std::string& name)
                 { this->hudtemplate_ = name; }
+
+            Ogre::SceneNode* cameraPositionRootNode_;
 
         private:
@@ -210 +212 @@
             bool bMouseLook_;
             float mouseLookSpeed_;
-            Ogre::SceneNode* cameraPositionRootNode_;
             std::list<SmartPtr<CameraPosition> > cameraPositions_;
             CameraPosition* currentCameraPosition_;