Changeset 7073 for code/branches/presentation3
- Timestamp:
- Jun 2, 2010, 12:02:50 AM (14 years ago)
- Location:
- code/branches/presentation3
- Files:
-
- 8 edited
- 25 copied
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation3
- Property svn:mergeinfo changed
/code/branches/fps (added) merged: 6591,6639,6819-6826,6866-6867,6872,6882-6883,6908,7052-7053,7055,7057,7059,7070
- Property svn:mergeinfo changed
-
code/branches/presentation3/cmake/LibraryConfig.cmake
r6461 r7073 188 188 189 189 # More plugins: Plugin_BSPSceneManager, Plugin_OctreeSceneManager 190 SET(OGRE_PLUGINS_INT Plugin_ParticleFX)190 SET(OGRE_PLUGINS_INT "Plugin_ParticleFX;Plugin_BSPSceneManager") 191 191 IF(WIN32) 192 192 # CG program manager is probably DirectX related (not available under unix) -
code/branches/presentation3/data/levels/fps_test.oxw
- Property svn:eol-style set to native
-
code/branches/presentation3/data/levels/includes/weaponsettings_fps.oxi
- Property svn:eol-style set to native
-
code/branches/presentation3/data/levels/presentation_FS10.oxw
- Property svn:eol-style set to native
-
code/branches/presentation3/data/levels/presentation_FS10_ed.oxw
- Property svn:eol-style set to native
-
code/branches/presentation3/data/levels/templates/fps.oxt
- Property svn:eol-style set to native
-
code/branches/presentation3/data/overlays/hudtamplates_fps.oxo
- Property svn:eol-style set to native
-
code/branches/presentation3/src/libraries/tools/CMakeLists.txt
r6417 r7073 15 15 COMPILATION_END 16 16 ) 17 #ADD_SUBDIRECTORY(bsp) 17 18 ADD_SUBDIRECTORY(interfaces) 18 19 -
code/branches/presentation3/src/orxonox/controllers/NewHumanController.cc
r6951 r7073 216 216 { 217 217 if (this->getControllableEntity() && (this->getControllableEntity()->isExactlyA(ClassByString("SpaceShip")) || this->getControllableEntity()->isExactlyA(ClassByString("Rocket")))) 218 this->showOverlays(); 218 {this->showOverlays();} 219 220 if (this->getControllableEntity() && this->getControllableEntity()->isExactlyA(ClassByString("FpsPlayer")))\ 221 {this->showOverlays(); 222 this->hideArrows();} 219 223 220 224 this->crossHairOverlay_->setPosition(Vector2(static_cast<float>(this->currentYaw_)/2*-1+.5f-overlaySize_/2, static_cast<float>(this->currentPitch_)/2*-1+.5f-overlaySize_/2)); … … 437 441 HumanController::yaw(value); 438 442 439 this->currentYaw_ = value.x; 443 if (this->getControllableEntity() && !this->getControllableEntity()->isExactlyA(ClassByString("FpsPlayer"))) 444 this->currentYaw_ = value.x; 440 445 } 441 446 … … 446 451 HumanController::pitch(value); 447 452 448 this->currentPitch_ = value.x; 453 if (this->getControllableEntity() && !this->getControllableEntity()->isExactlyA(ClassByString("FpsPlayer"))) 454 this->currentPitch_ = value.x; 449 455 } 450 456 -
code/branches/presentation3/src/orxonox/worldentities/ControllableEntity.h
r6994 r7073 163 163 inline void setHudTemplate(const std::string& name) 164 164 { this->hudtemplate_ = name; } 165 166 Ogre::SceneNode* cameraPositionRootNode_; 165 167 166 168 private: … … 210 212 bool bMouseLook_; 211 213 float mouseLookSpeed_; 212 Ogre::SceneNode* cameraPositionRootNode_;213 214 std::list<SmartPtr<CameraPosition> > cameraPositions_; 214 215 CameraPosition* currentCameraPosition_; -
code/branches/presentation3/src/orxonox/worldentities/pawns/CMakeLists.txt
r5781 r7073 1 1 ADD_SOURCE_FILES(ORXONOX_SRC_FILES 2 FpsPlayer.cc 2 3 Spectator.cc 3 4 Pawn.cc -
code/branches/presentation3/src/orxonox/worldentities/pawns/FpsPlayer.cc
- Property svn:eol-style set to native
-
code/branches/presentation3/src/orxonox/worldentities/pawns/FpsPlayer.h
- Property svn:eol-style set to native
-
code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.cc
r7045 r7073 363 363 { 364 364 if (this->weaponSystem_) 365 { 365 366 this->weaponSystem_->addWeaponPack(wPack); 367 this->addedWeaponPack(wPack); 368 } 366 369 } 367 370 … … 369 372 { 370 373 if (this->weaponSystem_) 374 { 371 375 if (!this->weaponSystem_->addWeaponPack(wPack)) 372 376 wPack->destroy(); 377 else 378 this->addedWeaponPack(wPack); 379 } 373 380 } 374 381 -
code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.h
r6998 r7073 101 101 void addWeaponPackXML(WeaponPack * wPack); 102 102 WeaponPack * getWeaponPack(unsigned int index) const; 103 104 virtual void addedWeaponPack(WeaponPack* wPack) {} 103 105 104 106 inline const WorldEntity* getWorldEntity() const
Note: See TracChangeset
for help on using the changeset viewer.