Changeset 7966 for code/branches/usability

Timestamp:

Feb 26, 2011, 5:00:17 PM (14 years ago)

Author:

landauf

Message:

some changes related to camera switching:

• added ViewportEventListener (currently only listens to camera changes in a viewport)
• Shader now correctly updates its visibility if the camera changes the scene
• (the same lines of code also fix the weird Ogre behavior which was originally fixed in CameraManager)
• GraphicsManager also updates the GUIManager's camera
• if all cameras are destroyed, CameraManager now officially switches to NULL camera

Location:

code/branches/usability/src

Files:

• libraries/core/CMakeLists.txt (modified) (2 diffs)
• libraries/core/CorePrereqs.h (modified) (1 diff)
• libraries/core/GraphicsManager.cc (modified) (2 diffs)
• libraries/core/ViewportEventListener.cc (added)
• libraries/core/ViewportEventListener.h (added)
• libraries/tools/Shader.cc (modified) (4 diffs)
• libraries/tools/Shader.h (modified) (3 diffs)
• orxonox/CameraManager.cc (modified) (5 diffs)
• orxonox/CameraManager.h (modified) (2 diffs)
• orxonox/gamestates/GSMainMenu.cc (modified) (2 diffs)
• orxonox/graphics/Camera.cc (modified) (1 diff)

code/branches/usability/src/libraries/core/CMakeLists.txt

@@ -35 +35 @@
   OrxonoxClass.cc
   Resource.cc
-  WindowEventListener.cc
 
   # hierarchy
@@ -49 +48 @@
   Template.cc
   XMLPort.cc
+
+COMPILATION_BEGIN ListenerCompilation.cc
+  ViewportEventListener.cc
+  WindowEventListener.cc
   XMLNameListener.cc
+COMPILATION_END
 
 COMPILATION_BEGIN FilesystemCompilation.cc

code/branches/usability/src/libraries/core/CorePrereqs.h

@@ -182 +182 @@
     class Thread;
     class ThreadPool;
+    class ViewportEventListener;
     template <class T>
     class WeakPtr;

code/branches/usability/src/libraries/core/GraphicsManager.cc

@@ -57 +57 @@
 #include "Game.h"
 #include "GameMode.h"
+#include "GUIManager.h"
 #include "Loader.h"
 #include "MemoryArchive.h"
 #include "PathConfig.h"
+#include "ViewportEventListener.h"
 #include "WindowEventListener.h"
 #include "XMLFile.h"
@@ -381 +383 @@
     void GraphicsManager::setCamera(Ogre::Camera* camera)
     {
+        Ogre::Camera* oldCamera = this->viewport_->getCamera();
+
         this->viewport_->setCamera(camera);
+        GUIManager::getInstance().setCamera(camera);
+
+        for (ObjectList<ViewportEventListener>::iterator it = ObjectList<ViewportEventListener>::begin(); it != ObjectList<ViewportEventListener>::end(); ++it)
+            it->cameraChanged(this->viewport_, oldCamera);
     }
 

code/branches/usability/src/libraries/tools/Shader.cc

@@ -56 +56 @@
         this->bVisible_ = true;
         this->bLoadCompositor_ = GameMode::showsGraphics();
-        this->bViewportInitialized_ = false;
+        this->bViewportInitialized_ = true;
 
         if (this->bLoadCompositor_ && Ogre::Root::getSingletonPtr())
@@ -89 +89 @@
     {
         this->scenemanager_ = scenemanager;
-        this->bViewportInitialized_ = false;
-    }
-
+//        this->bViewportInitialized_ = false;
+    }
+
+    void Shader::cameraChanged(Ogre::Viewport* viewport, Ogre::Camera* oldCamera)
+    {
+        if (!this->scenemanager_ || (viewport != this->scenemanager_->getCurrentViewport() && this->scenemanager_->getCurrentViewport() != NULL))
+            return;
+
+        // update compositor in viewport (shader should only be active if the current camera is in the same scene as the shader)
+
+        // Note:
+        // The shader needs also to be switched off and on after changing the camera in the
+        // same scene to avoid weird behaviour with active compositors while switching the
+        // camera (like freezing the image)
+        //
+        // Last known Ogre version needing this workaround:
+        // 1.4.8
+        // 1.7.2
+
+
+        if (oldCamera && this->scenemanager_ == oldCamera->getSceneManager())
+            Ogre::CompositorManager::getSingleton().setCompositorEnabled(viewport, this->compositor_, false);
+
+        if (viewport->getCamera() && this->scenemanager_ == viewport->getCamera()->getSceneManager())
+            Ogre::CompositorManager::getSingleton().setCompositorEnabled(viewport, this->compositor_, this->isVisible());
+    }
+/*
     void Shader::tick(float dt)
     {
@@ -102 +126 @@
         }
     }
-
+*/
     void Shader::changedCompositor()
     {
@@ -119 +143 @@
                 if (!this->compositorInstance_)
                     COUT(2) << "Warning: Couldn't load compositor with name \"" << this->compositor_ << "\"." << std::endl;
-                Ogre::CompositorManager::getSingleton().setCompositorEnabled(viewport, this->compositor_, this->bViewportInitialized_ && this->isVisible());
+                //Ogre::CompositorManager::getSingleton().setCompositorEnabled(viewport, this->compositor_, this->bViewportInitialized_ && this->isVisible());
             }
             this->oldcompositor_ = this->compositor_;

