Changeset 6428 for code/trunk

Timestamp:

Dec 28, 2009, 11:10:37 PM (15 years ago)

Author:

rgrieder

Message:

Changed config value handling in the KeyBinder. Doesn't change the interface though.

Location:

code/trunk/src/libraries/core/input

Files:

• Button.cc (modified) (4 diffs)
• Button.h (modified) (1 diff)
• KeyBinder.cc (modified) (4 diffs)
• KeyBinder.h (modified) (1 diff)
• KeyDetector.cc (modified) (1 diff)

code/trunk/src/libraries/core/input/Button.cc

@@ -42 +42 @@
 #include "core/CommandEvaluation.h"
 #include "core/CommandExecutor.h"
-#include "core/ConfigValueContainer.h"
 
 namespace orxonox
@@ -52 +51 @@
     */
     Button::Button()
-        : configContainer_(0)
-        , bButtonThresholdUser_(false)
+        : bButtonThresholdUser_(false)
         , paramCommandBuffer_(0)
     {
@@ -64 +62 @@
     {
         this->clear();
-
-        if (this->configContainer_)
-            delete this->configContainer_;
     }
 
@@ -83 +78 @@
             }
         }
-    }
-
-    void Button::readConfigValue(ConfigFileType configFile)
-    {
-        // create/get ConfigValueContainer
-        if (!configContainer_)
-        {
-            configContainer_ = new ConfigValueContainer(configFile, 0, groupName_, name_, "", name_);
-            configContainer_->callback(this, &Button::parse);
-        }
-        configContainer_->getValue(&bindingString_, this);
-    }
-
-    void Button::parse()
-    {
+        this->bindingString_.clear();
+    }
+
+    void Button::readBinding(ConfigFileType type)
+    {
+        const std::string& binding = ConfigFileManager::getInstance().getValue(type, groupName_, name_, "", true);
+        this->parse(binding);
+    }
+
+    void Button::setBinding(ConfigFileType type, const std::string& binding, bool bTemporary)
+    {
+        if (!bTemporary)
+            ConfigFileManager::getInstance().setValue(type, groupName_, name_, binding, true);
+        this->parse(binding);
+    }
+
+    void Button::parse(const std::string& binding)
+    {
+        if (binding == this->bindingString_)
+            return;
+
         // delete all commands
         clear();
+        this->bindingString_ = binding;
 
         if (isEmpty(bindingString_))

code/trunk/src/libraries/core/input/Button.h

@@ -52 +52 @@
         virtual void clear();
         virtual bool addParamCommand(ParamCommand* command) { return false; }
-        void parse();
-        void readConfigValue(ConfigFileType configFile);
+        void parse(const std::string& binding);
+        void readBinding(ConfigFileType type);
+        void setBinding(ConfigFileType type, const std::string& binding, bool bTemporary);
         bool execute(KeybindMode::Value mode, float abs = 1.0f, float rel = 1.0f);
 
-        //! Container to allow for better configValue support
-        ConfigValueContainer* configContainer_;
         //! The configured string value
         std::string bindingString_;

code/trunk/src/libraries/core/input/KeyBinder.cc

@@ -57 +57 @@
         RegisterRootObject(KeyBinder);
 
-        // intialise all buttons and half axes to avoid creating everything with 'new'
+        // initialise all buttons and half axes to avoid creating everything with 'new'
         // keys
         for (unsigned int i = 0; i < KeyCode::numberOfKeys; i++)
@@ -168 +168 @@
             {
                 for (unsigned int i = 0; i < JoyStickButtonCode::numberOfButtons; ++i)
-                    (*joyStickButtons_[iDev])[i].readConfigValue(this->configFile_);
+                    (*joyStickButtons_[iDev])[i].readBinding(this->configFile_);
                 for (unsigned int i = 0; i < JoyStickAxisCode::numberOfAxes * 2; ++i)
-                    (*joyStickAxes_[iDev])[i].readConfigValue(this->configFile_);
+                    (*joyStickAxes_[iDev])[i].readBinding(this->configFile_);
             }
         }
@@ -257 +257 @@
         for (std::map<std::string, Button*>::const_iterator it = allButtons_.begin(); it != allButtons_.end(); ++it)
         {
-            it->second->readConfigValue(this->configFile_);
+            it->second->readBinding(this->configFile_);
             addButtonToCommand(it->second->bindingString_, it->second);
         }
@@ -270 +270 @@
         {
             addButtonToCommand(binding, it->second);
-            if (bTemporary)
-                it->second->configContainer_->tset(binding);
-            else
-                it->second->configContainer_->set(binding);
-            it->second->configContainer_->getValue(&(it->second->bindingString_), it->second);
+            it->second->setBinding(this->configFile_, 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"

code/trunk/src/libraries/core/input/KeyDetector.cc

@@ -64 +64 @@
     {
         // Assign every button/axis the same command, but with its name as argument
-        clearBindings();
         for (std::map<std::string, Button*>::const_iterator it = allButtons_.begin(); it != allButtons_.end(); ++it)
-        {
-            it->second->bindingString_ = callbackCommand_s + ' ' + it->second->groupName_ + "." + it->second->name_;
-            it->second->parse();
-        }
+            it->second->parse(callbackCommand_s + ' ' + it->second->groupName_ + "." + it->second->name_);
     }