- Timestamp:
- Oct 31, 2008, 1:27:44 AM (16 years ago)
- File:
-
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
code/branches/objecthierarchy/src/orxonox/CameraManager.cc
r2070 r2073 23 23 * Benjamin Knecht 24 24 * Co-authors: 25 * ...25 * Fabian 'x3n' Landau 26 26 * 27 27 */ 28 28 #include "OrxonoxStableHeaders.h" 29 #include "Camera Handler.h"29 #include "CameraManager.h" 30 30 31 31 #include <OgreViewport.h> … … 37 37 namespace orxonox 38 38 { 39 Camera Handler* CameraHandler::singletonRef_s = 0;39 CameraManager* CameraManager::singletonRef_s = 0; 40 40 41 Camera Handler::CameraHandler(Ogre::Viewport* viewport)41 CameraManager::CameraManager(Ogre::Viewport* viewport) 42 42 : viewport_(viewport) 43 43 { … … 46 46 } 47 47 48 Camera Handler::~CameraHandler()48 CameraManager::~CameraManager() 49 49 { 50 50 assert(singletonRef_s != 0); … … 52 52 } 53 53 54 Camera* Camera Handler::getActiveCamera() const54 Camera* CameraManager::getActiveCamera() const 55 55 { 56 56 if (this->cameraList_.size() > 0) … … 60 60 } 61 61 62 void Camera Handler::requestFocus(Camera* camera)62 void CameraManager::requestFocus(Camera* camera) 63 63 { 64 64 if (!Core::showsGraphics()) … … 81 81 } 82 82 83 void Camera Handler::releaseFocus(Camera* camera)83 void CameraManager::releaseFocus(Camera* camera) 84 84 { 85 85 if (!Core::showsGraphics())
Note: See TracChangeset
for help on using the changeset viewer.