Changeset 6536 for code/trunk/src/libraries/core/input

Timestamp:

Mar 16, 2010, 11:22:36 AM (15 years ago)

Author:

rgrieder

Message:

Merged revisions 6430-6440 from the gamestate branch to the trunk.
This adds keybindings merging functionality.

(from log of r6437)
When running development builds, the keybinder will merge the local file and the one from the data folder.
Catch: if you want to remove a binding, you'll have to write "NoBinding" (not case sensitive) to override the default command

The keybind command already does that for you though.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/core/input/Button.cc (modified) (3 diffs)
• src/libraries/core/input/Button.h (modified) (2 diffs)
• src/libraries/core/input/JoyStick.cc (modified) (3 diffs)
• src/libraries/core/input/KeyBinder.cc (modified) (7 diffs)
• src/libraries/core/input/KeyBinder.h (modified) (2 diffs)

code/trunk/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, ConfigFile* fallbackFile)
+    {
+        std::string binding = configFile->getOrCreateValue(groupName_, name_, "", true);
+        if (binding.empty() && fallbackFile)
+            binding = fallbackFile->getValue(groupName_, name_, true);
         this->parse(binding);
     }
 
-    void Button::setBinding(ConfigFileType type, const std::string& binding, bool bTemporary)
+    void Button::setBinding(ConfigFile* configFile, ConfigFile* fallbackFile, 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);
     }
@@ -103 +106 @@
         this->bindingString_ = binding;
 
-        if (isEmpty(bindingString_))
+        if (isEmpty(bindingString_) || removeTrailingWhitespaces(getLowercase(binding)) == "nobinding")
             return;
 

code/trunk/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, ConfigFile* fallbackFile);
+        void setBinding(ConfigFile* configFile, ConfigFile* fallbackFile, const std::string& binding, bool bTemporary);
         bool execute(KeybindMode::Value mode, float abs = 1.0f, float rel = 1.0f);
 

code/trunk/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/trunk/src/libraries/core/input/KeyBinder.cc

@@ -37 +37 @@
 #include "core/CoreIncludes.h"
 #include "core/ConfigFileManager.h"
+#include "core/PathConfig.h"
 #include "InputCommands.h"
 #include "JoyStick.h"
@@ -49 +50 @@
         : deriveTime_(0.0f)
         , filename_(filename)
+        , configFile_(NULL)
+        , fallbackConfigFile_(NULL)
     {
         mouseRelative_[0] = 0;
@@ -94 +97 @@
         }
 
-        // We might not even load any bindings at all (KeyDetector for instance)
-        this->configFile_ = ConfigFileType::NoType;
-
         // initialise joy sticks separatly to allow for reloading
         this->JoyStickQuantityChanged(this->getJoyStickList());
@@ -116 +116 @@
         // almost no destructors required because most of the arrays are static.
         clearBindings(); // does some destruction work
+        if (this->configFile_)
+            delete this->configFile_;
+        if (this->fallbackConfigFile_)
+            delete this->fallbackConfigFile_;
     }
 
@@ -163 +167 @@
 
         // load the bindings if required
-        if (configFile_ != ConfigFileType::NoType)
+        if (configFile_ != NULL)
         {
             for (unsigned int iDev = oldValue; iDev < joySticks_.size(); ++iDev)
             {
                 for (unsigned int i = 0; i < JoyStickButtonCode::numberOfButtons; ++i)
-                    (*joyStickButtons_[iDev])[i].readBinding(this->configFile_);
+                    (*joyStickButtons_[iDev])[i].readBinding(this->configFile_, this->fallbackConfigFile_);
                 for (unsigned int i = 0; i < JoyStickAxisCode::numberOfAxes * 2; ++i)
-                    (*joyStickAxes_[iDev])[i].readBinding(this->configFile_);
+                    (*joyStickAxes_[iDev])[i].readBinding(this->configFile_, this->fallbackConfigFile_);
             }
         }
@@ -249 +253 @@
         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_, !PathConfig::isDevelopmentRun());
+        this->configFile_->load();
+
+        if (PathConfig::isDevelopmentRun())
+        {
+            // Dev users should have combined key bindings files
+            std::string defaultFilepath(PathConfig::getDataPathString() + ConfigFile::DEFAULT_CONFIG_FOLDER + '/' + this->filename_);
+            std::ifstream file(defaultFilepath.c_str());
+            if (file.is_open())
+            {
+                file.close();
+                // Open the default file for later use (use absolute path!)
+                this->fallbackConfigFile_ = new ConfigFile(defaultFilepath, false);
+                this->fallbackConfigFile_->load();
+            }
+        }
 
         // Parse bindings and create the ConfigValueContainers if necessary
         for (std::map<std::string, Button*>::const_iterator it = allButtons_.begin(); it != allButtons_.end(); ++it)
         {
-            it->second->readBinding(this->configFile_);
+            it->second->readBinding(this->configFile_, this->fallbackConfigFile_);
             addButtonToCommand(it->second->bindingString_, it->second);
         }
@@ -270 +286 @@
         {
             addButtonToCommand(binding, it->second);
-            it->second->setBinding(this->configFile_, binding, bTemporary);
+            std::string str = binding;
+            if (PathConfig::isDevelopmentRun() && binding.empty())
+                str = "NoBinding";
+            it->second->setBinding(this->configFile_, this->fallbackConfigFile_, binding, bTemporary);
             return true;
         }

code/trunk/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_;
+        //! Config file from the data directory that only serves as fallback
+        ConfigFile* fallbackConfigFile_;
 
     private: