Changeset 2101 for code/branches/objecthierarchy/src/core/input/InputManager.cc

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/InputManager.cc (modified) (3 diffs)

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

@@ -395 +395 @@
             if (!cont)
             {
-                cont = new ConfigValueContainer(CFT_Settings, getIdentifier(), getIdentifier()->getName(), "CoeffPos", coeffPos);
+                cont = new ConfigValueContainer(ConfigFileType::Settings, getIdentifier(), getIdentifier()->getName(), "CoeffPos", coeffPos);
                 getIdentifier()->addConfigValueContainer("CoeffPos", cont);
             }
@@ -403 +403 @@
             if (!cont)
             {
-                cont = new ConfigValueContainer(CFT_Settings, getIdentifier(), getIdentifier()->getName(), "CoeffNeg", coeffNeg);
+                cont = new ConfigValueContainer(ConfigFileType::Settings, getIdentifier(), getIdentifier()->getName(), "CoeffNeg", coeffNeg);
                 getIdentifier()->addConfigValueContainer("CoeffNeg", cont);
             }
@@ -411 +411 @@
             if (!cont)
             {
-                cont = new ConfigValueContainer(CFT_Settings, getIdentifier(), getIdentifier()->getName(), "Zero", zero);
+                cont = new ConfigValueContainer(ConfigFileType::Settings, getIdentifier(), getIdentifier()->getName(), "Zero", zero);
                 getIdentifier()->addConfigValueContainer("Zero", cont);
             }