Changeset 1154 for code/branches/input/src/core/InputManager.cc

Timestamp:

Apr 24, 2008, 11:04:01 AM (17 years ago)

Author:

rgrieder

Message:

• updated input branch to trunk state. Only Input system files should differ now.
• this revision doesn't even compile, its just an 'svn save'

File:

• code/branches/input/src/core/InputManager.cc (modified) (5 diffs)

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

@@ -125 +125 @@
     // create the handlers
     this->handlerGUI_ = new InputHandlerGUI();
+    this->handlerGUI_->initialise();
     this->handlerGame_ = new InputHandlerGame();
-    //this->handlerBuffer_ = new InputBuffer();
-    this->handlerGame_->loadBindings();
-
-    /*COUT(ORX_DEBUG) << "*** InputManager: Loading key bindings..." << std::endl;
-    // load the key bindings
-    InputEvent empty = {0, false, 0, 0, 0};
-    for (int i = 0; i < this->numberOfKeys_; i++)
-      this->bindingsKeyPressed_[i] = empty;
-
-    //assign 'abort' to the escape key
-    this->bindingsKeyPressed_[(int)OIS::KC_ESCAPE].id = 1;
+    this->handlerGame_->initialise();
+
     COUT(ORX_DEBUG) << "*** InputManager: Loading done." << std::endl;*/
 
@@ -159 +151 @@
     this->inputSystem_   = 0;
 
-    if (this->handlerBuffer_)
-      delete this->handlerBuffer_;
     if (this->handlerGame_)
       delete this->handlerGame_;
@@ -166 +156 @@
       delete this->handlerGUI_;
 
-    this->handlerBuffer_ = 0;
     this->handlerGame_   = 0;
     this->handlerGUI_    = 0;
@@ -192 +181 @@
         this->keyboard_->setEventCallback(this->handlerGame_);
         break;
-      case IM_KEYBOARD:
-        this->mouse_->setEventCallback(this->handlerGame_);
-        this->keyboard_->setEventCallback(this->handlerBuffer_);
-        break;
       case IM_UNINIT:
         this->mouse_->setEventCallback(0);
@@ -211 +196 @@
 
     // Give the listeners the chance to do additional calculations
+    this->currentHandler_->tick(dt);
   }