Changeset 6866 for code/branches/fps/src/orxonox
- Timestamp:
- May 10, 2010, 12:40:49 PM (15 years ago)
- Location:
- code/branches/fps/src/orxonox
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/fps/src/orxonox/Scene.cc
r6417 r6866 338 338 SmartPtr<WorldEntity> object0 = static_cast<WorldEntity*>(colObj0->getUserPointer()); 339 339 SmartPtr<WorldEntity> object1 = static_cast<WorldEntity*>(colObj1->getUserPointer()); 340 340 341 341 // false means that bullet will assume we didn't modify the contact 342 342 bool modified = false; -
code/branches/fps/src/orxonox/controllers/HumanController.cc
r6417 r6866 41 41 namespace orxonox 42 42 { 43 43 44 SetConsoleCommand(HumanController, moveFrontBack, true).setAsInputCommand(); 44 45 SetConsoleCommand(HumanController, moveRightLeft, true).setAsInputCommand(); -
code/branches/fps/src/orxonox/controllers/NewHumanController.cc
r6502 r6866 210 210 if (!controlPaused_ ) 211 211 { 212 if (this->getControllableEntity() && (this->getControllableEntity()->isExactlyA(ClassByString("SpaceShip")) || this->getControllableEntity()->isExactlyA(ClassByString("Rocket")) ))212 if (this->getControllableEntity() && (this->getControllableEntity()->isExactlyA(ClassByString("SpaceShip")) || this->getControllableEntity()->isExactlyA(ClassByString("Rocket")) || this->getControllableEntity()->isExactlyA(ClassByString("FpsPlayer")))) 213 213 this->showOverlays(); 214 214 … … 425 425 HumanController::yaw(value); 426 426 427 this->currentYaw_ = value.x; 427 if (this->getControllableEntity() && !this->getControllableEntity()->isExactlyA(ClassByString("FpsPlayer"))) 428 this->currentYaw_ = value.x; 428 429 } 429 430 … … 434 435 HumanController::pitch(value); 435 436 436 this->currentPitch_ = value.x; 437 if (this->getControllableEntity() && !this->getControllableEntity()->isExactlyA(ClassByString("FpsPlayer"))) 438 this->currentPitch_ = value.x; 437 439 } 438 440 -
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.