Changeset 5911 for code/branches/core5/src/orxonox/Scene.cc
- Timestamp:
- Oct 8, 2009, 10:56:29 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/core5/src/orxonox/Scene.cc
r5839 r5911 45 45 #include "tools/BulletConversions.h" 46 46 #include "Radar.h" 47 #include "CameraManager.h" 47 48 #include "worldentities/WorldEntity.h" 48 49 … … 65 66 66 67 this->radar_ = new Radar(); 68 this->cameraManager_ = new CameraManager(this); 67 69 } 68 70 else … … 73 75 74 76 this->radar_ = 0; 77 this->cameraManager_ = 0; 75 78 } 76 79 … … 94 97 { 95 98 if (GameMode::showsGraphics()) 99 { 100 // Check whether we're still using this scene manager for the GUI 101 if (GUIManager::getInstance().getCamera() && GUIManager::getInstance().getCamera()->getSceneManager() == this->sceneManager_) 102 GUIManager::getInstance().setCamera(NULL); 96 103 Ogre::Root::getSingleton().destroySceneManager(this->sceneManager_); 104 } 97 105 else 98 106 delete this->sceneManager_; … … 100 108 if (this->radar_) 101 109 this->radar_->destroy(); 110 111 if (this->cameraManager_) 112 this->cameraManager_->destroy(); 102 113 103 114 this->setPhysicalWorld(false);
Note: See TracChangeset
for help on using the changeset viewer.