Changeset 5869 for code/branches/core5/src/libraries/core/input/InputManager.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/InputManager.cc (modified) (4 diffs)

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

@@ -53 +53 @@
 
 #include "InputBuffer.h"
-#include "KeyDetector.h"
 #include "JoyStick.h"
 #include "JoyStickQuantityListener.h"
@@ -90 +89 @@
         , bExclusiveMouse_(false)
         , emptyState_(0)
-        , keyDetector_(0)
         , calibratorCallbackHandler_(0)
     {
@@ -105 +103 @@
         emptyState_->setHandler(&InputHandler::EMPTY);
         activeStates_[emptyState_->getPriority()] = emptyState_;
-
-        // KeyDetector to evaluate a pressed key's name
-        InputState* detector = createInputState("detector", false, false, InputStatePriority::Detector);
-        // Create a callback to avoid buttonHeld events after the key has been detected
-        detector->setLeaveFunctor(createFunctor(&InputManager::clearBuffers, this));
-        keyDetector_ = new KeyDetector();
-        detector->setHandler(keyDetector_);
 
         // Joy stick calibration helper callback
@@ -274 +265 @@
 
         // Destroy calibrator helper handler and state
-        keyDetector_->destroy();
         this->destroyState("calibrator");
         // Destroy KeyDetector and state
         calibratorCallbackHandler_->destroy();
-        this->destroyState("detector");
         // destroy the empty InputState
         this->destroyStateInternal(this->emptyState_);