Changeset 1887 for code/trunk/src/orxonox/gui

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

Location:

code/trunk/src/orxonox/gui

Files:

• GUIManager.cc (modified) (3 diffs)
• GUIManager.h (modified) (2 diffs)

code/trunk/src/orxonox/gui/GUIManager.cc

@@ -279 +279 @@
     }
 
-    void GUIManager::mouseButtonPressed(MouseButton::Enum id)
+    void GUIManager::mouseButtonPressed(MouseButtonCode::ByEnum id)
     {
         try
@@ -292 +292 @@
     }
 
-    void GUIManager::mouseButtonReleased(MouseButton::Enum id)
+    void GUIManager::mouseButtonReleased(MouseButtonCode::ByEnum id)
     {
         try
@@ -306 +306 @@
 
 
-    inline CEGUI::MouseButton GUIManager::convertButton(MouseButton::Enum button)
+    inline CEGUI::MouseButton GUIManager::convertButton(MouseButtonCode::ByEnum button)
     {
         switch (button)
         {
-        case MouseButton::Left:
+        case MouseButtonCode::Left:
             return CEGUI::LeftButton;
 
-        case MouseButton::Right:
+        case MouseButtonCode::Right:
             return CEGUI::RightButton;
 
-        case MouseButton::Middle:
+        case MouseButtonCode::Middle:
             return CEGUI::MiddleButton;
 
-        case MouseButton::Button3:
+        case MouseButtonCode::Button3:
             return CEGUI::X1Button;
 
-        case MouseButton::Button4:
+        case MouseButtonCode::Button4:
             return CEGUI::X2Button;
 

code/trunk/src/orxonox/gui/GUIManager.h

@@ -93 +93 @@
         { }
 
-        void mouseButtonPressed (MouseButton::Enum id);
-        void mouseButtonReleased(MouseButton::Enum id);
-        void mouseButtonHeld    (MouseButton::Enum id)
+        void mouseButtonPressed (MouseButtonCode::ByEnum id);
+        void mouseButtonReleased(MouseButtonCode::ByEnum id);
+        void mouseButtonHeld    (MouseButtonCode::ByEnum id)
         { }
         void mouseMoved         (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize)
@@ -123 +123 @@
         State state_;
 
-        static CEGUI::MouseButton convertButton(MouseButton::Enum button);
+        static CEGUI::MouseButton convertButton(MouseButtonCode::ByEnum button);
 
         static GUIManager*        singletonRef_s;