Changeset 1887 for code/trunk/src/core/input/Button.h

Timestamp:

Oct 6, 2008, 12:31:32 AM (16 years ago)

Author:

rgrieder

Message:

FIRST THINGS FIRST: Delete or rename your keybindings.ini (def_keybindings.ini already has the most important bindings) or else you won't be able to do anything!

Changes:

• Multiple joy stick support should now fully work with KeyBinder too (only tested with 0/1 joystick)
• Reloading the OIS Devices now works with KeyBinder too
• Modified ConfigValueContainer to accept arbitrary section names
• added tkeybind to temporary bind a command to a key
• Fixed dlleport issue in ArgumentCompletionFunctions.h

Internal changes:

• General cleanup in initialisation of KeyBinder
• All names of keys/buttons/axes are now statically saved in InputInterfaces.h
• Move a magic value in KeyBinder to a configValue (MouseWheelStepSize_)
• Separated ConfigValues from Keybinding ConfigValueContainer in KeyBinder (looks much nicer now )
• Moved some performance critical small function to the inline section
• Removed the ugly keybind function construct from the InputManager
• More 'harmonising' work in KeyBinder

File:

• code/trunk/src/core/input/Button.h (modified) (3 diffs)

code/trunk/src/core/input/Button.h

@@ -40 +40 @@
 #include <string>
 #include <vector>
+#include "InputCommands.h"
 
 namespace orxonox
@@ -46 +47 @@
     {
     public:
-        Button() { nCommands_[0]=0; nCommands_[1]=0; nCommands_[2]=0; clear(); }
+        Button();
         virtual ~Button() { clear(); }
         virtual void clear();
         virtual bool addParamCommand(ParamCommand* command) { return false; }
-        void parse(std::vector<BufferedParamCommand*>& paramCommandBuffer);
+        void parse();
+        void readConfigValue();
         bool execute(KeybindMode::Enum mode, float abs = 1.0f, float rel = 1.0f);
 
+        //! Container to allow for better configValue support
+        ConfigValueContainer* configContainer_;
         //! The configured string value
         std::string bindingString_;
         //! Name of the trigger as strings
         std::string name_;
+        //! Name of the group of input triggers
+        std::string groupName_;
         //! Basic commands for OnPress, OnHold and OnRelease
         BaseCommand** commands_[3];
@@ -64 +70 @@
         //! Note: This variable is here to have only one parse() function.
         float buttonThreshold_;
+        bool bButtonThresholdUser_;
+        //! Pointer to the list of parametrised commands
+        std::vector<BufferedParamCommand*>* paramCommandBuffer_;
 
     private:
         void parseError(std::string message, bool serious);
     };
+
+    inline bool Button::execute(KeybindMode::Enum mode, float abs, float rel)
+    {
+        // execute all the parsed commands in the string
+        for (unsigned int iCommand = 0; iCommand < nCommands_[mode]; iCommand++)
+            commands_[mode][iCommand]->execute(abs, rel);
+        return true;
+    }
+
 }