Changeset 2073 for code/branches/objecthierarchy/src/orxonox/gamestates
- Timestamp:
- Oct 31, 2008, 1:27:44 AM (16 years ago)
- Location:
- code/branches/objecthierarchy/src/orxonox/gamestates
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/objecthierarchy/src/orxonox/gamestates/GSLevel.cc
r2034 r2073 44 44 #include "objects/Radar.h" 45 45 //#include "tools/ParticleInterface.h" 46 #include "Camera Handler.h"46 #include "CameraManager.h" 47 47 #include "LevelManager.h" 48 48 #include "Settings.h" … … 57 57 , radar_(0) 58 58 , startFile_(0) 59 , camera Handler_(0)59 , cameraManager_(0) 60 60 , levelManager_(0) 61 61 { … … 82 82 inputState_->setHandler(keyBinder_); 83 83 84 // create the global Camera Handler84 // create the global CameraManager 85 85 assert(viewport); 86 this->camera Handler_ = new CameraHandler(viewport);86 this->cameraManager_ = new CameraManager(viewport); 87 87 88 88 // Start the Radar … … 146 146 delete this->radar_; 147 147 148 if (this->camera Handler_)149 delete this->camera Handler_;148 if (this->cameraManager_) 149 delete this->cameraManager_; 150 150 151 151 if (this->levelManager_) -
code/branches/objecthierarchy/src/orxonox/gamestates/GSLevel.h
r2023 r2073 68 68 Radar* radar_; //!< represents the Radar (not the HUD part) 69 69 XMLFile* startFile_; //!< current hard coded default level 70 Camera Handler* cameraHandler_;70 CameraManager* cameraManager_; 71 71 LevelManager* levelManager_; 72 72
Note: See TracChangeset
for help on using the changeset viewer.