Changeset 2908 for code/branches/questsystem5/src/orxonox/tools/Shader.cc

Timestamp:

Apr 8, 2009, 12:58:47 AM (16 years ago)

Author:

dafrick

Message:

Reverted to revision 2906 (because I'm too stupid to merge correctly, 2nd try will follow shortly. )

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/orxonox/tools/Shader.cc (modified) (5 diffs)

code/branches/questsystem5/src/orxonox/tools/Shader.cc

@@ -36 +36 @@
 #include <OgrePlugin.h>
 
-#include "core/GameMode.h"
+#include "core/Core.h"
 #include "core/CoreIncludes.h"
 #include "core/Executor.h"
-#include "GraphicsManager.h"
+#include "GraphicsEngine.h"
 #include "util/Exception.h"
 
@@ -59 +59 @@
         this->compositorInstance_ = 0;
         this->bVisible_ = true;
-        this->bLoadCompositor_ = GameMode::showsGraphics();
+        this->bLoadCompositor_ = Core::showsGraphics() && GraphicsEngine::getInstancePtr();
         this->bViewportInitialized_ = false;
         this->compositor_ = "";
@@ -86 +86 @@
         if (this->bLoadCompositor_ && this->compositorInstance_)
         {
-            Ogre::Viewport* viewport = GraphicsManager::getInstance().getViewport();
+            Ogre::Viewport* viewport = GraphicsEngine::getInstance().getViewport();
             assert(viewport);
             Ogre::CompositorManager::getSingleton().removeCompositor(viewport, this->compositor_);
@@ -114 +114 @@
         if (this->bLoadCompositor_)
         {
-            Ogre::Viewport* viewport = GraphicsManager::getInstance().getViewport();
+            Ogre::Viewport* viewport = GraphicsEngine::getInstance().getViewport();
             assert(viewport);
             if (this->oldcompositor_ != "")
@@ -246 +246 @@
     Shader::ParameterPointer* Shader::getParameterPointer(const std::string& material, size_t technique, size_t pass, const std::string& parameter)
     {
-        if (!GameMode::showsGraphics() || !Shader::bLoadedCgPlugin_s)
+        if (!Core::showsGraphics() || !Shader::bLoadedCgPlugin_s)
             return 0;