Changeset 7966 for code/branches/usability/src/libraries/tools/Shader.h

Timestamp:

Feb 26, 2011, 5:00:17 PM (13 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

File:

• code/branches/usability/src/libraries/tools/Shader.h (modified) (3 diffs)

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