Changeset 6866 for code/branches/fps/src/orxonox/worldentities
- Timestamp:
- May 10, 2010, 12:40:49 PM (15 years ago)
- Location:
- code/branches/fps/src/orxonox/worldentities
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/fps/src/orxonox/worldentities/CameraPosition.cc
r5929 r6866 65 65 void CameraPosition::attachCamera(Camera* camera) 66 66 { 67 if (!this->bDrag_) 67 68 this->attach(camera); 69 if (!this->bDrag_) 68 70 camera->setDrag(false); 69 70 this->attach(camera);71 71 72 72 if (this->bDrag_) -
code/branches/fps/src/orxonox/worldentities/ControllableEntity.h
r6417 r6866 161 161 inline void setHudTemplate(const std::string& name) 162 162 { this->hudtemplate_ = name; } 163 164 Ogre::SceneNode* cameraPositionRootNode_; 163 165 164 166 private: … … 208 210 bool bMouseLook_; 209 211 float mouseLookSpeed_; 210 Ogre::SceneNode* cameraPositionRootNode_;211 212 std::list<SmartPtr<CameraPosition> > cameraPositions_; 212 213 CameraPosition* currentCameraPosition_; -
code/branches/fps/src/orxonox/worldentities/pawns/CMakeLists.txt
r5781 r6866 1 1 ADD_SOURCE_FILES(ORXONOX_SRC_FILES 2 FpsPlayer.cc 2 3 Spectator.cc 3 4 Pawn.cc
Note: See TracChangeset
for help on using the changeset viewer.