Changeset 1413 for code/branches/network/src/core/KeyBinder.cc

Timestamp:

May 24, 2008, 8:12:20 PM (16 years ago)

Author:

rgrieder

Message:

• renamed InputHandler to KeyBinder
• added feature to detect a key in input part
• added def_keybindings.ini and removed keybindings.ini

File:

• code/branches/network/src/core/KeyBinder.cc (moved) (moved from code/branches/network/src/core/InputHandler.cc) (11 diffs)

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

@@ -32 +32 @@
  */
 
-#include "InputHandler.h"
+#include "KeyBinder.h"
 #include <fstream>
 #include "util/Convert.h"
@@ -472 +472 @@
     clearBindings();
 
-    /*std::ifstream infile;
+    std::ifstream infile;
     infile.open("keybindings.ini");
     if (!infile.is_open())
     {
-      ConfigFileManager::getSingleton()->setFile(CFT_Keybindings, "keybindings_def.ini");
-      setConfigValues();
-    }
-    infile.close();*/
+      ConfigFileManager::getSingleton()->setFile(CFT_Keybindings, keybindingsDefault_);
+      ConfigFileManager::getSingleton()->save(CFT_Keybindings, "keybindings.ini");
+    }
+    infile.close();
     ConfigFileManager::getSingleton()->setFile(CFT_Keybindings, "keybindings.ini");
+
+    // parse key bindings
     setConfigValues();
 
@@ -496 +498 @@
     SetConfigValue(derivePeriod_, 0.1f).description("Accuracy of the mouse input deriver. The higher the more precise, but laggier.");
     SetConfigValue(mouseSensitivityDerived_, 1.0f).description("Mouse sensitivity if mouse input is derived.");
-    SetConfigValue(keybindingsDefault_, "keybindings_def.ini").description("Default ini file for the keybindings.");
+    SetConfigValue(keybindingsDefault_, "def_keybindings.ini").description("Default ini file for the keybindings.");
 
     float oldThresh = buttonThreshold_;
@@ -542 +544 @@
     @brief Overwrites all bindings with ""
   */
-  void KeyBinder::clearBindings(bool bInit)
+  void KeyBinder::clearBindings()
   {
     for (unsigned int i = 0; i < nKeys_s; i++)
@@ -561 +563 @@
   }
 
-  void KeyBinder::tick(float dt)
+  void KeyBinder::tickInput(float dt, const HandlerState& state)
   {
     // we have to process all the analog input since there is e.g. no 'mouseDoesntMove' event.
-    for (unsigned int i = 0; i < nHalfAxes_s; i++)
+    unsigned int iBegin = 8;
+    unsigned int iEnd   = 8;
+    if (state.joyStick)
+      iEnd = nHalfAxes_s;
+    if (state.mouse)
+      iBegin = 0;
+    for (unsigned int i = iBegin; i < iEnd; i++)
     {
       if (halfAxes_[i].hasChanged_)
@@ -596 +604 @@
     }
 
-    if (bDeriveMouseInput_)
+    if (bDeriveMouseInput_ && state.mouse)
     {
       if (deriveTime_ > derivePeriod_)
       {
-        deriveTime_ = 0.0f;
         //CCOUT(3) << "mouse abs: ";
         for (int i = 0; i < 2; i++)
@@ -606 +613 @@
           if (mouseRelative_[i] > 0)
           {
-            halfAxes_[2*i + 0].absVal_ =  mouseRelative_[i] / derivePeriod_ / 5000 * mouseSensitivityDerived_;
+            halfAxes_[2*i + 0].absVal_ =  mouseRelative_[i] / deriveTime_ * 0.0005 * mouseSensitivityDerived_;
             halfAxes_[2*i + 1].absVal_ = 0.0f;
           }
@@ -612 +619 @@
           {
             halfAxes_[2*i + 0].absVal_ = 0.0f;
-            halfAxes_[2*i + 1].absVal_ = -mouseRelative_[i] / derivePeriod_ / 5000 * mouseSensitivityDerived_;
+            halfAxes_[2*i + 1].absVal_ = -mouseRelative_[i] / deriveTime_ * 0.0005 * mouseSensitivityDerived_;
           }
           else
@@ -622 +629 @@
           mouseRelative_[i] = 0;
         }
+        deriveTime_ = 0.0f;
         //COUT(3) << std::endl;
       }
@@ -633 +641 @@
 
     // always reset the relative movement of the mouse
-    for (unsigned int i = 0; i < 8; i++)
-      halfAxes_[i].relVal_ = 0.0f;
+    if (state.mouse)
+      for (unsigned int i = 0; i < 8; i++)
+        halfAxes_[i].relVal_ = 0.0f;
   }
 
