Changeset 3370 for code/trunk/src/orxonox/CameraManager.cc
- Timestamp:
- Jul 30, 2009, 2:10:44 PM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/resource (added) merged: 3328,3336-3340,3342-3350,3352-3366
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/CameraManager.cc
r3280 r3370 34 34 #include "util/StringUtils.h" 35 35 #include "core/GameMode.h" 36 #include "core/GUIManager.h" 36 37 #include "core/ObjectList.h" 37 38 #include "tools/Shader.h" 38 39 #include "objects/worldentities/Camera.h" 39 40 #include "objects/Scene.h" 40 #include "gui/GUIManager.h"41 41 42 42 namespace orxonox 43 43 { 44 CameraManager* CameraManager::singleton Ref_s = 0;44 CameraManager* CameraManager::singletonPtr_s = 0; 45 45 46 46 CameraManager::CameraManager(Ogre::Viewport* viewport) 47 47 : viewport_(viewport) 48 48 { 49 assert(singletonRef_s == 0);50 singletonRef_s = this;51 52 49 this->fallbackCamera_ = 0; 53 50 } … … 55 52 CameraManager::~CameraManager() 56 53 { 57 assert(singletonRef_s != 0);58 singletonRef_s = 0;59 60 54 if (this->fallbackCamera_) 61 55 this->fallbackCamera_->getSceneManager()->destroyCamera(this->fallbackCamera_);
Note: See TracChangeset
for help on using the changeset viewer.