Changeset 6214 for code/branches/presentation2/src/libraries/core/input/KeyBinder.h

Timestamp:

Dec 2, 2009, 8:41:44 PM (14 years ago)

Author:

scheusso

Message:

a small fix in IOConsole
some changes in GUI-system and preparation for keybindings menu
fix in menu handling

File:

• code/branches/presentation2/src/libraries/core/input/KeyBinder.h (modified) (6 diffs)

code/branches/presentation2/src/libraries/core/input/KeyBinder.h

@@ -43 +43 @@
 #include "JoyStickQuantityListener.h"
 
+// tolua_begin
 namespace orxonox
 {
+    // tolua_end
     /**
     @brief
@@ -54 +56 @@
         KeyBinders. If you need to load other bindings, just create a new one.
     */
-    class _CoreExport KeyBinder : public InputHandler, public JoyStickQuantityListener
-    {
+    class _CoreExport KeyBinder // tolua_export
+        : public InputHandler, public JoyStickQuantityListener
+    { // tolua_export
     public:
         KeyBinder (const std::string& filename);
@@ -62 +65 @@
         void clearBindings();
         bool setBinding(const std::string& binding, const std::string& name, bool bTemporary = false);
+        std::string getBinding(std::string commandName); //tolua_export
         const std::string& getBindingsFilename()
             { return this->filename_; }
@@ -130 +134 @@
         //! Pointer list with all half axes
         std::vector<HalfAxis*> allHalfAxes_;
+        //! Maps input commands to all Button names, including half axes
+        std::map<std::string, std::string> allCommands_;
 
         /**
@@ -174 +180 @@
         // Use some value at about 1000. This can be configured with mouseSensitivity_ anyway.
         static const int mouseClippingSize_ = 1024;
-    };
+    };// tolua_export
 
 
@@ -219 +225 @@
             mouseAxes_[i].relVal_ = 0.0f;
     }
-}
+}// tolua_export
 
 #endif /* _KeyBinder_H__ */