Changeset 1426

Timestamp:

May 26, 2008, 12:00:20 AM (16 years ago)

Author:

rgrieder

Message:

• you can now tpye "keybind command" and then press a button/key to bind that string directly. doesn't seem to work yet with mouse axes

Location:

code/branches/network

Files:

• media_HEAD (moved) (moved from code/branches/network/media_r1700)
• src/core/InputManager.cc (modified) (7 diffs)
• src/core/InputManager.h (modified) (4 diffs)
• src/core/KeyBinder.cc (modified) (1 diff)
• src/core/KeyBinder.h (modified) (1 diff)

code/branches/network/src/core/InputManager.cc

@@ -38 +38 @@
 #include "InputBuffer.h"
 #include "KeyBinder.h"
+#include "CommandExecutor.h"
+#include "ConsoleCommand.h"
 
 namespace orxonox
 {
+  ConsoleCommandShortcut(InputManager, keyBind, AccessLevel::User);
+  ConsoleCommandShortcut(InputManager, storeKeyStroke, AccessLevel::Offline);
+
   // ###############################
   // ###    Internal Methods     ###
@@ -54 +59 @@
       joySticksSize_(0),
       keyBinder_(0), buffer_(0), keyDetector_(0),
-      state_(IS_UNINIT), stateRequest_(IS_UNINIT),
+      state_(IS_UNINIT), stateRequest_(IS_UNINIT), savedState_(IS_UNINIT),
       keyboardModifiers_(0)
   {
@@ -405 +410 @@
       if (stateRequest_ != IS_CUSTOM)
       {
-        activeKeyHandlers_.clear();
-        activeMouseHandlers_.clear();
-        for (unsigned int i = 0; i < joySticksSize_; i++)
-          activeJoyStickHandlers_[i].clear();
+        if (stateRequest_ != IS_NODETECT && stateRequest_ != IS_DETECT)
+        {
+          activeKeyHandlers_.clear();
+          activeMouseHandlers_.clear();
+          for (unsigned int i = 0; i < joySticksSize_; i++)
+            activeJoyStickHandlers_[i].clear();
+        }
 
         switch (stateRequest_)
@@ -429 +437 @@
           break;
 
-        case IS_DETECTION:
-          if (mouse_)
-            mouse_->capture();
-          if (keyboard_)
-            keyboard_->capture();
-          for (unsigned  int i = 0; i < joySticksSize_; i++)
-            joySticks_[i]->capture();
-
-          lastStroke_ = "";
+        case IS_DETECT:
+          savedState_ = state_;
           enableKeyHandler("keydetector");
           enableMouseHandler("keydetector");
@@ -443 +444 @@
           break;
 
+        case IS_NODETECT:
+          disableKeyHandler("keydetector");
+          disableMouseHandler("keydetector");
+          disableJoyStickHandler("keydetector", 0);
+          break;
+
         default:
           break;
         }
-        state_ = stateRequest_;
+
+        if (stateRequest_ == IS_NODETECT)
+          state_ = savedState_;
+        else
+          state_ = stateRequest_;
       }
     }
@@ -767 +778 @@
   // ################################
 
+  std::string InputManager::bindingCommmandString_s = "";
+
   bool InputManager::initialise(const size_t windowHnd, int windowWidth, int windowHeight,
     bool createKeyboard, bool createMouse, bool createJoySticks)
@@ -901 +914 @@
   void InputManager::storeKeyStroke(const std::string& name)
   {
-    if (_getSingleton().lastStroke_ == "")
-      _getSingleton().lastStroke_ = name;
-  }
-
-  const std::string& InputManager::getLastKeyStroke()
-  {
-    return _getSingleton().lastStroke_;
-  }
-
+    setInputState(IS_NODETECT);
+    COUT(3) << "Binding string \"" << bindingCommmandString_s << "\" on key '" << name << "'" << std::endl;
+    CommandExecutor::execute("set KeyBinder " + name + " " + bindingCommmandString_s, false);
+  }
+
+  void InputManager::keyBind(const std::string& command)
+  {
+    bindingCommmandString_s = command;
+    setInputState(IS_DETECT);
+  }
 
   // ###### KeyHandler ######

code/branches/network/src/core/InputManager.h

@@ -85 +85 @@
       IS_GUI,       //!< All OIS input events are passed to CEGUI.
       IS_CONSOLE,   //!< Keyboard input is redirected to the InputBuffer.
-      IS_DETECTION, //!< All the input goes to the KeyDetector
+      IS_DETECT,    //!< All the input additionally goes to the KeyDetector
+      IS_NODETECT,  //!< remove KeyDetector
       IS_CUSTOM     //!< Any possible configuration.
     };
@@ -115 +116 @@
 
     static void storeKeyStroke(const std::string& name);
-    static const std::string& getLastKeyStroke();
+    static void keyBind(const std::string& command);
 
     static bool addKeyHandler                 (KeyHandler* handler, const std::string& name);
@@ -189 +190 @@
     InputState stateRequest_;
     unsigned int keyboardModifiers_;
-    std::string lastStroke_;
+    InputState savedState_;
 
     //! Keeps track of the joy stick POV states
@@ -209 +210 @@
     std::vector<std::vector<int> >              joyStickButtonsDown_;
 
+    static std::string                          bindingCommmandString_s;
   };
 

code/branches/network/src/core/KeyBinder.cc

@@ -900 +900 @@
     button.nCommands_[KeybindMode::OnPress] = 1;
   }
+  
 }

code/branches/network/src/core/KeyBinder.h

@@ -232 +232 @@
     void loadBindings();
     void setConfigValues();
+
   protected:
     void readTrigger(Button& button);