Changeset 9978 for code/trunk

Timestamp:

Jan 4, 2014, 9:48:04 PM (11 years ago)

Author:

landauf

Message:

added new keybind mode 'OnPressAndRelease' which triggers both when a button is pressed and when it's released.
pressed buttons send the value '1' to the bound console command, while released buttons send the value '0'.

Location:

code/trunk/src/libraries/core

Files:

• CorePrereqs.h (modified) (1 diff)
• input/Button.cc (modified) (4 diffs)
• input/Button.h (modified) (1 diff)
• input/InputCommands.h (modified) (3 diffs)
• input/KeyBinder.h (modified) (3 diffs)

code/trunk/src/libraries/core/CorePrereqs.h

@@ -106 +106 @@
             OnHold,
             OnRelease,
+            OnPressAndRelease,
             None
         };

code/trunk/src/libraries/core/input/Button.cc

@@ -138 +138 @@
                     else if (token == "onrelease")
                         mode = KeybindMode::OnRelease;
+                    else if (token == "onpressandrelease")
+                        mode = KeybindMode::OnPressAndRelease;
                     else if (token == "onhold")
                         mode = KeybindMode::OnHold;
@@ -216 +218 @@
                         {
                             mode = eval.getConsoleCommand()->getKeybindMode();
-                            commands[mode].push_back(cmd);
+                            this->addCommand(cmd, mode, commands);
                         }
                     }
@@ -232 +234 @@
                         cmd->setFixedKeybindMode(true);
 
-                    commands[mode].push_back(cmd);
+                    this->addCommand(cmd, mode, commands);
                 }
             }
@@ -251 +253 @@
     }
 
+    inline void Button::addCommand(BaseCommand* cmd, KeybindMode::Value mode, std::vector<BaseCommand*> commands[3])
+    {
+        if (mode == KeybindMode::OnPressAndRelease)
+        {
+            BaseCommand* cmd2 = cmd->clone();
+
+            commands[KeybindMode::OnPress].push_back(cmd);
+            commands[KeybindMode::OnRelease].push_back(cmd2); // clone
+        }
+        else
+            commands[mode].push_back(cmd);
+    }
+
     inline void Button::parseError(const std::string& message, bool serious)
     {

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

@@ -75 +75 @@
     private:
         void parseError(const std::string& message, bool serious);
+        void addCommand(BaseCommand* cmd, KeybindMode::Value mode, std::vector<BaseCommand*> commands[3]);
     };
 

code/trunk/src/libraries/core/input/InputCommands.h

@@ -67 +67 @@
             { return this->bFixedKeybindMode_; }
 
+        virtual BaseCommand* clone() = 0;
+
     private:
         bool bFixedKeybindMode_;
@@ -76 +78 @@
         bool execute(float abs = 1.0f, float rel = 1.0f);
         CommandEvaluation* getEvaluation();
+        virtual SimpleCommand* clone() { return new SimpleCommand(*this); }
 
         CommandEvaluation evaluation_;
@@ -103 +106 @@
         bool execute(float abs = 1.0f, float rel = 1.0f);
         CommandEvaluation* getEvaluation();
+        virtual ParamCommand* clone() { return new ParamCommand(*this); }
 
         float scale_;

code/trunk/src/libraries/core/input/KeyBinder.h

@@ -195 +195 @@
 
     inline void KeyBinder::buttonPressed (const KeyEvent& evt)
-    { assert(!keys_[evt.getKeyCode()].name_.empty()); keys_[evt.getKeyCode()].execute(KeybindMode::OnPress); }
+    { assert(!keys_[evt.getKeyCode()].name_.empty()); keys_[evt.getKeyCode()].execute(KeybindMode::OnPress, 1); }
 
     inline void KeyBinder::buttonReleased(const KeyEvent& evt)
-    { assert(!keys_[evt.getKeyCode()].name_.empty()); keys_[evt.getKeyCode()].execute(KeybindMode::OnRelease); }
+    { assert(!keys_[evt.getKeyCode()].name_.empty()); keys_[evt.getKeyCode()].execute(KeybindMode::OnRelease, 0); }
 
     inline void KeyBinder::buttonHeld    (const KeyEvent& evt)
@@ -205 +205 @@
 
     inline void KeyBinder::buttonPressed (MouseButtonCode::ByEnum button)
-    { mouseButtons_[button].execute(KeybindMode::OnPress); }
+    { mouseButtons_[button].execute(KeybindMode::OnPress, 1); }
 
     inline void KeyBinder::buttonReleased(MouseButtonCode::ByEnum button)
-    { mouseButtons_[button].execute(KeybindMode::OnRelease); }
+    { mouseButtons_[button].execute(KeybindMode::OnRelease, 0); }
 
     inline void KeyBinder::buttonHeld    (MouseButtonCode::ByEnum button)
@@ -215 +215 @@
 
     inline void KeyBinder::buttonPressed (unsigned int device, JoyStickButtonCode::ByEnum button)
-    { (*joyStickButtons_[device])[button].execute(KeybindMode::OnPress); }
+    { (*joyStickButtons_[device])[button].execute(KeybindMode::OnPress, 1); }
 
     inline void KeyBinder::buttonReleased(unsigned int device, JoyStickButtonCode::ByEnum button)
-    { (*joyStickButtons_[device])[button].execute(KeybindMode::OnRelease); }
+    { (*joyStickButtons_[device])[button].execute(KeybindMode::OnRelease, 0); }
 
     inline void KeyBinder::buttonHeld    (unsigned int device, JoyStickButtonCode::ByEnum button)