Changeset 2396 for code/branches/objecthierarchy2/src/orxonox/CameraManager.cc

Timestamp:

Dec 10, 2008, 6:37:31 PM (16 years ago)

Author:

landauf

Message:

fixed shader/camera crash

File:

• code/branches/objecthierarchy2/src/orxonox/CameraManager.cc (modified) (5 diffs)

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

@@ -29 +29 @@
 #include "CameraManager.h"
 
+#include <OgreSceneManager.h>
 #include <OgreViewport.h>
-#include <OgreSceneManager.h>
 #include <OgreCamera.h>
+#include <OgreCompositorManager.h>
+#include <OgreResource.h>
 
 #include "core/Core.h"
+#include "core/Iterator.h"
 #include "objects/worldentities/Camera.h"
 #include "objects/Scene.h"
+#include "tools/Shader.h"
 #include "util/String.h"
 
@@ -57 +61 @@
 
         if (this->fallbackCamera_)
-        {
             this->fallbackCamera_->getSceneManager()->destroyCamera(this->fallbackCamera_);
-COUT(0) << "remove camera-manager" << std::endl;
-        }
     }
 
@@ -83 +84 @@
             this->fallbackCamera_->getSceneManager()->destroyCamera(this->fallbackCamera_);
             this->fallbackCamera_ = 0;
-COUT(0) << "remove fallback camera" << std::endl;
         }
 
-        camera->setFocus(this->viewport_);
+        camera->setFocus();
 
         // make sure we don't add it twice
@@ -110 +110 @@
             // set new focus if possible
             if (this->cameraList_.size() > 0)
-                this->cameraList_.front()->setFocus(this->viewport_);
+                this->cameraList_.front()->setFocus();
             else
             {
                 // there are no more cameras, create a fallback
                 if (!this->fallbackCamera_)
-                {
-COUT(0) << "create fallback camera" << std::endl;
                     this->fallbackCamera_ = camera->getScene()->getSceneManager()->createCamera(getUniqueNumberString());
-                }
-                this->viewport_->setCamera(this->fallbackCamera_);
-COUT(0) << "use fallback camera" << std::endl;
+                this->useCamera(this->fallbackCamera_);
             }
         }
@@ -128 +124 @@
         }
     }
+
+    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
+
+        // 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);
+
+        // reactivate all visible compositors
+        {
+            for (ObjectList<Shader>::iterator it = ObjectList<Shader>::begin(); it != ObjectList<Shader>::end(); ++it)
+                it->updateVisibility();
+        }
+    }
 }