Changeset 3291 for code/branches/core4/src/core

Timestamp:

Jul 14, 2009, 11:50:47 AM (15 years ago)

Author:

rgrieder

Message:

Added window size as static variable to the WindowEventListener interface.
This resolves several hacks and inconveniences in Mouse, InputManager, InGameConsole, GSGraphics and OrxonoxOverlay.

Location:

code/branches/core4/src/core

Files:

• CorePrereqs.h (modified) (1 diff)
• WindowEventListener.cc (modified) (1 diff)
• WindowEventListener.h (modified) (2 diffs)
• input/InputManager.cc (modified) (8 diffs)
• input/InputManager.h (modified) (5 diffs)
• input/JoyStickQuantityListener.h (modified) (1 diff)
• input/Mouse.cc (modified) (2 diffs)
• input/Mouse.h (modified) (4 diffs)

code/branches/core4/src/core/CorePrereqs.h

@@ -153 +153 @@
     class TclThreadManager;
     class Template;
-    class Tickable;
+    class WindowEventListener;
     class XMLFile;
     class XMLNameListener;

code/branches/core4/src/core/WindowEventListener.cc

@@ -32 +32 @@
 namespace orxonox
 {
+    unsigned int WindowEventListener::windowWidth_s  = 0;
+    unsigned int WindowEventListener::windowHeight_s = 0;
+
     WindowEventListener::WindowEventListener()
     {
         RegisterRootObject(WindowEventListener);
     }
+
+    //! Calls all registered objects
+    /*static*/ void WindowEventListener::moveWindow()
+    {
+        for (ObjectList<WindowEventListener>::iterator it = ObjectList<WindowEventListener>::begin(); it; ++it)
+            it->windowMoved();
+    }
+
+    //! Calls all registered objects and sets the static variables
+    /*static*/ void WindowEventListener::resizeWindow(unsigned int newWidth, unsigned int newHeight)
+    {
+        windowWidth_s = newWidth;
+        windowHeight_s = newHeight;
+        for (ObjectList<WindowEventListener>::iterator it = ObjectList<WindowEventListener>::begin(); it; ++it)
+            it->windowResized(newWidth, newHeight);
+    }
+
+    //! Calls all registered objects
+    /*static*/ void WindowEventListener::changeWindowFocus()
+    {
+        for (ObjectList<WindowEventListener>::iterator it = ObjectList<WindowEventListener>::begin(); it; ++it)
+            it->windowFocusChanged();
+    }
 }

code/branches/core4/src/core/WindowEventListener.h

@@ -38 +38 @@
     class _CoreExport WindowEventListener : virtual public OrxonoxClass
     {
-        public:
+        friend class OgreWindowEventListener;
+
+        protected:
             WindowEventListener();
             virtual ~WindowEventListener() { }
 
+            //! Returns the current render window width
+            unsigned int getWindowWidth() const { return windowWidth_s; }
+            //! Returns the current render window height
+            unsigned int getWindowHeight() const { return windowHeight_s; }
+
+        private:
             //! Window has been moved
             virtual void windowMoved() { }
@@ -50 +58 @@
             //! Window has lost/gained focus
             virtual void windowFocusChanged() { }
+
+            static void moveWindow();
+            static void resizeWindow(unsigned int newWidth, unsigned int newHeight);
+            static void changeWindowFocus();
+
+            //! Static variable that holds the latest distributed information
+            static unsigned int windowWidth_s;
+            static unsigned int windowHeight_s;
     };
 }

code/branches/core4/src/core/input/InputManager.cc

@@ -82 +82 @@
     // ##########                                        ##########
     // ############################################################
-    InputManager::InputManager(size_t windowHnd, unsigned int windowWidth, unsigned int windowHeight)
+    InputManager::InputManager(size_t windowHnd)
         : internalState_(Bad)
         , oisInputManager_(0)
@@ -100 +100 @@
         this->setConfigValues();
 
-        this->loadDevices(windowHnd, windowWidth, windowHeight);
+        this->loadDevices(windowHnd);
 
         // Lowest priority empty InputState
@@ -157 +157 @@
         The height of the render window
     */
