Changeset 3288 for code/branches/core4/src/core/input/InputManager.cc

Timestamp:

Jul 13, 2009, 10:43:59 PM (16 years ago)

Author:

rgrieder

Message:

Finally found a satisfying way to deal with interfaces that deliver information, but only upon virtual call.
The solution involves a static variable but any other (and uglier/hackier) solution will do so too.
I applied the method the the JoyStickQuantityListener so that the KeyBinder is now independent on the InputManager.

File:

• code/branches/core4/src/core/input/InputManager.cc (modified) (3 diffs)

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

@@ -260 +260 @@
 
         // inform all JoyStick Device Number Listeners
-        for (ObjectList<JoyStickQuantityListener>::iterator it = ObjectList<JoyStickQuantityListener>::begin(); it; ++it)
-            it->JoyStickQuantityChanged(devices_.size() - InputDeviceEnumerator::FirstJoyStick);
+        std::vector<JoyStick*> joyStickList;
+        for (unsigned int i = InputDeviceEnumerator::FirstJoyStick; i < devices_.size(); ++i)
+            joyStickList.push_back(static_cast<JoyStick*>(devices_[i]));
+        JoyStickQuantityListener::changeJoyStickQuantity(joyStickList);
     }
 
@@ -572 +574 @@
         if (statesByName_.find(name) == statesByName_.end())
         {
-            InputState* state = new InputState;
             if (priority >= InputStatePriority::HighPriority || priority == InputStatePriority::Empty)
             {
@@ -583 +584 @@
                         COUT(2) << "Warning: Could not add an InputState with the same priority '"
                             << static_cast<int>(priority) << "' != 0." << std::endl;
-                        return false;
+                        return 0;
                     }
                 }
             }
+            InputState* state = new InputState(name, bAlwaysGetsInput, bTransparent, priority);
             statesByName_[name] = state;
-            state->JoyStickQuantityChanged(devices_.size() - InputDeviceEnumerator::FirstJoyStick);
-            state->setName(name);
-            state->bAlwaysGetsInput_ = bAlwaysGetsInput;
-            state->bTransparent_ = bTransparent;
-            if (priority >= InputStatePriority::HighPriority || priority == InputStatePriority::Empty)
-                state->setPriority(priority);
 
             return state;