Changeset 2543 for code/branches/presentation/src/core

Timestamp:

Dec 28, 2008, 11:56:31 PM (16 years ago)

Author:

rgrieder

Message:

• Fixed a bug in ConfigFileManager::getVectorSize(). If there were no entries, 1 was returned instead of 0.
• Added getSctionName to the ConfigValueContainer
• Bugfix in Button::clear()
• Renamed some joy stick buttons and axes to have them sorted corrected in the config file
• Removed annoying and useless "Key_084=" from keybindings.ini file (there were about a hundred of them)
• Bugfix in KeyBinder: All the axes were inverted (which was then corrected in the ini file)
• Also inverted rotateYaw in SpaceShip and Spectator because that actually corrected the bug from above
• Some small performance optimisation in InputManager

Location:

code/branches/presentation/src/core

Files:

• ConfigFileManager.cc (modified) (1 diff)
• ConfigValueContainer.cc (modified) (1 diff)
• ConfigValueContainer.h (modified) (2 diffs)
• input/Button.cc (modified) (2 diffs)
• input/Button.h (modified) (1 diff)
• input/InputInterfaces.h (modified) (2 diffs)
• input/InputManager.cc (modified) (6 diffs)
• input/InputManager.h (modified) (3 diffs)
• input/KeyBinder.cc (modified) (13 diffs)
• input/KeyBinder.h (modified) (3 diffs)

code/branches/presentation/src/core/ConfigFileManager.cc

@@ -160 +160 @@
                 if ((*it)->getIndex() > size)
                     size = (*it)->getIndex();
-        return (size + 1);
+        if (size == 0)
+            return 0;
+        else
+            return (size + 1);
     }
 

code/branches/presentation/src/core/ConfigValueContainer.cc

@@ -273 +273 @@
         {
             this->valueVector_.clear();
-            for (unsigned int i = 0; i < ConfigFileManager::getInstance().getVectorSize(this->type_, this->sectionname_, this->varname_); i++)
+            unsigned int vectorSize = ConfigFileManager::getInstance().getVectorSize(this->type_, this->sectionname_, this->varname_);
+            for (unsigned int i = 0; i < vectorSize; i++)
             {
                 if (i < this->defvalueStringVector_.size())

code/branches/presentation/src/core/ConfigValueContainer.h

@@ -109 +109 @@
             {
                 this->init(type, identifier, sectionname, varname);
-                this->initValue((V)defvalue);
+                this->initValue(static_cast<V>(defvalue));
             }
 
@@ -217 +217 @@
             inline const std::string& getName() const
                 { return this->varname_; }
+            /** @brief Retuns the name of the section this config value is in. */
+            inline const std::string& getSectionName() const
+                { return this->sectionname_; }
             /** @brief Returns true if this config-value is a vector */
             inline bool isVector() const

code/branches/presentation/src/core/input/Button.cc

@@ -63 +63 @@
     }
 
+    Button::~Button()
+    {
+        this->clear();
+
+        if (this->configContainer_)
+            delete this->configContainer_;
+    }
+
     void Button::clear()
     {
@@ -81 +89 @@
             }
         }
-
-        if (this->configContainer_)
-            delete this->configContainer_;
-        this->configContainer_ = 0;
     }
 

code/branches/presentation/src/core/input/Button.h

@@ -49 +49 @@
     public:
         Button();
-        virtual ~Button() { clear(); }
+        virtual ~Button();
         virtual void clear();
         virtual bool addParamCommand(ParamCommand* command) { return false; }

code/branches/presentation/src/core/input/InputInterfaces.h

@@ -378 +378 @@
         const char* const ByString[] =
         {
-            "Button0",       "Button1",       "Button2",       "Button3",
-            "Button4",       "Button5",       "Button6",       "Button7",
-            "Button8",       "Button9",       "Button10",      "Button11",
+            "Button00",      "Button01",      "Button02",      "Button03",
+            "Button04",      "Button05",      "Button06",      "Button07",
+            "Button08",      "Button09",      "Button10",      "Button11",
             "Button12",      "Button13",      "Button14",      "Button15",
             "Button16",      "Button17",      "Button18",      "Button19",
@@ -416 +416 @@
             "Slider0", "Slider1", "Slider2", "Slider3",
             "Slider4", "Slider5", "Slider6", "Slider7",
-            "Axis0",   "Axis1",   "Axis2",   "Axis3",
-            "Axis4",   "Axis5",   "Axis6",   "Axis7",
-            "Axis8",   "Axis9",   "Axis10",  "Axis11",
+            "Axis00",  "Axis01",  "Axis02",  "Axis03",
+            "Axis04",  "Axis05",  "Axis06",  "Axis07",
+            "Axis08",  "Axis09",  "Axis10",  "Axis11",
             "Axis12",  "Axis13",  "Axis14",  "Axis15"
         };

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

