Changeset 919

Timestamp:

Mar 24, 2008, 1:12:31 PM (16 years ago)

Author:

rgrieder

Message:

• AudioManager is now Tickable
• NPC update moved to its tick-function
• corrected CMakeLists
• added a few window properties to GraphicsEngine
• OrxListener has been completely replaced

Location:

code/branches/network

Files:

• src/audio/AudioManager.cc (modified) (1 diff)
• src/audio/AudioManager.h (modified) (3 diffs)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/orxonox/GraphicsEngine.cc (modified) (4 diffs)
• src/orxonox/GraphicsEngine.h (modified) (2 diffs)
• src/orxonox/InputHandler.cc (modified) (11 diffs)
• src/orxonox/InputHandler.h (modified) (2 diffs)
• src/orxonox/Orxonox.cc (modified) (9 diffs)
• src/orxonox/Orxonox.h (modified) (3 diffs)
• src/orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• src/orxonox/core/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/Fighter.cc (modified) (3 diffs)
• src/orxonox/objects/NPC.cc (modified) (1 diff)
• src/orxonox/objects/SpaceShip.cc (modified) (3 diffs)
• src/orxonox/tools/OrxListener.cc (deleted)
• src/orxonox/tools/OrxListener.h (deleted)
• visual_studio/vc8/orxonox.vcproj (modified) (2 diffs)

code/branches/network/src/audio/AudioManager.cc

@@ -84 +84 @@
         }
 
