- Timestamp:
- Aug 11, 2010, 8:55:13 AM (14 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/worldentities/ControllableEntity.h
r6417 r7163 49 49 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); 50 50 virtual void tick(float dt); 51 void registerVariables();52 51 void setConfigValues(); 53 52 … … 137 136 inline float getMouseLookSpeed() const 138 137 { return this->mouseLookSpeed_; } 138 inline CameraPosition* getCurrentCameraPosition() 139 { return this->currentCameraPosition_; } 139 140 140 141 inline Controller* getXMLController() const … … 162 163 { this->hudtemplate_ = name; } 163 164 165 Ogre::SceneNode* cameraPositionRootNode_; 166 164 167 private: 168 void registerVariables(); 165 169 void setXMLController(Controller* controller); 166 170 … … 208 212 bool bMouseLook_; 209 213 float mouseLookSpeed_; 210 Ogre::SceneNode* cameraPositionRootNode_;211 214 std::list<SmartPtr<CameraPosition> > cameraPositions_; 212 215 CameraPosition* currentCameraPosition_;
Note: See TracChangeset
for help on using the changeset viewer.