Changeset 5869 for code/branches/core5/src/libraries/core/input/KeyDetector.cc

Timestamp:

Oct 4, 2009, 12:26:05 AM (15 years ago)

Author:

rgrieder

Message:

Applied ScopedSingletonManager to KeyBinderManager and KeyDetector.

File:

• code/branches/core5/src/libraries/core/input/KeyDetector.cc (modified) (3 diffs)

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

@@ -31 +31 @@
 #include "core/ConsoleCommand.h"
 #include "core/CoreIncludes.h"
+#include "core/ScopedSingletonManager.h"
 #include "Button.h"
+#include "InputManager.h"
+#include "InputState.h"
 
 namespace orxonox
@@ -37 +40 @@
     std::string KeyDetector::callbackCommand_s = "KeyDetectorKeyPressed";
     KeyDetector* KeyDetector::singletonPtr_s = 0;
+    ManageScopedSingleton(KeyDetector, ScopeID::Graphics);
 
     KeyDetector::KeyDetector()
@@ -45 +49 @@
         CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&KeyDetector::callback,  this), callbackCommand_s));
         this->assignCommands();
+
+        inputState_ = InputManager::getInstance().createInputState("detector", false, false, InputStatePriority::Detector);
+        // Create a callback to avoid buttonHeld events after the key has been detected
+        inputState_->setLeaveFunctor(createFunctor(&InputManager::clearBuffers, &InputManager::getInstance()));
+        inputState_->setHandler(this);
+    }
+
+    KeyDetector::~KeyDetector()
+    {
+        inputState_->setHandler(NULL);
+        InputManager::getInstance().destroyState("detector");
     }