@@ -784 +793 @@
 
   // ###############################
-  // ###     GUIInputHandler     ###
+  // #####     KeyDetector     #####
   // ###############################
 
-  ///**
-  //  @brief standard constructor
-  //*/
-  //GUIInputHandler::GUIInputHandler()
-  //{
-  //}
-
-  ///**
-  //  @brief Destructor
-  //*/
-  //GUIInputHandler::~GUIInputHandler()
-  //{
-  //}
-
-  ///**
-  //  @brief Event handler for the keyPressed Event.
-  //  @param e Event information
-  //*/
-  //bool GUIInputHandler::keyPressed(const OIS::KeyEvent &e)
-  //{
-    ////CEGUI::System::getSingleton().injectKeyDown( arg.key );
-    ////CEGUI::System::getSingleton().injectChar( arg.text );
-  //  return true;
-  //}
-
-  ///**
-  //  @brief Event handler for the keyReleased Event.
-  //  @param e Event information
-  //*/
-  //bool GUIInputHandler::keyReleased(const OIS::KeyEvent &e)
-  //{
-    ////CEGUI::System::getSingleton().injectKeyUp( arg.key );
-  //  return true;
-  //}
-
-  ///**
-  //  @brief Event handler for the mouseMoved Event.
-  //  @param e Event information
-  //*/
-  //bool GUIInputHandler::mouseMoved(const OIS::MouseEvent &e)
-  //{
-    ////CEGUI::System::getSingleton().injectMouseMove( arg.state.X.rel, arg.state.Y.rel );
-  //  return true;
-  //}
-
-  ///**
-  //  @brief Event handler for the mousePressed Event.
-  //  @param e Event information
-  //  @param id The ID of the mouse button
-  //*/
-  //bool GUIInputHandler::mousePressed(const OIS::MouseEvent &e, OIS::MouseButton id)
-  //{
-    ////CEGUI::System::getSingleton().injectMouseButtonDown(convertOISMouseButtonToCegui(id));
-  //  return true;
-  //}
-
-  ///**
-  //  @brief Event handler for the mouseReleased Event.
-  //  @param e Event information
-  //  @param id The ID of the mouse button
-  //*/
-  //bool GUIInputHandler::mouseReleased(const OIS::MouseEvent &e, OIS::MouseButton id)
-  //{
-    ////CEGUI::System::getSingleton().injectMouseButtonUp(convertOISMouseButtonToCegui(id));
-  //  return true;
-  //}
-
+  /**
+    @brief Constructor
+  */
+  KeyDetector::KeyDetector()
+  {
+    RegisterObject(KeyDetector);
+  }
+
+  /**
+    @brief Destructor
+  */
+  KeyDetector::~KeyDetector()
+  {
+  }
+
+  /**
+    @brief Loads the key and button bindings.
+    @return True if loading succeeded.
+  */
+  void KeyDetector::loadBindings()
+  {
+    clearBindings();
+    setConfigValues();
+  }
+
+  /**
+    @brief Loader for the key bindings, managed by config values.
+  */
+  void KeyDetector::setConfigValues()
+  {
+    // keys
+    for (unsigned int i = 0; i < nKeys_s; i++)
+      readTrigger(keys_[i]);
+    // mouse buttons
+    for (unsigned int i = 0; i < nMouseButtons_s; i++)
+      readTrigger(mouseButtons_[i]);
+    // joy stick buttons
+    for (unsigned int i = 0; i < nJoyStickButtons_s; i++)
+      readTrigger(joyStickButtons_[i]);
+    // half axes
+    for (unsigned int i = 0; i < nHalfAxes_s; i++)
+      readTrigger(halfAxes_[i]);
+  }
+
+  void KeyDetector::readTrigger(Button& button)
+  {
+    // binding has changed
+    button.parse(paramCommandBuffer_);
+    SimpleCommand* cmd = new SimpleCommand();
+    cmd->evaluation_ = CommandExecutor::evaluate("storeKeyStroke " + button.name_);
+    button.commands_[KeybindMode::OnPress] = new BaseCommand*[1];
+    button.commands_[KeybindMode::OnPress][0] = cmd;
+    button.nCommands_[KeybindMode::OnPress] = 1;
+  }
 }