code/branches/usability/src/libraries/tools/Shader.h

@@ -37 +37 @@
 
 #include "util/OgreForwardRefs.h"
-#include "tools/interfaces/Tickable.h"
+#include "core/ViewportEventListener.h"
 
 namespace orxonox
 {
-    class _ToolsExport Shader : public Tickable
+    class _ToolsExport Shader : public ViewportEventListener
     {
         typedef std::pair<bool, void*>                  ParameterPointer;
@@ -52 +52 @@
             Shader(Ogre::SceneManager* scenemanager = 0);
             virtual ~Shader();
-
-            virtual void tick(float dt);
 
             inline void setVisible(bool bVisible)
@@ -83 +81 @@
                 { return this->scenemanager_; }
 
+            virtual void cameraChanged(Ogre::Viewport* viewport, Ogre::Camera* oldCamera);
+
             void setParameter(const std::string& material, size_t technique, size_t pass, const std::string& parameter, float value);
             void setParameter(const std::string& material, size_t technique, size_t pass, const std::string& parameter, int value);

code/branches/usability/src/orxonox/CameraManager.cc

@@ -29 +29 @@
 #include "CameraManager.h"
 
+#include <cassert>
+
 #include <OgreSceneManager.h>
 #include <OgreViewport.h>
 #include <OgreCompositorManager.h>
 
-#include "util/StringUtils.h"
 #include "util/ScopedSingletonManager.h"
 #include "core/GameMode.h"
 #include "core/GraphicsManager.h"
-#include "core/GUIManager.h"
 #include "core/ObjectList.h"
 #include "tools/Shader.h"
 #include "graphics/Camera.h"
-#include "Scene.h"
 
 namespace orxonox
@@ -48 +47 @@
 
     CameraManager::CameraManager()
-        : viewport_(GraphicsManager::getInstance().getViewport())
     {
         assert(GameMode::showsGraphics());
@@ -55 +53 @@
     CameraManager::~CameraManager()
     {
-        GUIManager::getInstance().setCamera(0);
     }
 
@@ -95 +92 @@
             if (!this->cameraList_.empty())
                 this->cameraList_.front()->setFocus();
+            else
+                this->useCamera(NULL);
         }
         else
@@ -102 +101 @@
     void CameraManager::useCamera(Ogre::Camera* camera)
     {
-        // This workaround is needed to avoid weird behaviour with active compositors while
-        // switching the camera (like freezing the image)
-        //
-        // Last known Ogre version needing this workaround:
-        // 1.4.8
-        // 1.7.2
-
-        // deactivate all compositors
-        {
-            Ogre::ResourceManager::ResourceMapIterator iterator = Ogre::CompositorManager::getSingleton().getResourceIterator();
-            while (iterator.hasMoreElements())
-                Ogre::CompositorManager::getSingleton().setCompositorEnabled(this->viewport_, iterator.getNext()->getName(), false);
-        }
-
-        this->viewport_->setCamera(camera);
-        GUIManager::getInstance().setCamera(camera);
-
-        // reactivate all visible compositors
-        {
-            for (ObjectList<Shader>::iterator it = ObjectList<Shader>::begin(); it != ObjectList<Shader>::end(); ++it)
-                it->updateVisibility();
-        }
+        GraphicsManager::getInstance().setCamera(camera);
     }
 }

code/branches/usability/src/orxonox/CameraManager.h

@@ -38 +38 @@
 #include "OrxonoxPrereqs.h"
 
-#include <cassert>
 #include <list>
 #include "util/OgreForwardRefs.h"
 #include "util/Singleton.h"
 #include "core/OrxonoxClass.h"
-#include "core/SmartPtr.h"
 
 namespace orxonox
@@ -65 +63 @@
 
             std::list<Camera*>    cameraList_;
-            Ogre::Viewport*       viewport_;
 
             static CameraManager* singletonPtr_s;

code/branches/usability/src/orxonox/gamestates/GSMainMenu.cc

@@ -96 +96 @@
     {
         // show main menu
+        GraphicsManager::getInstance().setCamera(this->camera_);
         GUIManager::getInstance().showGUI("MainMenu", true);
-        GUIManager::getInstance().setCamera(this->camera_);
         GUIManager::getInstance().setBackgroundImage("MainMenuBackground", "Background");
-        GraphicsManager::getInstance().setCamera(this->camera_);
 
         InputManager::getInstance().enterState("MainMenuHackery");
@@ -129 +128 @@
         InputManager::getInstance().leaveState("MainMenuHackery");
 
-        GUIManager::getInstance().setCamera(0);
+        GraphicsManager::getInstance().setCamera(0);
         GUIManager::getInstance().setBackgroundImage("");
         GUIManager::hideGUI("MainMenu");
-        GraphicsManager::getInstance().setCamera(0);
 
         ModifyConsoleCommand(__CC_startStandalone_name).deactivate();

code/branches/usability/src/orxonox/graphics/Camera.cc

@@ -82 +82 @@
         if (this->isInitialized())
         {
-            if (GUIManager::getInstance().getCamera() == this->camera_)
-                GUIManager::getInstance().setCamera(NULL);
             this->releaseFocus();