Changeset 2396 for code/branches/objecthierarchy2/src/orxonox/objects

Timestamp:

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

Author:

landauf

Message:

fixed shader/camera crash

Location:

code/branches/objecthierarchy2/src/orxonox/objects/worldentities

Files:

• Camera.cc (modified) (5 diffs)
• Camera.h (modified) (1 diff)

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/Camera.cc

@@ -36 +36 @@
 #include <OgreSceneManager.h>
 #include <OgreSceneNode.h>
-#include <OgreViewport.h>
-#include <OgreCompositorManager.h>
-#include <OgreResource.h>
 
 #include "util/Exception.h"
@@ -44 +41 @@
 #include "core/ConfigValueIncludes.h"
 #include "objects/Scene.h"
-#include "tools/Shader.h"
 #include "CameraManager.h"
 
@@ -54 +50 @@
     {
         RegisterObject(Camera);
-COUT(0) << this << ": created camera" << std::endl;
+
         if (!this->getScene() || !this->getScene()->getSceneManager())
             ThrowException(AbortLoading, "Can't create Camera, no scene or no scene manager given.");
@@ -80 +76 @@
             this->getScene()->getSceneManager()->destroyCamera(this->camera_);
         }
-COUT(0) << this << ": destroyed camera" << std::endl;
     }
 
@@ -123 +118 @@
     void Camera::removeFocus()
     {
-COUT(0) << this << ": remove focus" << std::endl;
         this->bHasFocus_ = false;
     }
 
-    void Camera::setFocus(Ogre::Viewport* viewport)
+    void Camera::setFocus()
     {
-        // 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(viewport, iterator.getNext()->getName(), false);
-        }
-
         this->bHasFocus_ = true;
-        viewport->setCamera(this->camera_);
-COUT(0) << this << ": set focus" << std::endl;
-
-        // reactivate all visible compositors
-        {
-            for (ObjectList<Shader>::iterator it = ObjectList<Shader>::begin(); it != ObjectList<Shader>::end(); ++it)
-                it->updateVisibility();
-        }
+        CameraManager::getInstance().useCamera(this->camera_);
     }
 }

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/Camera.h

@@ -62 +62 @@
         private:
             void removeFocus();
-            void setFocus(Ogre::Viewport* viewport);
+            void setFocus();
             void configvaluecallback_changedNearClipDistance();