Changeset 232 for code/branches/main_reto_vs05/src/run_manager.cc
- Timestamp:
- Nov 21, 2007, 12:44:02 AM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/main_reto_vs05/src/run_manager.cc
r198 r232 60 60 #include "run_manager.h" 61 61 62 namespace Ogre { 63 using namespace orxonox; 64 template<> RunManager* Singleton<RunManager>::ms_Singleton = 0; 65 } 66 62 67 namespace orxonox { 63 68 using namespace Ogre; … … 77 82 */ 78 83 84 RunManager* RunManager::getSingletonPtr(void) 85 { 86 return ms_Singleton; 87 } 88 RunManager& RunManager::getSingleton(void) 89 { 90 assert( ms_Singleton ); return ( *ms_Singleton ); 91 } 92 79 93 80 94 /** … … 94 108 debugOverlay_(0), inputManager_(0), mouse_(0), keyboard_(0), joystick_(0) 95 109 { 96 97 110 // SETTING UP THE SCENE 98 111 99 112 // create one new SceneManger 100 sceneMgr_ = ogre_->getRoot()->createSceneManager(ST_GENERIC, " backgroundScene_");113 sceneMgr_ = ogre_->getRoot()->createSceneManager(ST_GENERIC, "Orxonox Scene"); 101 114 102 115 // background scene (world objects, skybox, lights, etc.) … … 125 138 126 139 // Construct a new spaceship and give it the node 127 playerShip_ = new OrxonoxShip(sceneMgr_ , sceneMgr_->getRootSceneNode()128 ->createChildSceneNode("ShipNode", Vector3(20, 20, 20)) , bulletManager_);140 playerShip_ = new OrxonoxShip(sceneMgr_->getRootSceneNode() 141 ->createChildSceneNode("ShipNode", Vector3(20, 20, 20))); 129 142 130 143 … … 274 287 // keep rendering 275 288 return true; 289 } 290 291 292 SceneManager& RunManager::getSceneManager() 293 { 294 return *sceneMgr_; 295 } 296 297 SceneManager* RunManager::getSceneManagerPtr() 298 { 299 return sceneMgr_; 300 } 301 302 BulletManager* RunManager::getBulletManagerPtr() 303 { 304 return bulletManager_; 305 } 306 307 int RunManager::getAmmunitionID(const Ogre::String &ammoName) 308 { 309 Ogre::String ammoTypes[] = { "Energy Cell", "Barrel", "Lead Shot" }; 310 int ammoTypesLength = 3; 311 312 for (int i = 0; i < ammoTypesLength; i++) 313 { 314 if (ammoTypes[i] == ammoName) 315 return i; 316 } 317 return -1; 318 } 319 320 int RunManager::getNumberOfAmmos() 321 { 322 return 3; 276 323 } 277 324
Note: See TracChangeset
for help on using the changeset viewer.