Changeset 2896 for code/trunk/src/orxonox/tools/Shader.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/tools/Shader.cc
r2662 r2896 36 36 #include <OgrePlugin.h> 37 37 38 #include "core/ Core.h"38 #include "core/GameMode.h" 39 39 #include "core/CoreIncludes.h" 40 40 #include "core/Executor.h" 41 #include "Graphics Engine.h"41 #include "GraphicsManager.h" 42 42 #include "util/Exception.h" 43 43 … … 59 59 this->compositorInstance_ = 0; 60 60 this->bVisible_ = true; 61 this->bLoadCompositor_ = Core::showsGraphics() && GraphicsEngine::getInstancePtr();61 this->bLoadCompositor_ = GameMode::showsGraphics(); 62 62 this->bViewportInitialized_ = false; 63 63 this->compositor_ = ""; … … 86 86 if (this->bLoadCompositor_ && this->compositorInstance_) 87 87 { 88 Ogre::Viewport* viewport = Graphics Engine::getInstance().getViewport();88 Ogre::Viewport* viewport = GraphicsManager::getInstance().getViewport(); 89 89 assert(viewport); 90 90 Ogre::CompositorManager::getSingleton().removeCompositor(viewport, this->compositor_); … … 114 114 if (this->bLoadCompositor_) 115 115 { 116 Ogre::Viewport* viewport = Graphics Engine::getInstance().getViewport();116 Ogre::Viewport* viewport = GraphicsManager::getInstance().getViewport(); 117 117 assert(viewport); 118 118 if (this->oldcompositor_ != "") … … 246 246 Shader::ParameterPointer* Shader::getParameterPointer(const std::string& material, size_t technique, size_t pass, const std::string& parameter) 247 247 { 248 if (! Core::showsGraphics() || !Shader::bLoadedCgPlugin_s)248 if (!GameMode::showsGraphics() || !Shader::bLoadedCgPlugin_s) 249 249 return 0; 250 250
Note: See TracChangeset
for help on using the changeset viewer.