Changeset 6432 for code/branches/gamestate/src/libraries/core/input

Timestamp:

Dec 29, 2009, 10:30:19 PM (15 years ago)

Author:

rgrieder

Message:

Changed the way config values associated with general settings (ConfigFileType::Settings) are handled:

• ConfigFileManager only handles config files listed in the ConfigFileType enum (normal enum again)
• ConfigFileManager only takes care of ConfigFiles and returns a pointer to the right one, just two functions left. —> use like: ConfigFileManager::getInstance().getConfigFile(myType)→doSomething();
• Moved all code (except for the argument completion functions) relating to ConfigFileType::Settings to a new class: SettingsConfigFile, which is a Singleton (it doesn't make sense to have multiple instances unless you start coding a lot more)
• SettingsConfigFile handles config value containers according to their section and entry in the ini file, not according to class and variables names. (In most cases it will be class and variable names though)
• SettingsConfigFile supports:
  • clear() (removes any file entries not associated to a config value container)
  • updateConfigValues() (does exactly that through the identifier)
  • config, tconfig and getConfig
  • commands listed above are exported to tolua, and tconfig, config and getConfig were given shortcuts in Lua (e.g. orxonox.config)
• If you need to organise ConfigFiles yourself, just do it without the ConfigFileManager, like the KeyBinder does.
• All getValue() functions have been split into getOrCreateValue() and getValue(), which is const
• Removed obsolete config value management code in the Identifier (it still stores and destroys them and provides access to them)

All of that leads to one HUGE advantage:
"config OutputHandler softDebugLevelInGameConsole"
works now (any further implications are up to the reader…)
(it didn't work before because the actual config value container is in the InGameConsole singleton)

Location:

code/branches/gamestate/src/libraries/core/input

Files:

• Button.cc (modified) (2 diffs)
• Button.h (modified) (2 diffs)
• JoyStick.cc (modified) (3 diffs)
• KeyBinder.cc (modified) (4 diffs)
• KeyBinder.h (modified) (2 diffs)

code/branches/gamestate/src/libraries/core/input/Button.cc

@@ -42 +42 @@
 #include "core/CommandEvaluation.h"
 #include "core/CommandExecutor.h"
+#include "core/ConfigFileManager.h"
 
 namespace orxonox
@@ -81 +82 @@
     }
 
-    void Button::readBinding(ConfigFileType type)
-    {
-        const std::string& binding = ConfigFileManager::getInstance().getValue(type, groupName_, name_, "", true);
+    void Button::readBinding(ConfigFile* configFile)
+    {
+        const std::string& binding = configFile->getOrCreateValue(groupName_, name_, "", true);
         this->parse(binding);
     }
 
-    void Button::setBinding(ConfigFileType type, const std::string& binding, bool bTemporary)
+    void Button::setBinding(ConfigFile* configFile, const std::string& binding, bool bTemporary)
     {
         if (!bTemporary)
-            ConfigFileManager::getInstance().setValue(type, groupName_, name_, binding, true);
+            configFile->setValue(groupName_, name_, binding, true);
         this->parse(binding);
     }

code/branches/gamestate/src/libraries/core/input/Button.h

@@ -41 +41 @@
 #include <vector>
 #include "InputCommands.h"
-#include "core/ConfigFileManager.h"
 
 namespace orxonox
@@ -53 +52 @@
         virtual bool addParamCommand(ParamCommand* command) { return false; }
         void parse(const std::string& binding);
-        void readBinding(ConfigFileType type);
-        void setBinding(ConfigFileType type, const std::string& binding, bool bTemporary);
+        void readBinding(ConfigFile* configFile);
+        void setBinding(ConfigFile* configFile, const std::string& binding, bool bTemporary);
         bool execute(KeybindMode::Value mode, float abs = 1.0f, float rel = 1.0f);
 

code/branches/gamestate/src/libraries/core/input/JoyStick.cc

@@ -106 +106 @@
     {
         list.resize(size);
-        unsigned int configValueVectorSize = ConfigFileManager::getInstance().getVectorSize(ConfigFileType::JoyStickCalibration, sectionName, valueName);
+        unsigned int configValueVectorSize = ConfigFileManager::getInstance().getConfigFile(ConfigFileType::JoyStickCalibration)->getVectorSize(sectionName, valueName);
         if (configValueVectorSize > size)
             configValueVectorSize = size;
@@ -112 +112 @@
         for (unsigned int i = 0; i < configValueVectorSize; ++i)
         {
-            list[i] = multi_cast<int>(ConfigFileManager::getInstance().getValue(
-                ConfigFileType::JoyStickCalibration, sectionName, valueName, i, multi_cast<std::string>(defaultValue), false));
+            list[i] = multi_cast<int>(ConfigFileManager::getInstance().getConfigFile(ConfigFileType::JoyStickCalibration)
+                ->getOrCreateValue(sectionName, valueName, i, multi_cast<std::string>(defaultValue), false));
         }
 
@@ -153 +153 @@
             if (configMinValues_[i] == INT_MAX)
                 configMinValues_[i] = -32768;
-            ConfigFileManager::getInstance().setValue(ConfigFileType::JoyStickCalibration,
-                deviceName_, "MinValue", i, multi_cast<std::string>(configMinValues_[i]), false);
+            ConfigFileManager::getInstance().getConfigFile(ConfigFileType::JoyStickCalibration)
+                ->getOrCreateValue(deviceName_, "MinValue", i, multi_cast<std::string>(configMinValues_[i]), false);
 
             // Maximum values
             if (configMaxValues_[i] == INT_MIN)
                 configMaxValues_[i] = 32767;
-            ConfigFileManager::getInstance().setValue(ConfigFileType::JoyStickCalibration,
-                deviceName_, "MaxValue", i, multi_cast<std::string>(configMaxValues_[i]), false);
+            ConfigFileManager::getInstance().getConfigFile(ConfigFileType::JoyStickCalibration)
+                ->getOrCreateValue(deviceName_, "MaxValue", i, multi_cast<std::string>(configMaxValues_[i]), false);
 
             // Middle values
-            ConfigFileManager::getInstance().setValue(ConfigFileType::JoyStickCalibration,
-                deviceName_, "ZeroValue", i, multi_cast<std::string>(configZeroValues_[i]), false);
+            ConfigFileManager::getInstance().getConfigFile(ConfigFileType::JoyStickCalibration)
+                ->getOrCreateValue(deviceName_, "ZeroValue", i, multi_cast<std::string>(configZeroValues_[i]), false);
         }
 

code/branches/gamestate/src/libraries/core/input/KeyBinder.cc

@@ -49 +49 @@
         : deriveTime_(0.0f)
         , filename_(filename)
+        , configFile_(NULL)
     {
         mouseRelative_[0] = 0;
@@ -93 +94 @@
             mouseAxes_[i].groupName_ = "MouseAxes";
         }
-
-        // We might not even load any bindings at all (KeyDetector for instance)
-        this->configFile_ = ConfigFileType::NoType;
 
         // initialise joy sticks separatly to allow for reloading
@@ -163 +161 @@
 
         // load the bindings if required
-        if (configFile_ != ConfigFileType::NoType)
+        if (configFile_ != NULL)
         {
             for (unsigned int iDev = oldValue; iDev < joySticks_.size(); ++iDev)
@@ -249 +247 @@
         COUT(3) << "KeyBinder: Loading key bindings..." << std::endl;
 
-        // Get a new ConfigFileType from the ConfigFileManager
-        this->configFile_ = ConfigFileManager::getInstance().getNewConfigFileType();
-
-        ConfigFileManager::getInstance().setFilename(this->configFile_, this->filename_);
+        this->configFile_ = new ConfigFile(this->filename_);
+        this->configFile_->load();
 
         // Parse bindings and create the ConfigValueContainers if necessary

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

@@ -38 +38 @@
 #include <boost/shared_ptr.hpp>
 
-#include "core/ConfigFileManager.h"
 #include "InputHandler.h"
 #include "Button.h"
@@ -157 +156 @@
         //! Name of the file used in this KeyBinder (constant!)
         const std::string filename_;
-        //! Config file used. ConfigFileType::NoType in case of KeyDetector. Also indicates whether we've already loaded.
-        ConfigFileType configFile_;
+        //! Config file used. NULL in case of KeyDetector. Also indicates whether we've already loaded.
+        ConfigFile* configFile_;
 
     private: