Changeset 922

Timestamp:

Mar 25, 2008, 5:04:26 PM (17 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'

Location:

code/branches/network

Files:

• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/orxonox/InputEvent.h (added)
• src/orxonox/InputEventListener.cc (added)
• src/orxonox/InputEventListener.h (added)
• src/orxonox/InputHandler.cc (modified) (8 diffs)
• src/orxonox/InputHandler.h (modified) (3 diffs)
• src/orxonox/Orxonox.cc (modified) (4 diffs)
• src/orxonox/Orxonox.h (modified) (3 diffs)
• src/orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• src/orxonox/OrxonoxStableHeaders.h (modified) (1 diff)
• visual_studio/vc8/orxonox.vcproj (modified) (2 diffs)

code/branches/network/src/orxonox/CMakeLists.txt

@@ -2 +2 @@
   GraphicsEngine.cc
   InputHandler.cc
+  InputEventListener.cc
   Main.cc
   Orxonox.cc

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

@@ -36 +36 @@
 #include "core/CoreIncludes.h"
 #include "Orxonox.h"
+#include "InputEventListener.h"
 #include "InputHandler.h"
 
 namespace orxonox
 {
-  //using namespace OIS;
-
   /**
     @brief Constructor only resets the pointer values to 0.
@@ -47 +46 @@
   InputHandler::InputHandler()
   {
-    /*if (orxonox::Identifier::isCreatingHierarchy() && !this->getParents())
-        this->createParents();
-    this->setIdentifier(orxonox::ClassManager<InputHandler>::getIdentifier()->registerClass(this->getParents(), "InputHandler", true));
-    if (orxonox::Identifier::isCreatingHierarchy() && this->getParents())
-        this->getParents()->insert(this->getParents()->end(), this->getIdentifier());
-    orxonox::ClassManager<InputHandler>::getIdentifier()->addObject(this);*/
-
     //RegisterObject(InputHandler);
-
     this->mouse_       = 0;
     this->keyboard_    = 0;
     this->inputSystem_ = 0;
-
-    //this->setConfigValues();
-  }
-
-  void InputHandler::setConfigValues()
-  {
-    //SetConfigValue(codeFire_, 4).description("test value");
-
-    ConfigValueContainer *containercodeFire_ = new ConfigValueContainer("asdfblah", "codeFire_", 4);
-    containercodeFire_->getValue(&codeFire_).description("test");
-    //containercodeFire_->
   }
 
@@ -76 +56 @@
     @return The pointer to the only instance of the InputHandler
   */
-  InputHandler* InputHandler::getSingleton()
+  InputHandler *InputHandler::getSingleton()
   {
     static InputHandler theOnlyInstance;
@@ -83 +63 @@
 
   /**
-    @brief Creates the OIS::InputMananger, the keyboard and the mouse
+    @brief Creates the OIS::InputMananger, the keyboard and the mouse and
+           assigns the key bindings.
     @param windowHnd The window handle of the render window
     @param windowWidth The width of the render window
@@ -120 +101 @@
       }
     }
+
+    // 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;
   }
 
@@ -130 +119 @@
     // capture all the input. That calls the event handlers.
     if (mouse_)
-    {
       mouse_->capture();
-    }
 
     if (keyboard_)
-    {
       keyboard_->capture();
-    }
   }
 
@@ -155 +140 @@
 
   /**
+    @brief Calls all the objects from classes that derive from InputEventListener.
+    @param evt The input event that occured.
+  */
+  inline void InputHandler::callListeners(orxonox::InputEvent &evt)
+  {
+    for (Iterator<InputEventListener> it = ObjectList<InputEventListener>::start(); it; )
+    {
+      if (it->bActive_)
+        (it++)->eventOccured(evt);
+      else
+        it++;
+    }
+  }
+
+  /**
     @brief Event handler for the keyPressed Event.
     @param e Event information
@@ -160 +160 @@
   bool InputHandler::keyPressed(const OIS::KeyEvent &e)
   {
-    if (e.key == OIS::KC_ESCAPE)
-      Orxonox::getSingleton()->abortRequest();
+    callListeners(this->bindingsKeyPressed_[(int)e.key]);
     return true;
   }

code/branches/network/src/orxonox/InputHandler.h

@@ -38 +38 @@
 
 #include "OrxonoxPrereqs.h"
-//#include "core/OrxonoxClass.h"
 #include "core/Tickable.h"
+#include "InputEvent.h"
 
 namespace orxonox
 {
   class _OrxonoxExport InputHandler
-        : public Tickable,
-          public OIS::KeyListener, public OIS::MouseListener
+        : public Tickable, public OIS::KeyListener, public OIS::MouseListener
   {
+    //friend ClassIdentifier<InputHandler>;
   public:
-
     void initialise(size_t windowHnd, int windowWidth, int windowHeight);
     void tick(float dt);
@@ -55 +54 @@
     OIS::Mouse    *getMouse()    { return this->mouse_   ; }
     OIS::Keyboard *getKeyboard() { return this->keyboard_; }
+
+    static InputHandler* getSingleton();
+
+  private:
+    // don't mess with a Singleton
+    InputHandler ();
+    InputHandler (const InputHandler&) { }
+    ~InputHandler() { }
+
+    void callListeners(InputEvent &evt);
 
     // input events
@@ -63 +72 @@
                 bool keyReleased  (const OIS::KeyEvent   &arg);
 
-    static InputHandler* getSingleton();
+    OIS::InputManager *inputSystem_;    //!< OIS input manager
+    OIS::Keyboard     *keyboard_;       //!< OIS mouse
+    OIS::Mouse        *mouse_;          //!< OIS keyboard
 
-    void setConfigValues();
+    //! denotes the maximum number of different keys there are in OIS.
+    //! 256 should be ok since the highest number in the enum is 237.
+    static const int numberOfKeys_ = 256;
+    //! Array of input events for every pressed key
+    InputEvent bindingsKeyPressed_[numberOfKeys_];
+    //! Array of input events for every released key
+    InputEvent bindingsKeyReleased_[numberOfKeys_];
 
-  private:
-    // don't mess with a Singleton
-    InputHandler ();
-    InputHandler (const InputHandler&) { }
-    ~InputHandler() { }
-
-    OIS::InputManager *inputSystem_;
-    OIS::Keyboard     *keyboard_;
-    OIS::Mouse        *mouse_;
-
-    // Key bindings
-    int codeFire_;
-    OIS::KeyCode codeMoveForward_;
+    //! denotes the maximum number of different buttons there are in OIS.
+    //! 16 should be ok since the highest number in the enum is 7.
+    static const int numberOfButtons_ = 16;
+    //! Array of input events for every pressed key
+    InputEvent bindingsButtonPressed_[numberOfButtons_];
+    //! Array of input events for every released key
+    InputEvent bindingsButtonReleased_[numberOfButtons_];
 
   };

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();
+  }
 }

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

@@ -18 +18 @@
 
 #include "GraphicsEngine.h"
+#include "InputEventListener.h"
 
 
@@ -30 +31 @@
   };
 
-  class _OrxonoxExport Orxonox
+  class _OrxonoxExport Orxonox : public InputEventListener
   {
     public:
@@ -68 +69 @@
       float calculateEventTime(unsigned long, std::deque<unsigned long>&);
 
+      void eventOccured(InputEvent &evt);
+
     private:
       GraphicsEngine*       ogre_;          //!< our dearest graphics engine <3

code/branches/network/src/orxonox/OrxonoxPrereqs.h

@@ -68 +68 @@
   class Camera;
   class GraphicsEngine;
+  struct InputEvent;
+  class InputEventListener;
   class InputHandler;
   class Mesh;

code/branches/network/src/orxonox/OrxonoxStableHeaders.h

@@ -46 +46 @@
 #endif
 //#include <Ogre.h>
-//#include <OgreBillboardSet.h>
-//#include <OgreCamera.h>
-//#include <OgreConfigFile.h>
+#include <OgreBillboardSet.h>
+#include <OgreCamera.h>
+#include <OgreColourValue.h>
+#include <OgreConfigFile.h>
 #include <OgreEntity.h>
 #include <OgreException.h>
-//#include <OgreFrameListener.h>
+#include <OgreFrameListener.h>
 #include <OgreLight.h>
-//#include <OgreOverlay.h>
-//#include <OgreOverlayElement.h>
-//#include <OgreOverlayManager.h>
+#include <OgreMath.h>
+#include <OgreMatrix3.h>
+#include <OgreOverlay.h>
+#include <OgreOverlayElement.h>
+#include <OgreOverlayManager.h>
 #include <OgreParticleEmitter.h>
 #include <OgreParticleSystem.h>
 #include <OgrePlatform.h>
 #include <OgrePrerequisites.h>
-//#include <OgreRenderWindow.h>
-//#include <OgreRoot.h>
+#include <OgreQuaternion.h>
+#include <OgreResourceGroupManager.h>
+#include <OgreRenderWindow.h>
+#include <OgreRoot.h>
 #include <OgreSceneManager.h>
 #include <OgreSceneNode.h>
 #include <OgreStringConverter.h>
-//#include <OgreTextureManager.h>
-//#include <OgreViewport.h>
+#include <OgreTextureManager.h>
+#include <OgreTimer.h>
+#include <OgreVector2.h>
+#include <OgreVector3.h>
+#include <OgreVector3.h>
+#include <OgreViewport.h>
+#include <OgreWindowEventUtilities.h>
 
 #include <OIS/OIS.h>

code/branches/network/visual_studio/vc8/orxonox.vcproj

@@ -285 +285 @@
                         </File>
                         <File
+                                RelativePath="..\..\src\orxonox\InputEventListener.cc"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\src\orxonox\InputHandler.cc"
                                 >
@@ -655 +659 @@
                         </File>
                         <File
+                                RelativePath="..\..\src\orxonox\InputEvent.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\src\orxonox\InputEventListener.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\src\orxonox\InputHandler.h"
                                 >