Changeset 3327 for code/trunk/src/core/input/InputState.cc

Timestamp:

Jul 19, 2009, 5:31:02 PM (16 years ago)

Author:

rgrieder

Message:

Merged all remaining revisions from core4 back to the trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/core/input/InputState.cc (copied) (copied from code/branches/core4/src/core/input/InputState.cc) (6 diffs)

code/trunk/src/core/input/InputState.cc

@@ -32 +32 @@
 namespace orxonox
 {
-    InputState::InputState()
-        : priority_(0)
-        , bAlwaysGetsInput_(false)
-        , bTransparent_(false)
+    //! Sets priority of it's a high priority and resizes the handler list
+    InputState::InputState(const std::string& name, bool bAlwaysGetsInput, bool bTransparent, InputStatePriority priority)
+        : name_(name)
+        , bAlwaysGetsInput_(bAlwaysGetsInput)
+        , bTransparent_(bTransparent)
         , bExpired_(true)
         , handlers_(2)
@@ -42 +43 @@
         , leaveFunctor_(0)
     {
+        if (priority >= InputStatePriority::HighPriority || priority == InputStatePriority::Empty)
+            priority_ = priority;
+        else
+            priority_ = 0;
+
+        handlers_.resize(InputDeviceEnumerator::FirstJoyStick + this->getJoyStickList().size(), NULL);
     }
 
@@ -52 +59 @@
     }
 
-    void InputState::JoyStickQuantityChanged(unsigned int n)
+    //! Called by JoyStickQuantityListener upon joy stick adding/removal
+    void InputState::JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList)
     {
         unsigned int oldSize = handlers_.size();
-        handlers_.resize(InputDeviceEnumerator::FirstJoyStick + n, NULL);
+        handlers_.resize(InputDeviceEnumerator::FirstJoyStick + joyStickList.size(), NULL);
 
         for (unsigned int i = oldSize; i < handlers_.size(); ++i)
@@ -63 +71 @@
     }
 
-    /**
-    @brief
-        Adds a joy stick handler.
-    @param handler
-        Pointer to the handler object.
-    @param joyStickID
-        ID of the joy stick
-    @return
-        True if added, false otherwise.
-    */
     bool InputState::setJoyStickHandler(InputHandler* handler, unsigned int joyStick)
     {
@@ -84 +82 @@
     }
 
-    /**
-    @brief
-        Adds a joy stick handler.
-    @param handler
-        Pointer to the handler object.
-    @return
-        True if added, false if handler already existed.
-    */
-    bool InputState::setJoyStickHandler(InputHandler* handler)
+    void InputState::setJoyStickHandler(InputHandler* handler)
     {
         joyStickHandlerAll_ = handler;
@@ -98 +88 @@
             handlers_[i] = handler;
         bExpired_ = true;
-        return true;
     }
 
-    /**
-    @brief
-        Adds a handler of any kind. dynamic_cast determines to which list it is added.
-    @param handler
-        Pointer to the handler object.
-    @return
-        True if added, false if handler already existed.
-    */
-    bool InputState::setHandler(InputHandler* handler)
+    void InputState::setHandler(InputHandler* handler)
     {
         setKeyHandler(handler);
         setMouseHandler(handler);
-        return setJoyStickHandler(handler);
+        setJoyStickHandler(handler);
     }