Changeset 2801 for code/branches/gui/src/orxonox/tools

Timestamp:

Mar 19, 2009, 10:58:43 AM (16 years ago)

Author:

rgrieder

Message:

Move graphic related content of GSGraphics to GraphicsManager which originally was GraphisEngine (but since we don't have an engine of our own, I renamed it).
Reduced OgreWindowEventUtilities.h dependency from GraphisManager.h (includes windows.h).

Location:

code/branches/gui/src/orxonox/tools

Files:

• ParticleInterface.cc (modified) (2 diffs)
• Shader.cc (modified) (4 diffs)
• WindowEventListener.h (modified) (1 diff)

code/branches/gui/src/orxonox/tools/ParticleInterface.cc

@@ -40 +40 @@
 #include <cassert>
 
-#include "GraphicsEngine.h"
+#include "GraphicsManager.h"
 #include "core/Core.h"
 #include "core/CoreIncludes.h"
@@ -178 +178 @@
     {
         this->detaillevel_ = level;
-        if (GraphicsEngine::getInstancePtr())
-            this->detailLevelChanged(GraphicsEngine::getInstance().getDetailLevelParticle());
+        if (Core::showsGraphics())
+            this->detailLevelChanged(GraphicsManager::getInstance().getDetailLevelParticle());
     }
 

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

@@ -39 +39 @@
 #include "core/CoreIncludes.h"
 #include "core/Executor.h"
-#include "GraphicsEngine.h"
+#include "GraphicsManager.h"
 #include "util/Exception.h"
 
@@ -59 +59 @@
         this->compositorInstance_ = 0;
         this->bVisible_ = true;
-        this->bLoadCompositor_ = Core::showsGraphics() && GraphicsEngine::getInstancePtr();
+        this->bLoadCompositor_ = Core::showsGraphics();
         this->bViewportInitialized_ = false;
         this->compositor_ = "";
@@ -86 +86 @@
         if (this->bLoadCompositor_ && this->compositorInstance_)
         {
-            Ogre::Viewport* viewport = GraphicsEngine::getInstance().getViewport();
+            Ogre::Viewport* viewport = GraphicsManager::getInstance().getViewport();
             assert(viewport);
             Ogre::CompositorManager::getSingleton().removeCompositor(viewport, this->compositor_);
@@ -114 +114 @@
         if (this->bLoadCompositor_)
         {
-            Ogre::Viewport* viewport = GraphicsEngine::getInstance().getViewport();
+            Ogre::Viewport* viewport = GraphicsManager::getInstance().getViewport();
             assert(viewport);
             if (this->oldcompositor_ != "")

code/branches/gui/src/orxonox/tools/WindowEventListener.h

@@ -49 +49 @@
 
             /** Window has resized */
-            virtual void windowResized(int newWidth, int newHeight) { }
+            virtual void windowResized(unsigned int newWidth, unsigned int newHeight) { }
 
             /** Window has lost/gained focus */