Changeset 7966 for code/branches/usability/src/libraries/core

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/libraries/core

Files:

• CMakeLists.txt (modified) (2 diffs)
• CorePrereqs.h (modified) (1 diff)
• GraphicsManager.cc (modified) (2 diffs)
• ViewportEventListener.cc (added)
• ViewportEventListener.h (added)

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);
     }