Changeset 922 for code/branches/network/src/orxonox/Orxonox.cc

Timestamp:

Mar 25, 2008, 5:04:26 PM (16 years ago)

Author:

rgrieder

Message:

• created InputEventListener and InputEvent
• escape key now works through the InputHandler
• the concept will soon be replaced by a new one this is more of a 'svn save'

File:

• code/branches/network/src/orxonox/Orxonox.cc (modified) (4 diffs)

code/branches/network/src/orxonox/Orxonox.cc

@@ -37 +37 @@
 #include <OgreException.h>
 #include <OgreRoot.h>
-#include <OgreFrameListener.h>
 #include <OgreRenderWindow.h>
 #include <OgreTextureManager.h>
@@ -373 +372 @@
   }
 
-
+  /**
+    @brief Calls the InputHandler which sets up the input devices.
+    The render window width and height are used to set up the mouse movement.
+  */
   void Orxonox::setupInputSystem()
   {
@@ -379 +381 @@
     inputHandler_->initialise(ogre_->getWindowHandle(),
           ogre_->getWindowWidth(), ogre_->getWindowHeight());
-
-    /*size_t windowHnd = 0;
-    std::ostringstream windowHndStr;
-    OIS::ParamList pl;
-
-    // fixes auto repeat problem
-    #if defined OIS_LINUX_PLATFORM
-      pl.insert(std::make_pair(std::string("XAutoRepeatOn"), std::string("true")));
-    #endif
-
-      Ogre::RenderWindow *win = ogre_->getRoot()->getAutoCreatedWindow();
-    win->getCustomAttribute("WINDOW", &windowHnd);
-    windowHndStr << windowHnd;
-    pl.insert(std::make_pair(std::string("WINDOW"), windowHndStr.str()));
-    inputManager_ = OIS::InputManager::createInputSystem(pl);
-
-    try
-    {
-      keyboard_ = static_cast<OIS::Keyboard*>(inputManager_->createInputObject(OIS::OISKeyboard, false));
-      mouse_ = static_cast<OIS::Mouse*>(inputManager_->createInputObject(OIS::OISMouse, true));
-    }
-    catch (const OIS::Exception &e)
-    {
-      throw new Ogre::Exception(42, e.eText, "OrxApplication::setupInputSystem");
-    }*/
   }
 
@@ -512 +489 @@
     return (float)(times.back() - times.front()) / ((times.size()-1) * 1000);
   }
+
+  void Orxonox::eventOccured(InputEvent &evt)
+  {
+    if (evt.id == 1)
+      this->abortRequest();
+  }
 }