Changeset 7219 for code/branches/consolecommands3/src/libraries/core/input

Timestamp:

Aug 26, 2010, 12:09:12 AM (14 years ago)

Author:

landauf

Message:

adapted all console commands to the new interface

Location:

code/branches/consolecommands3/src/libraries/core/input

Files:

• InputManager.cc (modified) (3 diffs)
• KeyBinderManager.cc (modified) (3 diffs)
• KeyDetector.cc (modified) (4 diffs)
• KeyDetector.h (modified) (1 diff)

code/branches/consolecommands3/src/libraries/core/input/InputManager.cc

@@ -62 +62 @@
     SetCommandLineSwitch(keyboard_no_grab).information("Whether not to exclusively grab the keyboard");
 
+    static const std::string __CC_InputManager_name = "InputManager";
+    static const std::string __CC_calibrate_name = "calibrate";
+    static const std::string __CC_reload_name = "reload";
+
+    _SetConsoleCommand(__CC_InputManager_name, __CC_calibrate_name, &InputManager::calibrate).addShortcut();
+    _SetConsoleCommand(__CC_InputManager_name, __CC_reload_name,    &InputManager::reload   );
+
     // Abuse of this source file for the InputHandler
     InputHandler InputHandler::EMPTY;
@@ -118 +125 @@
         this->updateActiveStates();
 
-        // calibrate console command
-        this->getIdentifier()->addConsoleCommand(createConsoleCommand(createFunctor(&InputManager::calibrate, this), "calibrate"), true);
-        // reload console command
-        this->getIdentifier()->addConsoleCommand(createConsoleCommand(createFunctor(&InputManager::reload, this), "reload"), false);
+        _ModifyConsoleCommand(__CC_InputManager_name, __CC_calibrate_name).setObject(this);
+        _ModifyConsoleCommand(__CC_InputManager_name, __CC_reload_name).setObject(this);
 
         CCOUT(4) << "Construction complete." << std::endl;
@@ -287 +292 @@
         if (!(internalState_ & Bad))
             this->destroyDevices();
+
+        // Reset console commands
+        _ModifyConsoleCommand(__CC_InputManager_name, __CC_calibrate_name).setObject(0);
+        _ModifyConsoleCommand(__CC_InputManager_name, __CC_reload_name).setObject(0);
 
         CCOUT(3) << "Destruction complete." << std::endl;

code/branches/consolecommands3/src/libraries/core/input/KeyBinderManager.cc

@@ -43 +43 @@
     ManageScopedSingleton(KeyBinderManager, ScopeID::Graphics, false);
 
+    static const std::string __CC_keybind_name = "keybind";
+    static const std::string __CC_tkeybind_name = "tkeybind";
+    static const std::string __CC_unbind_name = "unbind";
+    static const std::string __CC_tunbind_name = "tunbind";
+
+    _SetConsoleCommand(__CC_keybind_name,  &KeyBinderManager::keybind).defaultValues("");
+    _SetConsoleCommand(__CC_tkeybind_name, &KeyBinderManager::tkeybind).defaultValues("");
+    _SetConsoleCommand(__CC_unbind_name,   &KeyBinderManager::unbind).defaultValues("");
+    _SetConsoleCommand(__CC_tunbind_name,  &KeyBinderManager::tunbind).defaultValues("");
+
     KeyBinderManager::KeyBinderManager()
         : currentBinder_(NULL)
@@ -52 +62 @@
 
         // keybind console commands
-        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&KeyBinderManager::keybind,  this), "keybind" ))
-            .defaultValues("");
-        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&KeyBinderManager::tkeybind, this), "tkeybind"))
-            .defaultValues("");
-        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&KeyBinderManager::unbind, this), "unbind"))
-            .defaultValues("");
-        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&KeyBinderManager::tunbind, this), "tunbind"))
-            .defaultValues("");
+        _ModifyConsoleCommand(__CC_keybind_name ).setObject(this);
+        _ModifyConsoleCommand(__CC_tkeybind_name).setObject(this);
+        _ModifyConsoleCommand(__CC_unbind_name  ).setObject(this);
+        _ModifyConsoleCommand(__CC_tunbind_name ).setObject(this);
 
         // Load default key binder
@@ -70 +76 @@
         for (std::map<std::string, KeyBinder*>::const_iterator it = this->binders_.begin(); it != this->binders_.end(); ++it)
             delete it->second;
+
+        // Reset console commands
+        _ModifyConsoleCommand(__CC_keybind_name ).setObject(0);
+        _ModifyConsoleCommand(__CC_tkeybind_name).setObject(0);
+        _ModifyConsoleCommand(__CC_unbind_name  ).setObject(0);
+        _ModifyConsoleCommand(__CC_tunbind_name ).setObject(0);
     }
 

code/branches/consolecommands3/src/libraries/core/input/KeyDetector.cc

@@ -38 +38 @@
 namespace orxonox
 {
-    std::string KeyDetector::callbackCommand_s = "KeyDetectorKeyPressed";
     ManageScopedSingleton(KeyDetector, ScopeID::Graphics, false);
+
+    static const std::string __CC_KeyDetector_callback_name = "KeyDetectorKeyPressed";
+    _DeclareConsoleCommand(__CC_KeyDetector_callback_name, &prototype::void__string);
 
     KeyDetector::KeyDetector()
@@ -46 +48 @@
         RegisterObject(KeyDetector);
 
-        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&KeyDetector::callback,  this), callbackCommand_s));
+        _ModifyConsoleCommand(__CC_KeyDetector_callback_name).setFunction(&KeyDetector::callback, this);
+
         this->assignCommands();
 
@@ -59 +62 @@
         inputState_->setHandler(NULL);
         InputManager::getInstance().destroyState("detector");
+        _ModifyConsoleCommand(__CC_KeyDetector_callback_name).resetFunction();
     }
 
@@ -65 +69 @@
         // Assign every button/axis the same command, but with its name as argument
         for (std::map<std::string, Button*>::const_iterator it = allButtons_.begin(); it != allButtons_.end(); ++it)
-            it->second->parse(callbackCommand_s + ' ' + it->second->groupName_ + "." + it->second->name_);
+            it->second->parse(__CC_KeyDetector_callback_name + ' ' + it->second->groupName_ + "." + it->second->name_);
     }
 

code/branches/consolecommands3/src/libraries/core/input/KeyDetector.h

@@ -57 +57 @@
         FunctorPtr callbackFunction_;
         InputState* inputState_;
-        static std::string callbackCommand_s;
         static KeyDetector* singletonPtr_s;
     };