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

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

File:

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

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.