@@ -65 +65 @@
     SetCommandLineSwitch(keyboard_no_grab);
 
-    std::string InputManager::bindingCommmandString_s = "";
     EmptyHandler InputManager::EMPTY_HANDLER;
     InputManager* InputManager::singletonRef_s = 0;
@@ -174 +173 @@
             if (joyStickSupport)
                 _initialiseJoySticks();
-            // Do this anyway to also inform everyone if a joystick was detached.
+            // Do this anyway to also inform everything when a joystick was detached.
             _configureNumberOfJoySticks();
 
@@ -492 +491 @@
             }
         }
-        singletonRef_s = 0;
+
+        singletonRef_s = 0;
     }
 
@@ -660 +660 @@
     /**
     @brief
-        Updates the InputManager. Tick is called by the Core class.
+        Updates the states and the InputState situation.
     @param dt
         Delta time
@@ -676 +676 @@
 
         // check for states to leave
-        for (std::set<InputState*>::reverse_iterator rit = stateLeaveRequests_.rbegin();
-            rit != stateLeaveRequests_.rend(); ++rit)
-        {
-            (*rit)->onLeave();
-            // just to be sure that the state actually is registered
-            assert(inputStatesByName_.find((*rit)->getName()) != inputStatesByName_.end());
-
-            activeStates_.erase((*rit)->getPriority());
-            _updateActiveStates();
-        }
-        stateLeaveRequests_.clear();
+        if (!stateLeaveRequests_.empty())
+        {
+            for (std::set<InputState*>::reverse_iterator rit = stateLeaveRequests_.rbegin();
+                rit != stateLeaveRequests_.rend(); ++rit)
+            {
+                (*rit)->onLeave();
+                // just to be sure that the state actually is registered
+                assert(inputStatesByName_.find((*rit)->getName()) != inputStatesByName_.end());
+
+                activeStates_.erase((*rit)->getPriority());
+                _updateActiveStates();
+            }
+            stateLeaveRequests_.clear();
+        }
 
         // check for states to enter
-        for (std::set<InputState*>::reverse_iterator rit = stateEnterRequests_.rbegin();
-            rit != stateEnterRequests_.rend(); ++rit)
-        {
-            // just to be sure that the state actually is registered
-            assert(inputStatesByName_.find((*rit)->getName()) != inputStatesByName_.end());
-
-            activeStates_[(*rit)->getPriority()] = (*rit);
-            _updateActiveStates();
-            (*rit)->onEnter();
-        }
-        stateEnterRequests_.clear();
+        if (!stateEnterRequests_.empty())
+        {
+            for (std::set<InputState*>::reverse_iterator rit = stateEnterRequests_.rbegin();
+                rit != stateEnterRequests_.rend(); ++rit)
+            {
+                // just to be sure that the state actually is registered
+                assert(inputStatesByName_.find((*rit)->getName()) != inputStatesByName_.end());
+
+                activeStates_[(*rit)->getPriority()] = (*rit);
+                _updateActiveStates();
+                (*rit)->onEnter();
+            }
+            stateEnterRequests_.clear();
+        }
 
         // check for states to destroy
-        for (std::set<InputState*>::reverse_iterator rit = stateDestroyRequests_.rbegin();
-            rit != stateDestroyRequests_.rend(); ++rit)
-        {
-            _destroyState((*rit));
-        }
-        stateDestroyRequests_.clear();
+        if (!stateDestroyRequests_.empty())
+        {
+            for (std::set<InputState*>::reverse_iterator rit = stateDestroyRequests_.rbegin();
+                rit != stateDestroyRequests_.rend(); ++rit)
+            {
+                _destroyState((*rit));
+            }
+            stateDestroyRequests_.clear();
+        }
 
         // check whether a state has changed its EMPTY_HANDLER situation
@@ -1124 +1133 @@
 
         // keep in mind that the first 8 axes are reserved for the sliders
-        _fireAxis(iJoyStick, axis + 8, arg.state.mAxes[axis].abs);
+        _fireAxis(iJoyStick, axis + sliderAxes, arg.state.mAxes[axis].abs);
 
         return true;

code/branches/presentation/src/core/input/InputManager.h

@@ -136 +136 @@
     public: // variables
         static EmptyHandler                 EMPTY_HANDLER;
+        static const unsigned int           sliderAxes = 8;
 
     private: // functions
@@ -192 +193 @@
         SimpleInputState*                   stateEmpty_;
         ExtendedInputState*                 stateMaster_;          //!< Always active master input state
-        KeyDetector*                        keyDetector_;        //!< KeyDetector instance
+        KeyDetector*                        keyDetector_;          //!< KeyDetector instance
         InputBuffer*                        calibratorCallbackBuffer_;
 
@@ -223 +224 @@
         std::vector<std::vector<JoyStickButtonCode::ByEnum> >  joyStickButtonsDown_;
 
-        static std::string                  bindingCommmandString_s;
+
         static InputManager*                singletonRef_s;
     };

code/branches/presentation/src/core/input/KeyBinder.cc

@@ -33 +33 @@
 
 #include "KeyBinder.h"
+
 #include <fstream>
 #include <string>
+
 #include "util/Convert.h"
 #include "util/Debug.h"
@@ -66 +68 @@
             std::string keyname = KeyCode::ByString[i];
             if (!keyname.empty())
-            {
                 keys_[i].name_ = std::string("Key") + keyname;
-            }
             else
-            {
-                // some keys have name "" because the code is not occupied by OIS
-                // Use "Key_" plus the number as name to put it at the end of the config file section
-                std::string number = convertToString(i);
-                if (i < 100)
-                    number.insert(0, "0");
-                keys_[i].name_ = std::string("Key_") + number;
-            }
+                keys_[i].name_ = "";
             keys_[i].paramCommandBuffer_ = &paramCommandBuffer_;
             keys_[i].groupName_ = "Keys";
@@ -97 +90 @@
         for (unsigned int i = 0; i < MouseAxisCode::numberOfAxes * 2; i++)
         {
-            mouseAxes_[i].name_ = std::string("Mouse") + MouseAxisCode::ByString[i >> 1];
+            mouseAxes_[i].name_ = std::string("Mouse") + MouseAxisCode::ByString[i / 2];
             if (i & 1)
                 mouseAxes_[i].name_ += "Pos";
@@ -224 +217 @@
         allHalfAxes_.clear();
 
+        // Note: Don't include the dummy keys which don't actually exist in OIS but have a number
         for (unsigned int i = 0; i < KeyCode::numberOfKeys; i++)
-            allButtons_[keys_[i].name_] = keys_ + i;
+            if (!keys_[i].name_.empty())
+                allButtons_[keys_[i].name_] = keys_ + i;
         for (unsigned int i = 0; i < numberOfMouseButtons_; i++)
             allButtons_[mouseButtons_[i].name_] = mouseButtons_ + i;
@@ -327 +322 @@
         if (bDeriveMouseInput_)
         {
-            // only update when derive dt has passed
+            // only update when derivation dt has passed
             if (deriveTime_ > derivePeriod_)
             {
                 for (int i = 0; i < 2; i++)
                 {
-                    if (mouseRelative_[i] > 0)
+                    if (mouseRelative_[i] < 0)
                     {
                         mouseAxes_[2*i + 0].absVal_
-                            =  mouseRelative_[i] / deriveTime_ * 0.0005 * mouseSensitivityDerived_;
+                            = -mouseRelative_[i] / deriveTime_ * 0.0005 * mouseSensitivityDerived_;
                         mouseAxes_[2*i + 1].absVal_ = 0.0f;
                     }
-                    else if (mouseRelative_[i] < 0)
+                    else if (mouseRelative_[i] > 0)
                     {
                         mouseAxes_[2*i + 0].absVal_ = 0.0f;
                         mouseAxes_[2*i + 1].absVal_
-                            = -mouseRelative_[i] / deriveTime_ * 0.0005 * mouseSensitivityDerived_;
+                            =  mouseRelative_[i] / deriveTime_ * 0.0005 * mouseSensitivityDerived_;
                     }
                     else
@@ -363 +358 @@
             // Why dividing relative value by dt? The reason lies in the simple fact, that when you
             // press a button that has relative movement, that value has to be multiplied by dt to be
-            // frame rate independant. This can easily (and only) be done in tickInput(float).
+            // frame rate independent. This can easily (and only) be done in tickInput(float).
             // Hence we need to divide by dt here for the mouse to compensate, because the relative
             // move movements have nothing to do with dt.
@@ -441 +436 @@
             for (int i = 0; i < 2; i++)
             {
-                if (rel[i]) // performance opt. if rel[i] == 0
+                if (rel[i]) // performance opt. for the case that rel[i] == 0
                 {
                     // write absolute values
@@ -454 +449 @@
                         mousePosition_[i] = -mouseClippingSize_;
 
-                    if (mousePosition_[i] >= 0)
+                    if (mousePosition_[i] < 0)
                     {
-                        mouseAxes_[2*i + 0].absVal_ =   mousePosition_[i]/(float)mouseClippingSize_ * mouseSensitivity_;
+                        mouseAxes_[2*i + 0].absVal_ =  -mousePosition_[i]/(float)mouseClippingSize_ * mouseSensitivity_;
                         mouseAxes_[2*i + 1].absVal_ =  0.0f;
                     }
@@ -462 +457 @@
                     {
                         mouseAxes_[2*i + 0].absVal_ =  0.0f;
-                        mouseAxes_[2*i + 1].absVal_ =  -mousePosition_[i]/(float)mouseClippingSize_ * mouseSensitivity_;
+                        mouseAxes_[2*i + 1].absVal_ =   mousePosition_[i]/(float)mouseClippingSize_ * mouseSensitivity_;
                     }
                 }
@@ -471 +466 @@
         for (int i = 0; i < 2; i++)
         {
-            if (rel[i] > 0)
-                mouseAxes_[0 + 2*i].relVal_ =  ((float)rel[i])/(float)mouseClippingSize_ * mouseSensitivity_;
+            if (rel[i] < 0)
+                mouseAxes_[0 + 2*i].relVal_ = -((float)rel[i])/(float)mouseClippingSize_ * mouseSensitivity_;
             else
-                mouseAxes_[1 + 2*i].relVal_ = -((float)rel[i])/(float)mouseClippingSize_ * mouseSensitivity_;
+                mouseAxes_[1 + 2*i].relVal_ =  ((float)rel[i])/(float)mouseClippingSize_ * mouseSensitivity_;
         }
     }
@@ -484 +479 @@
     void KeyBinder::mouseScrolled(int abs, int rel)
     {
-        if (rel > 0)
-            for (int i = 0; i < rel/mouseWheelStepSize_; i++)
+        if (rel < 0)
+            for (int i = 0; i < -rel/mouseWheelStepSize_; i++)
                 mouseButtons_[8].execute(KeybindMode::OnPress, ((float)abs)/mouseWheelStepSize_);
         else
-            for (int i = 0; i < -rel/mouseWheelStepSize_; i++)
+            for (int i = 0; i < rel/mouseWheelStepSize_; i++)
                 mouseButtons_[9].execute(KeybindMode::OnPress, ((float)abs)/mouseWheelStepSize_);
     }
@@ -495 +490 @@
     {
         int i = axis * 2;
-        if (value >= 0)
-        {
-            joyStickAxes_[joyStickID][i].absVal_ = value;
-            joyStickAxes_[joyStickID][i].relVal_ = value;
+        if (value < 0)
+        {
+            joyStickAxes_[joyStickID][i].absVal_ = -value;
+            joyStickAxes_[joyStickID][i].relVal_ = -value;
             joyStickAxes_[joyStickID][i].hasChanged_ = true;
             if (joyStickAxes_[joyStickID][i + 1].absVal_ > 0.0f)
@@ -509 +504 @@
         else
         {
-            joyStickAxes_[joyStickID][i + 1].absVal_ = -value;
-            joyStickAxes_[joyStickID][i + 1].relVal_ = -value;
+            joyStickAxes_[joyStickID][i + 1].absVal_ = value;
+            joyStickAxes_[joyStickID][i + 1].relVal_ = value;
             joyStickAxes_[joyStickID][i + 1].hasChanged_ = true;
             if (joyStickAxes_[joyStickID][i].absVal_ > 0.0f)

code/branches/presentation/src/core/input/KeyBinder.h

@@ -39 +39 @@
 
 #include <vector>
+#include <cassert>
+
 #include "InputInterfaces.h"
 #include "Button.h"
@@ -44 +46 @@
 #include "InputCommands.h"
 #include "JoyStickDeviceNumberListener.h"
-#include "core/ConfigFileManager.h"
 
 namespace orxonox
@@ -171 +172 @@
 
     inline void KeyBinder::keyPressed (const KeyEvent& evt)
-    { keys_[evt.key].execute(KeybindMode::OnPress); }
+    { assert(!keys_[evt.key].name_.empty()); keys_[evt.key].execute(KeybindMode::OnPress); }
 
     inline void KeyBinder::keyReleased(const KeyEvent& evt)
-    { keys_[evt.key].execute(KeybindMode::OnRelease); }
+    { assert(!keys_[evt.key].name_.empty()); keys_[evt.key].execute(KeybindMode::OnRelease); }
 
     inline void KeyBinder::keyHeld    (const KeyEvent& evt)
-    { keys_[evt.key].execute(KeybindMode::OnHold); }
+    { assert(!keys_[evt.key].name_.empty()); keys_[evt.key].execute(KeybindMode::OnHold); }