Changeset 1182 for code/branches/input/src/orxonox/Orxonox.h

Timestamp:

Apr 24, 2008, 9:40:23 PM (16 years ago)

Author:

rgrieder

Message:

• InputManager works so far, but has to be largely extended

File:

• code/branches/input/src/orxonox/Orxonox.h (modified) (5 diffs)

code/branches/input/src/orxonox/Orxonox.h

@@ -49 +49 @@
 namespace orxonox {
 
+  class Testconsole;
+
   enum gameMode{
     SERVER,
@@ -56 +58 @@
 
   //! Orxonox singleton class
-  class _OrxonoxExport Orxonox : public InputEventListener
+  class _OrxonoxExport Orxonox
   {
     public:
@@ -72 +74 @@
       static inline float getTimeFactor() { return Orxonox::getSingleton()->timefactor_; }
       static inline void exit() { Orxonox::getSingleton()->abortRequest(); }
+      static inline void activateConsole();
 
    private:
@@ -95 +98 @@
       float calculateEventTime(unsigned long, std::deque<unsigned long>&);
 
-      void eventOccured(InputEvent &evt);
-
     private:
       GraphicsEngine*       ogre_;          //!< our dearest graphics engine <3
@@ -102 +103 @@
       audio::AudioManager*  auMan_;         //!< audio manager
       InputManager*         inputHandler_;  //!< Handles input with key bindings
+      Testconsole*          console_;
       Ogre::Timer*          timer_;         //!< Main loop timer
       // TODO: make this a config-value by creating a config class for orxonox