Changeset 2101 for code/branches/objecthierarchy/src/core/input/KeyBinder.h

Timestamp:

Nov 2, 2008, 12:09:55 AM (16 years ago)

Author:

rgrieder

Message:

Finally managed to have a master InputState which enables:

• Console always opens
• Debug overlay toggles visibility in gui mode too

Had to change several other code:

• ConfigFileManager uses special class instead of enum for ConfigFileType
• You can add an arbitrary config file and get the ConfigFileType
• ConfigFileManager is an Ogre singleton too. Created in Main.cc
• CommandLineArgument "optionsFile" specifies another file for command line arguments
• CommandLineArgument "settingsFile" declares the file used for settings (orxonox.ini)
• changed all fileNames to filenames
• "Loaded config file blah" now uses COUT(3) instead of COUT(0)
• fixed a bug in ConfigFileManager::load() that cause orxonox.ini to double its size after every call

File:

• code/branches/objecthierarchy/src/core/input/KeyBinder.h (modified) (3 diffs)

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

@@ -44 +44 @@
 #include "InputCommands.h"
 #include "JoyStickDeviceNumberListener.h"
+#include "core/ConfigFileManager.h"
 
 namespace orxonox
@@ -59 +60 @@
         virtual ~KeyBinder();
 
-        void loadBindings(const std::string& filename);
+        void loadBindings(const std::string& filename, const std::string& defaultFilename);
         void clearBindings();
         bool setBinding(const std::string& binding, const std::string& name, bool bTemporary = false);
@@ -142 +143 @@
         float deriveTime_;
 
-        //! Config file used. "" in case of KeyDetector. Also indicates whether we've already loaded.
-        std::string configFile_;
+        //! Config file used. ConfigFileType::NoType in case of KeyDetector. Also indicates whether we've already loaded.
+        ConfigFileType configFile_;
 
     private:
         //##### ConfigValues #####
-        //! Filename of default keybindings.
-        std::string defaultKeybindings_;
         //! Whether to filter small value analog input
         bool bFilterAnalogNoise_;