-        void AudioManager::update()
+        void AudioManager::tick(float dt)
         {
                 if (bgSounds.size() > 0)

code/branches/network/src/audio/AudioManager.h

@@ -3 +3 @@
 
 #include "AudioIncludes.h"
+
+#include "core/Tickable.h"
 
 #include "AudioPrereqs.h"
@@ -12 +14 @@
 namespace audio
 {
-        class _AudioExport AudioManager
+  class _AudioExport AudioManager : public orxonox::Tickable
         {
         public:
@@ -37 +39 @@
 
                 // Update
-                void update();
+                void tick(float dt);
 
                 void ambientAdd(std::string file);

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

@@ -1 +1 @@
 SET( ORXONOX_SRC_FILES
   GraphicsEngine.cc
+  InputHandler.cc
   Main.cc
   Orxonox.cc
-  objects/Tickable.cc
-  SpaceshipSteering.cc
+#  SpaceshipSteering.cc
   hud/HUD.cc
   particle/ParticleInterface.cc

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

@@ -35 +35 @@
 #include <OgreConfigFile.h>
 #include <OgreTextureManager.h>
+#include <OgreRenderWindow.h>
 
 #include "core/Debug.h"
@@ -49 +50 @@
     this->configPath_ = "";
     this->dataPath_ = "";
-    scene_ = NULL;
+    this->root_ = 0;
+    this->scene_ = 0;
+    this->renderWindow_ = 0;
   }
 
@@ -98 +101 @@
   {
     root_->initialise(true, "OrxonoxV2");
+    this->renderWindow_ = root_->getAutoCreatedWindow();
     TextureManager::getSingleton().setDefaultNumMipmaps(5);
     ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
@@ -131 +135 @@
   }
 
+  /**
+    Returns the window handle of the render window.
+    At least the InputHandler uses this to create the OIS::InputManager
+    @return The window handle of the render window
+  */
+  size_t GraphicsEngine::getWindowHandle()
+  {
+    if (this->renderWindow_)
+    {
+      Ogre::RenderWindow *renderWindow = this->root_->getAutoCreatedWindow();
+      size_t windowHnd = 0;
+      renderWindow->getCustomAttribute("WINDOW", &windowHnd);
+      return windowHnd;
+    }
+    else
+      return 0;
+  }
+
+  /**
+    Get the width of the current render window
+    @return The width of the current render window
+  */
+  int GraphicsEngine::getWindowWidth() const
+  {
+    if (this->renderWindow_)
+    {
+      return this->renderWindow_->getWidth();
+    }
+    else
+      return 0;
+  }
+
+  /**
+    Get the height of the current render window
+    @return The height of the current render window
+  */
+  int GraphicsEngine::getWindowHeight() const
+  {
+    if (this->renderWindow_)
+    {
+      return this->renderWindow_->getHeight();
+    }
+    else
+      return 0;
+  }
 
 }

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

@@ -33 +33 @@
       void startRender();
 
+      // several window properties
+      size_t getWindowHandle();
+      int getWindowWidth() const;
+      int getWindowHeight() const;
+
       virtual ~GraphicsEngine();
     private:
@@ -39 +44 @@
       std::string         dataPath_;    //!< path to data file
       Ogre::SceneManager* scene_;       //!< scene manager of the game
+      Ogre::RenderWindow* renderWindow_;//!< the current render window
 
   };

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

@@ -22 +22 @@
  *      Reto Grieder
  *   Co-authors:
- *      ...
+ *      Some guy writing the example code from Ogre
  *
  */
@@ -34 +34 @@
 #include "OrxonoxStableHeaders.h"
 
-#include <OgreRenderWindow.h>
-
+#include "Orxonox.h"
 #include "InputHandler.h"
 
@@ -42 +41 @@
   //using namespace OIS;
 
+  /**
+    @brief Constructor only resets the pointer values to 0.
+  */
   InputHandler::InputHandler()
   {
-    RegisterObject(InputHandler);
-  }
-
-  void InputHandler::initialise(Ogre::RenderWindow *renderWindow)
+    /*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_->
+  }
+
+  /**
+    @brief The one instance of the InputHandler is stored in this function.
+    @return The pointer to the only instance of the InputHandler
+  */
+  InputHandler* InputHandler::getSingleton()
+  {
+    static InputHandler theOnlyInstance;
+    return &theOnlyInstance;
+  }
+
+  /**
+    @brief Creates the OIS::InputMananger, the keyboard and the mouse
+    @param windowHnd The window handle of the render window
+    @param windowWidth The width of the render window
+    @param windowHeight The height of the render window
+  */
+  void InputHandler::initialise(size_t windowHnd, int windowWidth, int windowHeight)
   {
     if (!inputSystem_)
@@ -53 +93 @@
       // Setup basic variables
       OIS::ParamList paramList;
-      size_t windowHnd = 0;
       std::ostringstream windowHndStr;
-
-      // Get window handle
-      renderWindow->getCustomAttribute("WINDOW", &windowHnd);
 
       // Fill parameter list
@@ -67 +103 @@
 
       // If possible create a buffered keyboard
-      // (note: if below line doesn't compile, try:  if (inputSystem_->getNumberOfDevices(OIS::OISKeyboard) > 0) {
       if (inputSystem_->numKeyboards() > 0)
       {
-        //if (inputSystem_->getNumberOfDevices(OIS::OISKeyboard) > 0)
-        //{
         keyboard_ = static_cast<OIS::Keyboard*>(inputSystem_->createInputObject(OIS::OISKeyboard, true));
         keyboard_->setEventCallback(this);
@@ -77 +110 @@
 
       // If possible create a buffered mouse
-      // (note: if below line doesn't compile, try:  if (inputSystem_->getNumberOfDevices(OIS::OISMouse) > 0) {
       if (inputSystem_->numMice() > 0 )
       {
-        //if (inputSystem_->getNumberOfDevices(OIS::OISMouse) > 0)
-        //{
         mouse_ = static_cast<OIS::Mouse*>(inputSystem_->createInputObject(OIS::OISMouse, true));
         mouse_->setEventCallback(this);
 
-        // Get window size
-        unsigned int width, height, depth;
-        int left, top;
-        renderWindow->getMetrics(width, height, depth, left, top);
-
         // Set mouse region
-        this->setWindowExtents(width, height);
+        this->setWindowExtents(windowWidth, windowHeight);
       }
     }
   }
 
+  /**
+    @brief Updates the InputHandler
+    @param dt Delta time
+  */
   void InputHandler::tick(float dt)
   {
@@ -110 +139 @@
   }
 
+  /**
+    @brief Adjusts the mouse window metrics.
+    This method has to be called every time the size of the window changes.
+    @param width The new width of the render window
+    @param height the new height of the render window
+  */
   void InputHandler::setWindowExtents(int width, int height)
   {
@@ -118 +153 @@
   }
 
+  /**
+    @brief Event handler for the keyPressed Event.
+    @param e Event information
+  */
   bool InputHandler::keyPressed(const OIS::KeyEvent &e)
   {
-    return true;
-  }
-
+    if (e.key == OIS::KC_ESCAPE)
+      Orxonox::getSingleton()->abortRequest();
+    return true;
+  }
+
+  /**
+    @brief Event handler for the keyReleased Event.
+    @param e Event information
+  */
   bool InputHandler::keyReleased(const OIS::KeyEvent &e)
   {
@@ -128 +173 @@
   }
 
+  /**
+    @brief Event handler for the mouseMoved Event.
+    @param e Event information
+  */
   bool InputHandler::mouseMoved(const OIS::MouseEvent &e)
   {
@@ -133 +182 @@
   }
 
+  /**
+    @brief Event handler for the mousePressed Event.
+    @param e Event information
+    @param id The ID of the mouse button
+  */
   bool InputHandler::mousePressed(const OIS::MouseEvent &e, OIS::MouseButtonID id)
   {
@@ -138 +192 @@
   }
 
