Changeset 2896 for code/trunk/src/orxonox/CameraManager.cc
- Timestamp:
- Apr 6, 2009, 1:59:00 AM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/gui merged: 2796,2798-2801,2805,2807-2808,2811,2814-2817,2834,2840-2850,2853-2854,2859,2862-2863,2869,2875,2887,2892
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/CameraManager.cc
- Property svn:mergeinfo changed
/code/branches/gui/src/orxonox/CameraManager.cc (added) merged: 2834,2848,2850
r2893 r2896 35 35 #include <OgreResource.h> 36 36 37 #include "core/ Core.h"37 #include "core/GameMode.h" 38 38 #include "core/Iterator.h" 39 39 #include "objects/worldentities/Camera.h" … … 41 41 #include "tools/Shader.h" 42 42 #include "util/String.h" 43 #include "gui/GUIManager.h" 43 44 44 45 namespace orxonox … … 74 75 void CameraManager::requestFocus(Camera* camera) 75 76 { 76 if (! Core::showsGraphics())77 if (!GameMode::showsGraphics()) 77 78 return; 78 79 … … 99 100 void CameraManager::releaseFocus(Camera* camera) 100 101 { 101 if (! Core::showsGraphics())102 if (!GameMode::showsGraphics()) 102 103 return; 103 104 … … 141 142 142 143 this->viewport_->setCamera(camera); 144 GUIManager::getInstance().setCamera(camera); 143 145 144 146 // reactivate all visible compositors - Property svn:mergeinfo changed
Note: See TracChangeset
for help on using the changeset viewer.