Changeset 1182 for code/branches/input/src/orxonox

Timestamp:

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

Author:

rgrieder

Message:

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

Location:

code/branches/input/src/orxonox

Files:

• Orxonox.cc (modified) (8 diffs)
• Orxonox.h (modified) (5 diffs)
• objects/SpaceShip.cc (modified) (2 diffs)

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

@@ -84 +84 @@
 namespace orxonox
 {
-  ConsoleCommand(Orxonox, exit, AccessLevel::None, true);
-  ConsoleCommand(Orxonox, slomo, AccessLevel::Offline, true).setDefaultValue(0, 1.0);
-  ConsoleCommand(Orxonox, setTimeFactor, AccessLevel::Offline, false).setDefaultValue(0, 1.0);
-
+  ConsoleCommandShortcut(Orxonox, exit, AccessLevel::None);
+  ConsoleCommandShortcut(Orxonox, slomo, AccessLevel::Offline).setDefaultValue(0, 1.0);
+  ConsoleCommandShortcut(Orxonox, setTimeFactor, AccessLevel::Offline).setDefaultValue(0, 1.0);
+  ConsoleCommandShortcut(Orxonox, activateConsole, AccessLevel::None);
   class Testconsole : public InputBufferListener
   {
@@ -118 +118 @@
       void exit() const
       {
-        CommandExecutor::execute("setInputMode 2");
+        InputManager::setInputState(InputManager::IS_NORMAL);
       }
 
@@ -177 +177 @@
       delete this->orxonoxHUD_;
     Loader::close();
-    InputManager::getSingleton().destroy();
+    InputManager::destroy();
     if (this->auMan_)
       delete this->auMan_;
@@ -392 +392 @@
   void Orxonox::setupInputSystem()
   {
-    inputHandler_ = &InputManager::getSingleton();
-    if (!inputHandler_->initialise(ogre_->getWindowHandle(),
+    if (!InputManager::initialise(ogre_->getWindowHandle(),
           ogre_->getWindowWidth(), ogre_->getWindowHeight()))
       abortImmediateForce();
-    inputHandler_->setInputMode(IM_INGAME);
+    InputManager::setInputState(InputManager::IS_NORMAL);
   }
 
@@ -415 +414 @@
   void Orxonox::startRenderLoop()
   {
-    InputBuffer* ib = new InputBuffer();
-    InputManager::getSingleton().feedInputBuffer(ib);
-    Testconsole* console = new Testconsole(ib);
-    ib->registerListener(console, &Testconsole::listen, true);
-    ib->registerListener(console, &Testconsole::execute, '\r', false);
-    ib->registerListener(console, &Testconsole::execute, '\n', false);
-    ib->registerListener(console, &Testconsole::hintandcomplete, '\t', true);
-    ib->registerListener(console, &Testconsole::clear, '§', true);
-    ib->registerListener(console, &Testconsole::removeLast, '\b', true);
-    ib->registerListener(console, &Testconsole::exit, (char)0x1B, true);
+    InputBuffer* ib = dynamic_cast<InputBuffer*>(InputManager::getKeyListener("buffer"));
+    console_ = new Testconsole(ib);
+    ib->registerListener(console_, &Testconsole::listen, true);
+    ib->registerListener(console_, &Testconsole::execute, '\r', false);
+    ib->registerListener(console_, &Testconsole::execute, '\n', false);
+    ib->registerListener(console_, &Testconsole::hintandcomplete, '\t', true);
+    ib->registerListener(console_, &Testconsole::clear, '§', true);
+    ib->registerListener(console_, &Testconsole::removeLast, '\b', true);
+    ib->registerListener(console_, &Testconsole::exit, (char)0x1B, true);
 
     // first check whether ogre root object has been created
@@ -442 +440 @@
       eventTimes[i].clear();
     // fill the fps time list with zeros
-    for (int i = 0; i < 20; i++)
+    for (int i = 0; i < 50; i++)
       eventTimes[3].push_back(0);
 
@@ -468 +466 @@
       // show the current time in the HUD
       orxonoxHUD_->setTime((int)now, 0);
+      orxonoxHUD_->setRocket2(ogreRoot.getCurrentFrameNumber());
       if (eventTimes[3].back() - eventTimes[3].front() != 0)
-        orxonoxHUD_->setRocket1((int)(20000.0f/(eventTimes[3].back() - eventTimes[3].front())));
+        orxonoxHUD_->setRocket1((int)(50000.0f/(eventTimes[3].back() - eventTimes[3].front())));
 
       // Iterate through all Tickables and call their tick(dt) function
@@ -533 +532 @@
   }
 
-  /**
-    @brief Test method for the InputHandler.
-    But: Is actually responsible for catching an exit event..
-  */
-  void Orxonox::eventOccured(InputEvent &evt)
-  {
-    if (evt.id == 1)
-      this->abortRequest();
+  void Orxonox::activateConsole()
+  {
+    InputManager::setInputState(InputManager::IS_CONSOLE);
   }
 }

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

code/branches/input/src/orxonox/objects/SpaceShip.cc

@@ -428 +428 @@
     void SpaceShip::tick(float dt)
     {
-      if (InputManager::getSingleton().getMouse()->getEventCallback() != this)
-        {
-            if (InputManager::getSingleton().getMouse())
+      if (InputManager::getMouse()->getEventCallback() != this)
+        {
+            if (InputManager::getMouse())
             {
-                InputManager::getSingleton().getMouse()->setEventCallback(this);
+                InputManager::getMouse()->setEventCallback(this);
                 this->setMouseEventCallback_ = true;
             }
@@ -457 +457 @@
         }
 
-        OIS::Keyboard* mKeyboard = InputManager::getSingleton().getKeyboard();
+        OIS::Keyboard* mKeyboard = InputManager::getKeyboard();
         //FIXME: variable never used
         //OIS::Mouse* mMouse = InputManager::getSingleton().getMouse();