+  /**
+    @brief Event handler for the mouseReleased Event.
+    @param e Event information
+    @param id The ID of the mouse button
+  */
   bool InputHandler::mouseReleased(const OIS::MouseEvent &e, OIS::MouseButtonID id)
   {

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

@@ -39 +39 @@
 #include <OIS/OISKeyboard.h>
 
-#include <OgrePrerequisites.h>
-
 #include "OrxonoxPrereqs.h"
+//#include "core/OrxonoxClass.h"
 #include "core/Tickable.h"
 
 namespace orxonox
 {
-  class _OrxonoxExport InputHandler : public Tickable, public OIS::KeyListener,
-                                      public OIS::MouseListener
+  class _OrxonoxExport InputHandler
+        : public Tickable,
+          public OIS::KeyListener, public OIS::MouseListener
   {
   public:
-    InputHandler();
 
-    void initialise(Ogre::RenderWindow *renderWindow);
+    void initialise(size_t windowHnd, int windowWidth, int windowHeight);
     void tick(float dt);
     void setWindowExtents(int width, int height);
+
+    OIS::Mouse    *getMouse()    { return this->mouse_   ; }
+    OIS::Keyboard *getKeyboard() { return this->keyboard_; }
 
     // input events
@@ -63 +65 @@
                 bool keyReleased  (const OIS::KeyEvent   &arg);
 
+    static InputHandler* getSingleton();
+
+    void setConfigValues();
+
   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_;
 
   };

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

@@ -67 +67 @@
 network::Server *server_g;
 
-
 // objects
 #include "tools/Timer.h"
-#include "tools/OrxListener.h"
 #include "core/ArgReader.h"
 #include "core/Debug.h"
@@ -79 +77 @@
 #include "objects/weapon/BulletManager.h"
 
+#include "InputHandler.h"
+
 #include "Orxonox.h"
 
@@ -95 +95 @@
     this->auMan_ = 0;
     this->singletonRef_ = 0;
-    this->keyboard_ = 0;
-    this->mouse_ = 0;
-    this->inputManager_ = 0;
+    //this->keyboard_ = 0;
+    //this->mouse_ = 0;
+    //this->inputManager_ = 0;
+    this->inputHandler_ = 0;
     this->frameListener_ = 0;
     this->root_ = 0;
@@ -187 +188 @@
     //setupInputSystem();
     
-    createFrameListener();
-    
     startRenderLoop();
   }
@@ -201 +200 @@
     setupInputSystem();
     
-    createFrameListener();
     server_g->open();
     
@@ -215 +213 @@
     setupScene();
     setupInputSystem();
-    
-    createFrameListener();
     
     startRenderLoop();
@@ -380 +376 @@
   void Orxonox::setupInputSystem()
   {
-    size_t windowHnd = 0;
+    inputHandler_ = InputHandler::getSingleton();
+    inputHandler_->initialise(ogre_->getWindowHandle(),
+          ogre_->getWindowWidth(), ogre_->getWindowHeight());
+
+    /*size_t windowHnd = 0;
     std::ostringstream windowHndStr;
     OIS::ParamList pl;
@@ -403 +403 @@
     {
       throw new Ogre::Exception(42, e.eText, "OrxApplication::setupInputSystem");
-    }
-  }
-
-  // FIXME we actually want to do this differently...
-  void Orxonox::createFrameListener()
-  {
-    frameListener_ = new OrxListener(keyboard_, auMan_, mode_);
-  }
-
-  void Orxonox::startRenderLoop()
-  {
-    // FIXME
-    // this is a hack!!!
-    // the call to reset the mouse clipping size should probably be somewhere
-    // else, however this works for the moment.
-    unsigned int width, height, depth;
-    int left, top;
-    ogre_->getRoot()->getAutoCreatedWindow()->getMetrics(width, height, depth, left, top);
-
-    if(mode_!=CLIENT){
-      const OIS::MouseState &ms = mouse_->getMouseState();
-      ms.width = width;
-      ms.height = height;
-    }
-    mainLoop();
+    }*/
   }
 
@@ -444 +420 @@
     means of the recent most dt_n-1, dt_n-2, etc.
   */
-  void Orxonox::mainLoop()
+  void Orxonox::startRenderLoop()
   {
     // use the ogre timer class to measure time.

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

@@ -42 +42 @@
       inline GraphicsEngine* getOgrePointer()              { return ogre_; };
       inline audio::AudioManager* getAudioManagerPointer() { return auMan_; };
-      inline OIS::Keyboard* getKeyboard()                  { return this->keyboard_; }
-      inline OIS::Mouse* getMouse()                        { return this->mouse_; }
+      //inline OIS::Keyboard* getKeyboard()                  { return this->keyboard_; }
+      //inline OIS::Mouse* getMouse()                        { return this->mouse_; }
       inline BulletManager* getBulletMgr()                 { return this->bulletMgr_; }
 
@@ -64 +64 @@
       void setupScene();
       void setupInputSystem();
-      void createFrameListener();
       void startRenderLoop();
-      void mainLoop();
       void updateTimers(float);
       float calculateEventTime(unsigned long, std::deque<unsigned long>&);
@@ -77 +75 @@
       BulletManager*        bulletMgr_;     //!< Keeps track of the thrown bullets
       static Orxonox*       singletonRef_;
-      OIS::Keyboard*        keyboard_;
-      OIS::Mouse*           mouse_;
-      OIS::InputManager*    inputManager_;
+      InputHandler*         inputHandler_;
+      //OIS::Keyboard*        keyboard_;
+      //OIS::Mouse*           mouse_;
+      //OIS::InputManager*    inputManager_;
       OrxListener*          frameListener_;
       Ogre::Root*           root_;

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

@@ -68 +68 @@
   class Camera;
   class GraphicsEngine;
+  class InputHandler;
   class Mesh;
   class Model;

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

@@ -17 +17 @@
   Executor.cc
   XMLPort.cc
+  Tickable.cc
 )
 

code/branches/network/src/orxonox/objects/Fighter.cc

@@ -37 +37 @@
 #include "util/tinyxml/tinyxml.h"
 #include "util/String2Number.h"
-#include "../core/CoreIncludes.h"
-#include "../Orxonox.h"
-#include "../particle/ParticleInterface.h"
+#include "core/CoreIncludes.h"
+#include "Orxonox.h"
+#include "InputHandler.h"
+#include "particle/ParticleInterface.h"
 #include "weapon/AmmunitionDump.h"
 #include "weapon/BarrelGun.h"
@@ -254 +255 @@
         if (!this->setMouseEventCallback_)
         {
-            if (Orxonox::getSingleton()->getMouse())
+            if (InputHandler::getSingleton()->getMouse())
             {
-                Orxonox::getSingleton()->getMouse()->setEventCallback(this);
+                InputHandler::getSingleton()->getMouse()->setEventCallback(this);
                 this->setMouseEventCallback_ = true;
             }
@@ -263 +264 @@
         WorldEntity::tick(dt);
 
-        OIS::Keyboard* mKeyboard = Orxonox::getSingleton()->getKeyboard();
-        OIS::Mouse* mMouse = Orxonox::getSingleton()->getMouse();
+        OIS::Keyboard* mKeyboard = InputHandler::getSingleton()->getKeyboard();
+        OIS::Mouse* mMouse = InputHandler::getSingleton()->getMouse();
 
         mKeyboard->capture();

code/branches/network/src/orxonox/objects/NPC.cc

@@ -85 +85 @@
   void NPC::tick(float dt)
   {
-
+    update();
     this->setVelocity(0.995*this->getVelocity() + this->getAcceleration()*dt);
     this->translate(this->getVelocity()*dt);

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

@@ -39 +39 @@
 #include "util/String2Number.h"
 #include "util/Math.h"
-#include "../core/CoreIncludes.h"
-#include "../core/Debug.h"
-#include "../Orxonox.h"
-#include "../particle/ParticleInterface.h"
+#include "core/CoreIncludes.h"
+#include "core/Debug.h"
+#include "Orxonox.h"
+#include "InputHandler.h"
+#include "particle/ParticleInterface.h"
 #include "Projectile.h"
 #include "core/XMLPort.h"
@@ -400 +401 @@
         if (!this->setMouseEventCallback_)
         {
-            if (Orxonox::getSingleton()->getMouse())
+            if (InputHandler::getSingleton()->getMouse())
             {
-                Orxonox::getSingleton()->getMouse()->setEventCallback(this);
+                InputHandler::getSingleton()->getMouse()->setEventCallback(this);
                 this->setMouseEventCallback_ = true;
             }
@@ -427 +428 @@
         }
 
-        OIS::Keyboard* mKeyboard = Orxonox::getSingleton()->getKeyboard();
-        OIS::Mouse* mMouse = Orxonox::getSingleton()->getMouse();
+        OIS::Keyboard* mKeyboard = InputHandler::getSingleton()->getKeyboard();
+        OIS::Mouse* mMouse = InputHandler::getSingleton()->getMouse();
 
         mKeyboard->capture();

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

@@ -640 +640 @@
                                 </File>
                                 <File
-                                        RelativePath="..\..\src\orxonox\tools\OrxListener.cc"
-                                        >
-                                </File>
-                                <File
                                         RelativePath="..\..\src\orxonox\tools\Timer.cc"
                                         >
@@ -810 +806 @@
                                 </File>
                                 <File
-                                        RelativePath="..\..\src\orxonox\tools\OrxListener.h"
-                                        >
-                                </File>
-                                <File
                                         RelativePath="..\..\src\orxonox\tools\Timer.h"
                                         >