-    void InputManager::loadDevices(size_t windowHnd, unsigned int windowWidth, unsigned int windowHeight)
+    void InputManager::loadDevices(size_t windowHnd)
     {
         CCOUT(3) << "Loading input devices..." << std::endl;
@@ -216 +216 @@
 
         // TODO: Remove the two parameters
-        this->loadMouse(windowWidth, windowHeight);
+        this->loadMouse();
         this->loadJoySticks();
 
@@ -226 +226 @@
 
     //! Creates a new orxonox::Mouse
-    void InputManager::loadMouse(unsigned int windowWidth, unsigned int windowHeight)
+    void InputManager::loadMouse()
     {
         if (oisInputManager_->getNumberOfDevices(OIS::OISMouse) > 0)
@@ -232 +232 @@
             try
             {
-                devices_[InputDeviceEnumerator::Mouse] = new Mouse(InputDeviceEnumerator::Mouse, oisInputManager_, windowWidth, windowHeight);
+                devices_[InputDeviceEnumerator::Mouse] = new Mouse(InputDeviceEnumerator::Mouse, oisInputManager_);
             }
             catch (const OIS::Exception& ex)
@@ -368 +368 @@
         CCOUT(3) << "Reloading ..." << std::endl;
 
-        // Save mouse clipping size
-        int clippingWidth = 800;
-        int clippingHeight = 600;
-        if (devices_[InputDeviceEnumerator::Mouse])
-        {
-            int clippingWidth  = static_cast<Mouse*>(devices_[InputDeviceEnumerator::Mouse])->getClippingWidth();
-            int clippingHeight = static_cast<Mouse*>(devices_[InputDeviceEnumerator::Mouse])->getClippingHeight();
-        }
-
         this->destroyDevices();
-        this->loadDevices(windowHnd_, clippingWidth, clippingHeight);
+        this->loadDevices(windowHnd_);
 
         internalState_ &= ~Bad;
@@ -563 +554 @@
     }
 
+    //! Gets called by WindowEventListener upon focus change --> clear buffers 
+    void InputManager::windowFocusChanged()
+    {
+        this->clearBuffers();
+    }
+
     // ############################################################
     // #####                    Iput States                   #####

code/branches/core4/src/core/input/InputManager.h

@@ -37 +37 @@
 #include <vector>
 
-#include "core/OrxonoxClass.h"
+#include "core/WindowEventListener.h"
 #include "InputState.h"
 
@@ -62 +62 @@
           If the OIS::InputManager or the Keyboard fail, an exception is thrown.
     */
-    class _CoreExport InputManager : public OrxonoxClass
+    class _CoreExport InputManager : public WindowEventListener
     {
     public:
@@ -82 +82 @@
             the constructor fails with an std::exception.
         */
-        InputManager(size_t windowHnd, unsigned int windowWidth, unsigned int windowHeight);
+        InputManager(size_t windowHnd);
         //! Destroys all devices AND all input states!
         ~InputManager();
@@ -176 +176 @@
 
         // Intenal methods
-        void loadDevices(size_t windowHnd, unsigned int windowWidth, unsigned int windowHeight);
-        void loadMouse(unsigned int windowWidth, unsigned int windowHeight);
+        void loadDevices(size_t windowHnd);
+        void loadMouse();
         void loadJoySticks();
         void destroyDevices();
@@ -186 +186 @@
         void destroyStateInternal(InputState* state);
         void updateActiveStates();
+
+        // From WindowEventListener
+        void windowFocusChanged();
 
     private: // variables

code/branches/core4/src/core/input/JoyStickQuantityListener.h

@@ -44 +44 @@
     {
         friend InputManager;
-    public:
+    protected:
         JoyStickQuantityListener();
         virtual ~JoyStickQuantityListener() { }

code/branches/core4/src/core/input/Mouse.cc

@@ -30 +30 @@
 
 #include <ois/OISMouse.h>
+#include "core/ConsoleCommand.h"
+#include "core/CoreIncludes.h"
 #include "InputState.h"
-#include "core/ConsoleCommand.h"
 
-// HACK (include this as last, X11 seems to define some macros...)
 #ifdef ORXONOX_PLATFORM_LINUX
-#  include <ois/linux/LinuxMouse.h>
+// include this as last, X11 seems to define some macros...
+#include <ois/linux/LinuxMouse.h>
 #endif
 
 namespace orxonox
 {
-    Mouse::Mouse(unsigned int id, OIS::InputManager* oisInputManager, unsigned int windowWidth, unsigned int windowHeight)
+    Mouse::Mouse(unsigned int id, OIS::InputManager* oisInputManager)
         : super(id, oisInputManager)
     {
-        this->setMouseClipping(windowWidth, windowHeight);
-        // HACK:
-        instancePointer_s = this;
-    }
+        RegisterRootObject(Mouse);
+        this->windowResized(this->getWindowHeight(), this->getWindowHeight());
 
-    void Mouse::setMouseClipping(unsigned int width, unsigned int height)
-    {
-        oisDevice_->getMouseState().width  = width;
-        oisDevice_->getMouseState().height = height;
-    }
-
-    unsigned int Mouse::getClippingWidth() const
-    {
-        return oisDevice_->getMouseState().width;
-    }
-
-    unsigned int Mouse::getClippingHeight() const
-    {
-        return oisDevice_->getMouseState().height;
+#ifdef ORXONOX_PLATFORM_LINUX
+        {
+            // Mouse grab console command
+            FunctorMember<Mouse>* functor = createFunctor(&Mouse::grab);
+            functor->setObject(this);
+            this->getIdentifier()->addConsoleCommand(createConsoleCommand(functor, "grab"), false);
+        }
+        {
+            // Mouse ungrab console command
+            FunctorMember<Mouse>* functor = createFunctor(&Mouse::ungrab);
+            functor->setObject(this);
+            this->getIdentifier()->addConsoleCommand(createConsoleCommand(functor, "ungrab"), false);
+        }
+#endif
     }
 
@@ -87 +86 @@
     }
 
-    // ############################################################
-    // #####                   ugly hacks                     #####
-    // ##########                                        ##########
-    // ############################################################
-
-    // HACK:
-    SetConsoleCommand(Mouse, setMouseClipping_s, false);
-#ifdef ORXONOX_PLATFORM_LINUX
-    SetConsoleCommand(Mouse, grabMouse, true);
-    SetConsoleCommand(Mouse, ungrabMouse, true);
-#endif
-    Mouse* Mouse::instancePointer_s = NULL;
+    void Mouse::windowResized(unsigned int newWidth, unsigned int newHeight)
+    {
+        oisDevice_->getMouseState().width  = newWidth;
+        oisDevice_->getMouseState().height = newHeight;
+    }
 
 #ifdef ORXONOX_PLATFORM_LINUX

code/branches/core4/src/core/input/Mouse.h

@@ -31 +31 @@
 
 #include "InputPrereqs.h"
+
 #include "InputDevice.h"
+#include "core/WindowEventListener.h"
 
 namespace orxonox
@@ -53 +55 @@
         : public InputDeviceTemplated<MouseTraits>
         , public OIS::MouseListener
+        , public WindowEventListener
     {
         friend class InputDeviceTemplated<MouseTraits>;
@@ -60 +63 @@
     public:
         //! Only sets the clipping size. Initialising is done in the base class.
-        Mouse(unsigned int id, OIS::InputManager* oisInputManager, unsigned int windowWidth, unsigned int windowHeight);
+        Mouse(unsigned int id, OIS::InputManager* oisInputManager);
         ~Mouse() { }
 
-        /**
-        @brief
-            Adjusts the mouse window metrics.
-
-            This method has to be called every time the size of the window changes.
-        */
-        void setMouseClipping(unsigned int width, unsigned int height);
-        // Returns the width of the mouse window
-        unsigned int getClippingWidth() const;
-        // Returns the height of the mouse window
-        unsigned int getClippingHeight() const;
-
-        // HACK!
-        static void setMouseClipping_s(unsigned int width, unsigned int height)
-            { instancePointer_s->setMouseClipping(width, height); }
-        void setConfigValues() { }
 #ifdef ORXONOX_PLATFORM_LINUX
-        // HACK!
         // TODO: Make this a feature rather than a hack
-        static void grabMouse();
-        static void ungrabMouse();
+        void grabMouse();
+        void ungrabMouse();
 #endif
 
@@ -103 +89 @@
         bool mouseMoved(const OIS::MouseEvent &arg);
 
+        void windowResized(unsigned int newWidth, unsigned int newHeight);
+
         // Returns the class name as string
         static std::string getClassNameImpl() { return "Mouse"; }
-
-        // HACK:
-        static Mouse* instancePointer_s;
     };
 }